diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index a5b3f2cdc..ccfc2d43d 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2003-07-23 Tim Waugh + * src/plugins/Ancestors.py: More translation bits. Include + source author and publication information. + 2003-07-22 Alex Roitman * src/SelectChild.py: Replace braces with parentheses in named format string parameter. diff --git a/gramps2/src/plugins/Ancestors.py b/gramps2/src/plugins/Ancestors.py index 81f7fb743..423f15f0a 100644 --- a/gramps2/src/plugins/Ancestors.py +++ b/gramps2/src/plugins/Ancestors.py @@ -28,6 +28,7 @@ import gtk # gramps modules # #------------------------------------------------------------------------ +import const import Report import TextDoc import RelLib @@ -135,6 +136,15 @@ class ComprehensiveAncestorsReport (Report.Report): for source in self.sources: self.doc.start_paragraph ("AR-Entry") self.doc.write_text ("[%d] %s" % (i, source.getTitle ())) + author = source.getAuthor () + pubinfo = source.getPubInfo () + extra = author + if pubinfo: + if extra: + extra += ', ' + extra += pubinfo + if extra: + self.doc.write_text ('; %s' % extra) self.doc.end_paragraph () note = source.getNote () @@ -376,7 +386,7 @@ class ComprehensiveAncestorsReport (Report.Report): name = event.getName () description = event.getDescription () if name != 'Birth' and name != 'Death' and name != 'Marriage': - info += name + info += const.display_pevent (name) if description: info += ': ' + description description = None @@ -449,7 +459,7 @@ class ComprehensiveAncestorsReport (Report.Report): ret = '' born_info = self.event_info (person.getBirth ()) if born_info: - ret = ", born" + born_info + ret = ", " + _("born") + born_info died_info = self.event_info (person.getDeath ()) if died_info: @@ -458,22 +468,10 @@ class ComprehensiveAncestorsReport (Report.Report): else: ret += ', ' - ret += 'died' + died_info + ret += _('died') + died_info return ret - def Pronoun (self, person): - if person.getGender () == RelLib.Person.female: - return 'She' - else: - return 'He' - - def son_or_daughter (self, person): - if person.getGender () == RelLib.Person.female: - return 'daughter' - else: - return 'son' - def parents_of (self, person): gender = person.getGender () if gender == RelLib.Person.female: @@ -713,8 +711,9 @@ class ComprehensiveAncestorsReport (Report.Report): for name in names: paras.append ((self.doc.start_paragraph, ['AR-Details'])) - paras.append ((self.doc.write_text, [name.getType () + ': ' + - name.getRegularName ()])) + paras.append ((self.doc.write_text, + [const.InverseNameTypesMap[name.getType ()] + + ': ' + name.getRegularName ()])) paras.append ((self.doc.end_paragraph, [])) for event in events: