From 0acc01c46cea1250995add555e21ed2120c79f82 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 22 Jul 2003 11:53:04 +0000 Subject: [PATCH] 2003-07-22 Tim Waugh * src/plugins/Ancestors.py: Mark the easy translation strings. Start tentative work on making the rest translatable. svn: r1921 --- gramps2/ChangeLog | 1 + gramps2/src/plugins/Ancestors.py | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 336e1bf89..b47938be1 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,5 +1,6 @@ 2003-07-22 Tim Waugh * src/plugins/Ancestors.py: Mark the easy translation strings. + Start tentative work on making the rest translatable. * src/RelLib.py: Made Person.probablyAlive() take partners into consideration if all else fails. * src/plugins/WriteGedcom.py, src/plugins/gedcomexport.glade: New diff --git a/gramps2/src/plugins/Ancestors.py b/gramps2/src/plugins/Ancestors.py index 8b1487c5b..7d0cf10a8 100644 --- a/gramps2/src/plugins/Ancestors.py +++ b/gramps2/src/plugins/Ancestors.py @@ -585,7 +585,7 @@ class ComprehensiveAncestorsReport (Report.Report): return name def married_whom (self, person, from_family, listing_children = 0): - pronoun = ' ' + self.Pronoun (person) + gender = person.getGender () first_marriage = 1 ret = '' for family in person.getFamilyList (): @@ -620,16 +620,26 @@ class ComprehensiveAncestorsReport (Report.Report): marriage = family.getMarriage () if not first_marriage: - ret += pronoun + ' later married ' - ret += self.person_name (spouse) + if gender == RelLib.Person.female: + ret += _(' She later married %(name)s') % \ + {'name': self.person_name (spouse)} + else: + ret += _(' He later married %(name)s') % \ + {'name': self.person_name (spouse)} + if marriage: ret += self.event_info (marriage) ret += children + '.' elif (listing_children or spouse == mother or family != from_family): - ret += pronoun + ' married ' - ret += self.person_name (spouse) + if gender == RelLib.Person.female: + ret += _(' She married %(name)s') % \ + {'name': self.person_name (spouse)} + else: + ret += _(' He married %(name)s') % \ + {'name': self.person_name (spouse)} + if marriage: ret += self.event_info (marriage) ret += children + '.' @@ -674,7 +684,7 @@ class ComprehensiveAncestorsReport (Report.Report): if (len (events) + len (addresses) + len (names)) > 0: paras.append ((self.doc.start_paragraph, ['AR-SubEntry'])) paras.append ((self.doc.write_text, - [_("More about %(name):") % + [_("More about %(name)s:") % {'name': self.first_name_or_nick (person)}])) paras.append ((self.doc.end_paragraph, []))