From 8c26c5ad64b5d19bc554a24b8efee5c055e0fe22 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Wed, 23 Dec 2009 20:16:16 +0000 Subject: [PATCH] 3302: Detailed Descendant Report fallback for child-list birth/death strings and fixed a typo baptized -> baptised svn: r13899 --- src/plugins/lib/libnarrate.py | 4 ++-- src/plugins/textreport/DetAncestralReport.py | 12 +++++++----- src/plugins/textreport/DetDescendantReport.py | 9 ++++++--- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/plugins/lib/libnarrate.py b/src/plugins/lib/libnarrate.py index 1ed51d4bf..ae2deca9d 100644 --- a/src/plugins/lib/libnarrate.py +++ b/src/plugins/lib/libnarrate.py @@ -1839,7 +1839,7 @@ class Narrator(object): return text - def get_baptized_string(self): + def get_baptised_string(self): """ Get a string narrating the baptism of the subject. Example sentences: @@ -2349,4 +2349,4 @@ class Narrator(object): age = 0 age_index = _AGE_INDEX_NO_AGE - return age, age_index \ No newline at end of file + return age, age_index diff --git a/src/plugins/textreport/DetAncestralReport.py b/src/plugins/textreport/DetAncestralReport.py index 748359508..47e497c3f 100644 --- a/src/plugins/textreport/DetAncestralReport.py +++ b/src/plugins/textreport/DetAncestralReport.py @@ -247,7 +247,7 @@ class DetAncestorReport(Report): if text: self.doc.write_text_citation(text) - text = self.__narrator.get_baptized_string() + text = self.__narrator.get_baptised_string() if text: self.doc.write_text_citation(text) @@ -511,9 +511,11 @@ class DetAncestorReport(Report): self.__narrator.set_subject(child) self.doc.write_text("%s. " % child_name, child_mark) - self.doc.write_text(self.__narrator.get_born_string()) - self.doc.write_text(self.__narrator.get_died_string()) - + self.doc.write_text(self.__narrator.get_born_string() or + self.__narrator.get_christened_string() or + self.__narrator.get_baptised_string()) + self.doc.write_text(self.__narrator.get_died_string() or + self.__narrator.get_buried_string()) self.doc.end_paragraph() def write_family_events(self, family): @@ -608,7 +610,7 @@ class DetAncestorReport(Report): if text: self.doc.write_text_citation(text) - text = self.__narrator.get_baptized_string() + text = self.__narrator.get_baptised_string() if text: self.doc.write_text_citation(text) diff --git a/src/plugins/textreport/DetDescendantReport.py b/src/plugins/textreport/DetDescendantReport.py index 906cca76f..5cb426843 100644 --- a/src/plugins/textreport/DetDescendantReport.py +++ b/src/plugins/textreport/DetDescendantReport.py @@ -538,8 +538,11 @@ class DetDescendantReport(Report): self.doc.write_text("%s. " % child_name, child_mark) self.__narrator.set_subject(child) - self.doc.write_text_citation(self.__narrator.get_born_string()) - self.doc.write_text_citation(self.__narrator.get_died_string()) + self.doc.write_text_citation(self.__narrator.get_born_string() or + self.__narrator.get_christened_string() or + self.__narrator.get_baptised_string()) + self.doc.write_text_citation(self.__narrator.get_died_string() or + self.__narrator.get_buried_string()) self.doc.end_paragraph() def __write_family_events(self, family): @@ -593,7 +596,7 @@ class DetDescendantReport(Report): if text: self.doc.write_text_citation(text) - text = self.__narrator.get_baptized_string() + text = self.__narrator.get_baptised_string() if text: self.doc.write_text_citation(text)