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

ExportFtree: simplify get_name function

Browse Source 
svn: r12461
This commit is contained in:
Gerald Britton 2009-04-17 13:32:41 +00:00
parent 260b34bd01
commit e63996d08f
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/export/ExportFtree.py
View File

@ -292,24 +292,13 @@ def fdate(val):
def get_name(name, count):
"""returns a name string built from the components of the Name
instance, in the form of Firstname Surname"""
if count == -1:
val = ""
else:
val = str(count)
if (name.suffix == ""):
if name.prefix:
return "%s %s %s%s" % (name.first_name, name.prefix,
name.surname, val)
else:
return "%s %s%s" % (name.first_name, name.surname, val)
else:
if name.prefix:
return "%s %s %s%s, %s" % (name.first_name, name.prefix,
name.surname, val, name.suffix)
else:
return "%s %s%s, %s" % (name.first_name,
name.surname, val, name.suffix)
return = (name.first_name + ' ' +
(name.prefix + ' ' if name.prefix else '') +
name.surname +
(str(count) if count != -1 else '') +
(', ' +name.suffix if name.suffix else '')
)
#------------------------------------------------------------------------
#