ExportFtree: simplify get_name function
svn: r12461
This commit is contained in:
parent
260b34bd01
commit
e63996d08f
@ -292,24 +292,13 @@ def fdate(val):
|
|||||||
def get_name(name, count):
|
def get_name(name, count):
|
||||||
"""returns a name string built from the components of the Name
|
"""returns a name string built from the components of the Name
|
||||||
instance, in the form of Firstname Surname"""
|
instance, in the form of Firstname Surname"""
|
||||||
if count == -1:
|
|
||||||
val = ""
|
|
||||||
else:
|
|
||||||
val = str(count)
|
|
||||||
|
|
||||||
if (name.suffix == ""):
|
return = (name.first_name + ' ' +
|
||||||
if name.prefix:
|
(name.prefix + ' ' if name.prefix else '') +
|
||||||
return "%s %s %s%s" % (name.first_name, name.prefix,
|
name.surname +
|
||||||
name.surname, val)
|
(str(count) if count != -1 else '') +
|
||||||
else:
|
(', ' +name.suffix if name.suffix 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)
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user