* src/NameDisplay: include nickname if available
* src/plugins/ScratchPad.py: Handle null handle svn: r5188
This commit is contained in:
@ -1,3 +1,7 @@
|
||||
2005-09-11 Don Allingham <don@gramps-project.org>
|
||||
* src/NameDisplay: include nickname if available
|
||||
* src/plugins/ScratchPad.py: Handle null handle
|
||||
|
||||
2005-09-10 Don Allingham <don@gramps-project.org>
|
||||
* src/ImageSelect.py: fix adding a new image that is actually
|
||||
already in the database.
|
||||
|
@ -133,9 +133,9 @@ class NameDisplay:
|
||||
"""
|
||||
name = person.get_primary_name()
|
||||
if name.display_as == RelLib.Name.LNFN:
|
||||
return self._lnfn(name)
|
||||
return self._lnfn(name,person.get_nick_name())
|
||||
else:
|
||||
return self._fnln(name)
|
||||
return self._fnln(name,person.get_nick_name())
|
||||
|
||||
def display_name(self,name):
|
||||
"""
|
||||
@ -182,17 +182,21 @@ class NameDisplay:
|
||||
else:
|
||||
return "%s %s, %s" % (last, name.suffix, first)
|
||||
|
||||
def _fnln(self,name):
|
||||
def _fnln(self,name,nickname=""):
|
||||
"""
|
||||
Prints the Western style first name, last name style.
|
||||
Typically this is::
|
||||
|
||||
FirstName Patronymic SurnamePrefix Surname SurnameSuffix
|
||||
"""
|
||||
|
||||
first = name.first_name
|
||||
|
||||
if nickname:
|
||||
first = '%s "%s"' % (first,nickname)
|
||||
|
||||
if name.patronymic:
|
||||
first = "%s %s" % (name.first_name, name.patronymic)
|
||||
else:
|
||||
first = name.first_name
|
||||
first = "%s %s" % (first, name.patronymic)
|
||||
|
||||
if self.force_upper:
|
||||
last = name.surname.upper()
|
||||
@ -225,17 +229,21 @@ class NameDisplay:
|
||||
val = pn.first_name
|
||||
return db.get_name_group_mapping(val)
|
||||
|
||||
def _lnfn(self,name):
|
||||
def _lnfn(self,name,nickname=u""):
|
||||
"""
|
||||
Prints the Western style last name, first name style.
|
||||
Typically this is::
|
||||
|
||||
SurnamePrefix Surname, FirstName Patronymic SurnameSuffix
|
||||
"""
|
||||
|
||||
first = name.first_name
|
||||
|
||||
if nickname:
|
||||
first = '%s "%s"' % (first,nickname)
|
||||
|
||||
if name.patronymic:
|
||||
first = "%s %s" % (name.first_name, name.patronymic)
|
||||
else:
|
||||
first = name.first_name
|
||||
first = "%s %s" % (first, name.patronymic)
|
||||
|
||||
if self.force_upper:
|
||||
last = name.surname.upper()
|
||||
|
@ -690,6 +690,9 @@ class ScratchPadListView:
|
||||
|
||||
wrapper_class = self._target_type_to_wrapper_class_map[str(possible_wrappers[0])]
|
||||
|
||||
if not sel_data:
|
||||
return
|
||||
|
||||
o = wrapper_class(self._gramps_model,sel_data)
|
||||
|
||||
# If the wrapper object is a subclass of ScratchDropList then
|
||||
|
Reference in New Issue
Block a user