* src/Sort.py: use locale.strcoll for sorting

* src/RelLib.py: don't use accent for sort name
* src/EditPerson.py: compare edited ID value properly
* src/Marriage.py: compare edited ID value properly
* src/PeopleModel.py: use locale.strcoll for comparing
* src/GrampsBSDDB.py: use locale.strcoll for comparing/sorting
* src/GrampsDbBase.py: use locale.strcoll for comparing/sorting
* src/DbPrompter.py: handle bad filenames a bit better


svn: r3514
This commit is contained in:
Don Allingham
2004-08-26 21:54:14 +00:00
parent 4ab4faa6ba
commit f9f9ea670b
9 changed files with 46 additions and 23 deletions

View File

@ -33,6 +33,7 @@ from this class.
from RelLib import *
import cPickle
import time
import locale
from gettext import gettext as _
#-------------------------------------------------------------------------
@ -968,21 +969,21 @@ class GrampsDbBase:
def _sortbyname(self,f,s):
n1 = self.person_map.get(str(f))[2].sname
n2 = self.person_map.get(str(s))[2].sname
return cmp(n1,n2)
return locale.strcoll(n1,n2)
def _sortbyplace(self,f,s):
return cmp(self.place_map.get(str(f))[2].upper(),
self.place_map.get(str(s))[2].upper())
return locale.strcoll(self.place_map.get(str(f))[2].upper(),
self.place_map.get(str(s))[2].upper())
def _sortbysource(self,f,s):
fp = self.source_map[str(f)][2].upper()
sp = self.source_map[str(s)][2].upper()
return cmp(fp,sp)
return locale.strcoll(fp,sp)
def _sortbymedia(self,f,s):
fp = self.media_map[str(f)][4].upper()
sp = self.media_map[str(s)][4].upper()
return cmp(fp,sp)
return locale.strcoll(fp,sp)
def set_person_column_order(self,list):
"""