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

* src/plugins/DetDescendantReport.py

Browse Source 
(DetDescendantReport.write_marriage):
Missing value for the format line parameter

* src/plugins/FtmStyleDescendants.py
(FtmDescendantReport.print_more_about): Print regular name in the
header of the "More About" dialog. Also add missing endnotes value.
(FtmDescendantReport.print_parents): Fix a typo in a format line value.


svn: r1623
This commit is contained in:
Alex Roitman 2003-06-02 03:44:47 +00:00
parent ddf2167b11
commit ce12a00898
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gramps2/src/plugins/DetDescendantReport.py
View File

@ -499,7 +499,7 @@ class DetDescendantReport(Report):
(heshe, spouse, fulldate, place) (heshe, spouse, fulldate, place)
else: else:
if fulldate == "" and place == "": if fulldate == "" and place == "":
t= _(" %s married") t= _(" %s married") % heshe
elif fulldate == "" and place != "": elif fulldate == "" and place != "":
t= _(" %s married in %s") % (heshe, place) t= _(" %s married in %s") % (heshe, place)
elif fulldate != "" and place == "": elif fulldate != "" and place == "":

9
gramps2/src/plugins/FtmStyleDescendants.py
View File

@ -287,11 +287,11 @@ class FtmDescendantReport(Report.Report):
def print_more_about(self,person): def print_more_about(self,person):
first = 1 first = 1
ncount = 0 ncount = 1
for name in person.getAlternateNames(): for name in person.getAlternateNames():
if first: if first:
self.doc.start_paragraph('SubEntry') self.doc.start_paragraph('SubEntry')
self.doc.write_text(_('More about %(person_name)s:') % { 'person_name' : name }) self.doc.write_text(_('More about %(person_name)s:') % { 'person_name' : person.getPrimaryName().getRegularName() })
self.doc.end_paragraph() self.doc.end_paragraph()
first = 0 first = 0
self.doc.start_paragraph('Details') self.doc.start_paragraph('Details')
@ -330,6 +330,7 @@ class FtmDescendantReport(Report.Report):
else: else:
self.doc.write_text(_('%(event_name)s: %(place)s%(endnotes)s') % { self.doc.write_text(_('%(event_name)s: %(place)s%(endnotes)s') % {
'event_name' : event.getName(), 'event_name' : event.getName(),
'endnotes' : self.endnotes(event),
'place' : event.getPlaceName() }) 'place' : event.getPlaceName() })
self.doc.end_paragraph() self.doc.end_paragraph()
@ -1101,10 +1102,10 @@ class FtmDescendantReport(Report.Report):
elif father: elif father:
if dead: if dead:
self.doc.write_text(_("She was the daughter of %(father)s.") % { self.doc.write_text(_("She was the daughter of %(father)s.") % {
'father' : mother.getPrimaryName().getRegularName(), }) 'father' : father.getPrimaryName().getRegularName(), })
else: else:
self.doc.write_text(_("She is the daughter of %(father)s.") % { self.doc.write_text(_("She is the daughter of %(father)s.") % {
'father' : mother.getPrimaryName().getRegularName(), }) 'father' : father.getPrimaryName().getRegularName(), })
self.doc.write_text(' '); self.doc.write_text(' ');