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

2003-07-22 Tim Waugh <twaugh@redhat.com>

Browse Source 
* src/plugins/Ancestors.py: Mark the easy translation strings.
        Start tentative work on making the rest translatable.


svn: r1921
This commit is contained in:
Tim Waugh 2003-07-22 11:53:04 +00:00
parent 6afedf0d52
commit 0acc01c46c
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gramps2/ChangeLog
View File

@ -1,5 +1,6 @@
2003-07-22 Tim Waugh <twaugh@redhat.com> 2003-07-22 Tim Waugh <twaugh@redhat.com>
* src/plugins/Ancestors.py: Mark the easy translation strings. * 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 * src/RelLib.py: Made Person.probablyAlive() take partners into
consideration if all else fails. consideration if all else fails.
* src/plugins/WriteGedcom.py, src/plugins/gedcomexport.glade: New * src/plugins/WriteGedcom.py, src/plugins/gedcomexport.glade: New

22
gramps2/src/plugins/Ancestors.py
View File

@ -585,7 +585,7 @@ class ComprehensiveAncestorsReport (Report.Report):
return name return name
def married_whom (self, person, from_family, listing_children = 0): def married_whom (self, person, from_family, listing_children = 0):
pronoun = ' ' + self.Pronoun (person) gender = person.getGender ()
first_marriage = 1 first_marriage = 1
ret = '' ret = ''
for family in person.getFamilyList (): for family in person.getFamilyList ():
@ -620,16 +620,26 @@ class ComprehensiveAncestorsReport (Report.Report):
marriage = family.getMarriage () marriage = family.getMarriage ()
if not first_marriage: if not first_marriage:
ret += pronoun + ' later married ' if gender == RelLib.Person.female:
ret += self.person_name (spouse) 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: if marriage:
ret += self.event_info (marriage) ret += self.event_info (marriage)
ret += children + '.' ret += children + '.'
elif (listing_children or elif (listing_children or
spouse == mother or spouse == mother or
family != from_family): family != from_family):
ret += pronoun + ' married ' if gender == RelLib.Person.female:
ret += self.person_name (spouse) ret += _(' She married %(name)s') % \
{'name': self.person_name (spouse)}
else:
ret += _(' He married %(name)s') % \
{'name': self.person_name (spouse)}
if marriage: if marriage:
ret += self.event_info (marriage) ret += self.event_info (marriage)
ret += children + '.' ret += children + '.'
@ -674,7 +684,7 @@ class ComprehensiveAncestorsReport (Report.Report):
if (len (events) + len (addresses) + len (names)) > 0: if (len (events) + len (addresses) + len (names)) > 0:
paras.append ((self.doc.start_paragraph, ['AR-SubEntry'])) paras.append ((self.doc.start_paragraph, ['AR-SubEntry']))
paras.append ((self.doc.write_text, paras.append ((self.doc.write_text,
[_("More about %(name):") % [_("More about %(name)s:") %
{'name': self.first_name_or_nick (person)}])) {'name': self.first_name_or_nick (person)}]))
paras.append ((self.doc.end_paragraph, [])) paras.append ((self.doc.end_paragraph, []))