diff --git a/ChangeLog b/ChangeLog index 90d19054b..457d79cf5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-02-14 Alex Roitman + * src/plugins/DetAncestralReport.py: Typos. + * src/plugins/DetDescendantReport.py: Typos. + 2005-02-04 Alex Roitman * src/ReadGrdb.py: Check for overlapping handles prior to modifying data. diff --git a/src/plugins/DetAncestralReport.py b/src/plugins/DetAncestralReport.py index 621e70e6b..541133db1 100644 --- a/src/plugins/DetAncestralReport.py +++ b/src/plugins/DetAncestralReport.py @@ -153,8 +153,10 @@ class DetAncestorReport(Report.Report): if self.pgbrk and generation > 0: self.doc.page_break() self.doc.start_paragraph("DAR-Generation") - t = _("%s Generation") % DetAncestorReport.gen[generation+1] - self.doc.write_text(t) + text = self.gen.get(generation+1, + _("Generation %(generation_number)d") % { + 'generation_number' : generation+1 }) + self.doc.write_text(text) self.doc.end_paragraph() generation = generation + 1 if self.childRef: diff --git a/src/plugins/DetDescendantReport.py b/src/plugins/DetDescendantReport.py index 6dd5a6834..f007c95d3 100644 --- a/src/plugins/DetDescendantReport.py +++ b/src/plugins/DetDescendantReport.py @@ -180,7 +180,7 @@ class DetDescendantReport(Report.Report): self.doc.start_paragraph("DDR-Generation") text = self.gen.get(generation+1, _("Generation %(generation_number)d") % { - 'generation_number' : generation }) + 'generation_number' : generation+1 }) self.doc.write_text(text) self.doc.end_paragraph() if self.childRef: @@ -192,7 +192,7 @@ class DetDescendantReport(Report.Report): person = self.database.get_person_from_handle(person_handle) self.gen_handles[person_handle] = key dupPerson = self.write_person(key) - if dupPerson == 0: # Is this a duplicate ind record + if dupPerson == 0: # Is this a duplicate ind record if self.listChildren: for family_handle in person.get_family_handle_list(): family = self.database.get_family_from_handle(family_handle) @@ -231,7 +231,7 @@ class DetDescendantReport(Report.Report): if self.map[key] == self.map[dkey]: self.doc.write_text(_(" is the same person as [%s].") % str(dkey)) self.doc.end_paragraph() - return 1 # Duplicate person + return 1 # Duplicate person # Check birth record birth_handle = person.get_birth_handle() @@ -266,7 +266,7 @@ class DetDescendantReport(Report.Report): self.doc.end_paragraph() self.doc.write_note(person.get_note(),person.get_note_format(),"DDR-Entry") - return 0 # Not duplicate person + return 0 # Not duplicate person def write_parents(self, person, firstName): """ Ouptut parents sentence"""