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

2004-09-14 Tim Waugh <twaugh@redhat.com>

Browse Source 
* src/plugins/Ancestors.py: Fixed SF bug #1009695.


svn: r3543
This commit is contained in:
Tim Waugh 2004-09-14 13:51:18 +00:00
parent 71e20a6585
commit 46b32a5619
2 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,4 +1,5 @@
2004-09-14 Tim Waugh <twaugh@redhat.com> 2004-09-14 Tim Waugh <twaugh@redhat.com>
* src/plugins/Ancestors.py: Fixed SF bug #1009695.
* src/docgen/PSDrawDoc.py (PSDrawDoc.__init__): Fixed base method * src/docgen/PSDrawDoc.py (PSDrawDoc.__init__): Fixed base method
call (missing parameter). call (missing parameter).
* src/docgen/SvgDrawDoc.py (SvgDrawDoc.__init__): Likewise. * src/docgen/SvgDrawDoc.py (SvgDrawDoc.__init__): Likewise.

62
src/plugins/Ancestors.py
View File

@ -682,7 +682,7 @@ class ComprehensiveAncestorsReport (Report.Report):
def married_whom (self, person, from_family, listing_children = 0): def married_whom (self, person, from_family, listing_children = 0):
gender = person.get_gender () gender = person.get_gender ()
first_marriage = 1 first_rel = 1
ret = '' ret = ''
for family_handle in person.get_family_handle_list (): for family_handle in person.get_family_handle_list ():
family = self.database.get_family_from_handle(family_handle) family = self.database.get_family_from_handle(family_handle)
@ -727,33 +727,45 @@ class ComprehensiveAncestorsReport (Report.Report):
else: else:
continue continue
#marriage = family.get_marriage () if marriage:
if not first_marriage: if not first_rel:
if gender == RelLib.Person.female: if gender == RelLib.Person.female:
ret += _(' She later married %(name)s') % \ ret += _(' She later married %(name)s') % \
{'name': self.person_name (spouse_id)} {'name': self.person_name (spouse)}
else:
ret += _(' He later married %(name)s') % \
{'name': self.person_name (spouse)}
elif (listing_children or
spouse == mother or
family != from_family):
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)}
ret += self.event_info (marriage)
else: # Not a marriage
if not first_rel:
if gender == RelLib.Person.female:
ret += _(' She later had a relationship with %(name)s') % \
{'name': self.person_name (spouse)}
else:
ret += _(' He later had a relationship with %(name)s') % \
{'name': self.person_name (spouse)}
else: else:
ret += _(' He later married %(name)s') % \ if gender == RelLib.Person.female:
{'name': self.person_name (spouse_id)} ret += _(' She had a relationship with %(name)s') % \
{'name': self.person_name (spouse)}
else:
ret += _(' He had a relationship with %(name)s') % \
{'name': self.person_name (spouse)}
if marriage: ret += children + '.'
ret += self.event_info (marriage)
ret += children + '.'
elif (listing_children or
spouse_id == mother_handle or
family_handle != from_family.get_handle()):
if gender == RelLib.Person.female:
ret += _(' She married %(name)s') % \
{'name': self.person_name (spouse_id)}
else:
ret += _(' He married %(name)s') % \
{'name': self.person_name (spouse_id)}
if marriage: first_rel = 0
ret += self.event_info (marriage)
ret += children + '.'
first_marriage = 0
return ret return ret