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

Fix of 4071 so that substitutioins variables /%N, /%s, /%S follow the spec in the manual.

Browse Source 
svn: r15569
This commit is contained in:
Peter Landgren 2010-06-15 06:34:54 +00:00
parent 205a1b703d
commit d6fa234f9b
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/SubstKeywords.py
View File

@ -71,7 +71,8 @@ class SubstKeywords(object):
person = database.get_person_from_handle(person_handle) person = database.get_person_from_handle(person_handle)
self.n = person.get_primary_name().get_first_name() + " " + \ self.n = person.get_primary_name().get_first_name() + " " + \
person.get_primary_name().get_surname() #Issue ID: 2878 person.get_primary_name().get_surname() #Issue ID: 2878
self.N = name_displayer.sorted(person) self.N = person.get_primary_name().get_surname() + ", " + \
person.get_primary_name().get_first_name()
self.b = "" self.b = ""
self.B = "" self.B = ""
self.d = "" self.d = ""
@ -103,13 +104,17 @@ class SubstKeywords(object):
if father_handle == person_handle: if father_handle == person_handle:
if mother_handle: if mother_handle:
mother = database.get_person_from_handle(mother_handle) mother = database.get_person_from_handle(mother_handle)
self.s = name_displayer.display(mother) self.s = mother.get_primary_name().get_first_name() + " " + \
self.S = name_displayer.sorted(mother) mother.get_primary_name().get_surname() #Issue ID: 2878
self.S = mother.get_primary_name().get_surname() + ", " + \
mother.get_primary_name().get_first_name()
else: else:
if father_handle: if father_handle:
father = database.get_person_from_handle(father_handle) father = database.get_person_from_handle(father_handle)
self.s = name_displayer.display(father) self.s = father.get_primary_name().get_first_name() + " " + \
self.S = name_displayer.sorted(father) father.get_primary_name().get_surname() #Issue ID: 2878
self.S = father.get_primary_name().get_surname() + ", " + \
father.get_primary_name().get_first_name()
for e_ref in f.get_event_ref_list(): for e_ref in f.get_event_ref_list():
if not e_ref: if not e_ref:
continue continue