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

3302: Detailed Descendant Report fallback for child-list birth/death strings and fixed a typo baptized -> baptised

Browse Source 
svn: r13899
This commit is contained in:
Doug Blank 2009-12-23 20:16:16 +00:00
parent 302781a6b3
commit 8c26c5ad64
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/lib/libnarrate.py
View File

@ -1839,7 +1839,7 @@ class Narrator(object):
return text return text
def get_baptized_string(self): def get_baptised_string(self):
""" """
Get a string narrating the baptism of the subject. Get a string narrating the baptism of the subject.
Example sentences: Example sentences:
@ -2349,4 +2349,4 @@ class Narrator(object):
age = 0 age = 0
age_index = _AGE_INDEX_NO_AGE age_index = _AGE_INDEX_NO_AGE
return age, age_index return age, age_index

12
src/plugins/textreport/DetAncestralReport.py
View File

@ -247,7 +247,7 @@ class DetAncestorReport(Report):
if text: if text:
self.doc.write_text_citation(text) self.doc.write_text_citation(text)
text = self.__narrator.get_baptized_string() text = self.__narrator.get_baptised_string()
if text: if text:
self.doc.write_text_citation(text) self.doc.write_text_citation(text)
@ -511,9 +511,11 @@ class DetAncestorReport(Report):
self.__narrator.set_subject(child) self.__narrator.set_subject(child)
self.doc.write_text("%s. " % child_name, child_mark) 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_born_string() or
self.doc.write_text(self.__narrator.get_died_string()) 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() self.doc.end_paragraph()
def write_family_events(self, family): def write_family_events(self, family):
@ -608,7 +610,7 @@ class DetAncestorReport(Report):
if text: if text:
self.doc.write_text_citation(text) self.doc.write_text_citation(text)
text = self.__narrator.get_baptized_string() text = self.__narrator.get_baptised_string()
if text: if text:
self.doc.write_text_citation(text) self.doc.write_text_citation(text)

9
src/plugins/textreport/DetDescendantReport.py
View File

@ -538,8 +538,11 @@ class DetDescendantReport(Report):
self.doc.write_text("%s. " % child_name, child_mark) self.doc.write_text("%s. " % child_name, child_mark)
self.__narrator.set_subject(child) self.__narrator.set_subject(child)
self.doc.write_text_citation(self.__narrator.get_born_string()) self.doc.write_text_citation(self.__narrator.get_born_string() or
self.doc.write_text_citation(self.__narrator.get_died_string()) 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() self.doc.end_paragraph()
def __write_family_events(self, family): def __write_family_events(self, family):
@ -593,7 +596,7 @@ class DetDescendantReport(Report):
if text: if text:
self.doc.write_text_citation(text) self.doc.write_text_citation(text)
text = self.__narrator.get_baptized_string() text = self.__narrator.get_baptised_string()
if text: if text:
self.doc.write_text_citation(text) self.doc.write_text_citation(text)