Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/RelLib.py : support for capitalized name formats

Browse Source 
* src/EditPerson.py: eliminate capitilzing names, instead rely on
the display formats
* src/Utils.py: new display formats for names
* src/GrampsCfg.py: eliminate name only option in status line,
add support for capitalized name formats
* src/preferences.glade : eliminate name only option in status line,
drop capitalize in favor of expanded name format


svn: r2238
This commit is contained in:
Don Allingham
2003-10-12 04:26:00 +00:00
parent 52839e9ba0
commit fee585d80c
5 changed files with 104 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/RelLib.py
View File

@@ -38,6 +38,7 @@ import os
#
#-------------------------------------------------------------------------
from Date import Date, SingleDate, compare_dates, not_too_old
import GrampsCfg
import sort
import const
@@ -878,6 +879,10 @@ class Name(DataObj):
"""returns the surname (or last name) for the Name instance"""
return self.Surname
def getUpperSurname(self):
"""returns the surname (or last name) for the Name instance"""
return self.Surname.upper()
def getSuffix(self):
"""returns the suffix for the Name instance"""
return self.Suffix
@@ -905,6 +910,21 @@ class Name(DataObj):
else:
return "%s, %s" % (self.Surname, self.FirstName)
def getUpperName(self):
"""returns a name string built from the components of the Name
instance, in the form of Surname, Firstname"""
if self.Suffix:
if self.Prefix:
return "%s %s, %s %s" % (self.Prefix.upper(), self.Surname.upper(), self.FirstName, self.Suffix)
else:
return "%s, %s %s" % (self.Surname.upper(), self.FirstName, self.Suffix)
else:
if self.Prefix:
return "%s %s, %s" % (self.Prefix.upper(), self.Surname.upper(), self.FirstName)
else:
return "%s, %s" % (self.Surname.upper(), self.FirstName)
def getRegularName(self):
"""returns a name string built from the components of the Name
instance, in the form of Firstname Surname"""
@@ -919,6 +939,20 @@ class Name(DataObj):
else:
return "%s %s, %s" % (self.FirstName, self.Surname, self.Suffix)
def getRegularUpperName(self):
"""returns a name string built from the components of the Name
instance, in the form of Firstname Surname"""
if (self.Suffix == ""):
if self.Prefix:
return "%s %s %s" % (self.FirstName, self.Prefix.upper(), self.Surname.upper())
else:
return "%s %s" % (self.FirstName, self.Surname.upper())
else:
if self.Prefix:
return "%s %s %s, %s" % (self.FirstName, self.Prefix.upper(), self.Surname.upper(), self.Suffix)
else:
return "%s %s, %s" % (self.FirstName, self.Surname.upper(), self.Suffix)
def are_equal(self,other):
"""compares to names to see if they are equal, return 0 if they
are not"""
@@ -1044,11 +1078,11 @@ class Person(Persistent):
gender = const.unknown
bday = self.getBirth().getDateObj()
dday = self.getDeath().getDateObj()
return [ self.getPrimaryName().getName(),self.id,gender,
return [ GrampsCfg.display_name(self),self.id,gender,
bday.getQuoteDate(), dday.getQuoteDate(),
sort.build_sort_name(self.getPrimaryName()),
sort.build_sort_date(bday),sort.build_sort_date(dday),
self.getPrimaryName().getSurname()]
GrampsCfg.display_surname(self.PrimaryName)]
def setPrimaryName(self,name):
"""sets the primary name of the Person to the specified