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

Correct name display so that it includes prefix and suffix.

Browse Source 
* src/plugins/WebCal.py


svn: r10962
This commit is contained in:
Kees Bakker 2008-08-04 19:31:38 +00:00
parent 537e44b24c
commit e9d0b4594b
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/WebCal.py
View File

@ -1075,7 +1075,7 @@ class WebCalReport(Report):
if father_handle: if father_handle:
father = self.database.get_person_from_handle(father_handle) father = self.database.get_person_from_handle(father_handle)
if father != None: if father != None:
father_lastname = father.get_primary_name().get_surname() father_lastname = _get_regular_surname(father.get_primary_name())
short_name = _get_short_name(person, father_lastname) short_name = _get_short_name(person, father_lastname)
if age == 0: # person is 0 years old, display nothing if age == 0: # person is 0 years old, display nothing
text = "" text = ""
@ -1605,8 +1605,21 @@ def _easter(year):
day = l + 28 - 31 * (month / 4) day = l + 28 - 31 * (month / 4)
return year, month, day return year, month, day
# FIXME. Name prefix, suffix etc. is missing.
def _get_short_name(person, maiden_name = None): def _get_regular_surname(name):
"""
Return a name string built from the components of the Name instance.
"""
surname = name.get_surname()
prefix = name.get_surname_prefix()
if prefix:
surname = prefix + " " + surname
suffix = name.get_suffix()
if suffix:
surname = surname + ", " + suffix
return surname
def _get_short_name(person, maiden_name=None):
""" Return person's name, unless maiden_name given, unless married_name listed. """ """ Return person's name, unless maiden_name given, unless married_name listed. """
# Get all of a person's names: # Get all of a person's names:
primary_name = person.get_primary_name() primary_name = person.get_primary_name()
@ -1620,13 +1633,13 @@ def _get_short_name(person, maiden_name = None):
# Now, decide which to use: # Now, decide which to use:
if maiden_name is not None: if maiden_name is not None:
if married_name is not None: if married_name is not None:
first_name, family_name = married_name.get_first_name(), married_name.get_surname() first_name, family_name = married_name.get_first_name(), _get_regular_surname(married_name)
call_name = married_name.get_call_name() call_name = married_name.get_call_name()
else: else:
first_name, family_name = primary_name.get_first_name(), maiden_name first_name, family_name = primary_name.get_first_name(), maiden_name
call_name = primary_name.get_call_name() call_name = primary_name.get_call_name()
else: else:
first_name, family_name = primary_name.get_first_name(), primary_name.get_surname() first_name, family_name = primary_name.get_first_name(), _get_regular_surname(primary_name)
call_name = primary_name.get_call_name() call_name = primary_name.get_call_name()
# If they have a nickname use it # If they have a nickname use it