diff --git a/ChangeLog b/ChangeLog index a9cf00ce9..2d2c7af4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2008-02-10 Brian Matherly - * src/plugins/FanChart.py: - 0001751: Translation of string in FanCaaart.py does not work. + * src/plugins/DetAncestralReport.py: + * src/ReportBase/_ReportUtils.py: + 0001731: Wrong dot in Ancestral Report 2008-02-10 Brian Matherly * src/plugins/NarrativeWeb.py: diff --git a/src/ReportBase/_ReportUtils.py b/src/ReportBase/_ReportUtils.py index 5fd64092b..60789a14d 100644 --- a/src/ReportBase/_ReportUtils.py +++ b/src/ReportBase/_ReportUtils.py @@ -1920,7 +1920,7 @@ def married_str(database, person, family, verbose=True, endnotes=None, text = unmarried_first_date_place[gender][date_full] % values else: text = relationship_first_date_place[gender][date_full] % values - if event and date and place: + elif event and date and place: if relationship == gen.lib.FamilyRelType.MARRIED: text = marriage_first_date_place['succinct'][date_full] % values elif relationship == gen.lib.FamilyRelType.UNMARRIED: diff --git a/src/plugins/DetAncestralReport.py b/src/plugins/DetAncestralReport.py index 07b8078dd..6c69945f2 100644 --- a/src/plugins/DetAncestralReport.py +++ b/src/plugins/DetAncestralReport.py @@ -595,7 +595,7 @@ class DetAncestorReport(Report): else: firstName = 0 - print_name = "" + print_name = ReportUtils.common_name(ind, self.usecall) if person_name and has_info: self.doc.start_paragraph("DAR-Entry") @@ -603,8 +603,8 @@ class DetAncestorReport(Report): self.doc.write_text(person_name,person_key) self.doc.write_text(". ") - text = ReportUtils.born_str(self.database,ind,print_name, - self.verbose, self.EMPTY_DATE,self.EMPTY_PLACE) + text = ReportUtils.born_str(self.database, ind, print_name, + self.verbose, self.EMPTY_DATE, self.EMPTY_PLACE) if text: self.doc.write_text(text) print_name = 0;