From 48d65b6a7b6816cdf3ce2e5a0af7a10b5bcf2960 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Mon, 2 Jun 2003 03:44:47 +0000 Subject: [PATCH] * src/plugins/DetDescendantReport.py (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 --- src/plugins/DetDescendantReport.py | 2 +- src/plugins/FtmStyleDescendants.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/DetDescendantReport.py b/src/plugins/DetDescendantReport.py index 63d171270..0a8603f9e 100644 --- a/src/plugins/DetDescendantReport.py +++ b/src/plugins/DetDescendantReport.py @@ -499,7 +499,7 @@ class DetDescendantReport(Report): (heshe, spouse, fulldate, place) else: if fulldate == "" and place == "": - t= _(" %s married") + t= _(" %s married") % heshe elif fulldate == "" and place != "": t= _(" %s married in %s") % (heshe, place) elif fulldate != "" and place == "": diff --git a/src/plugins/FtmStyleDescendants.py b/src/plugins/FtmStyleDescendants.py index a1a2ef7f2..a297cfae5 100644 --- a/src/plugins/FtmStyleDescendants.py +++ b/src/plugins/FtmStyleDescendants.py @@ -287,11 +287,11 @@ class FtmDescendantReport(Report.Report): def print_more_about(self,person): first = 1 - ncount = 0 + ncount = 1 for name in person.getAlternateNames(): if first: 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() first = 0 self.doc.start_paragraph('Details') @@ -330,6 +330,7 @@ class FtmDescendantReport(Report.Report): else: self.doc.write_text(_('%(event_name)s: %(place)s%(endnotes)s') % { 'event_name' : event.getName(), + 'endnotes' : self.endnotes(event), 'place' : event.getPlaceName() }) self.doc.end_paragraph() @@ -1101,10 +1102,10 @@ class FtmDescendantReport(Report.Report): elif father: if dead: self.doc.write_text(_("She was the daughter of %(father)s.") % { - 'father' : mother.getPrimaryName().getRegularName(), }) + 'father' : father.getPrimaryName().getRegularName(), }) else: self.doc.write_text(_("She is the daughter of %(father)s.") % { - 'father' : mother.getPrimaryName().getRegularName(), }) + 'father' : father.getPrimaryName().getRegularName(), }) self.doc.write_text(' ');