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

update

Browse Source 
svn: r4255
This commit is contained in:
Don Allingham 2005-03-30 03:50:25 +00:00
parent 9d2dffcc9d
commit 94d4aa7288
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gramps2/src/MergePeople.py
View File

@ -102,14 +102,14 @@ class Compare:
if len(elist) > 0: if len(elist) > 0:
self.add(tobj,title,_("Events") + "\n") self.add(tobj,title,_("Events") + "\n")
for event_handle in person.get_event_list(): for event_handle in person.get_event_list():
title = self.db.find_event_from_handle(event_handle).get_title() name = self.db.get_event_from_handle(event_handle).get_name()
self.add(tobj,normal,"%s:\t%s\n" % (title,self.get_event_info(dhandle))) self.add(tobj,normal,"%s:\t%s\n" % (name,self.get_event_info(dhandle)))
self.add(tobj,title,_("Parents") + "\n")
plist = person.get_parent_family_handle_list() plist = person.get_parent_family_handle_list()
if len(plist) > 0: if len(plist) > 0:
self.add(tobj,title,_("Parents") + "\n")
for fid in person.get_parent_family_handle_list(): for fid in person.get_parent_family_handle_list():
(fn,mn,id) = self.get_parent_info(fid[0]) (fn,mn,id) = self.get_parent_info(fid[0])
self.add(tobj,normal,"%s:\t%s\n" % (_('Family'),id)) self.add(tobj,normal,"%s:\t%s\n" % (_('Family ID'),id))
if fn: if fn:
self.add(tobj,indent,"%s:\t%s\n" % (_('Father'),fn)) self.add(tobj,indent,"%s:\t%s\n" % (_('Father'),fn))
if mn: if mn:
@ -130,7 +130,7 @@ class Compare:
self.add(tobj,indent,"%s:\t%s\n" % (_('Spouse'),name_of(spouse))) self.add(tobj,indent,"%s:\t%s\n" % (_('Spouse'),name_of(spouse)))
relstr = const.family_relations[family.get_relationship()][0] relstr = const.family_relations[family.get_relationship()][0]
self.add(tobj,indent,"%s:\t%s\n" % (_('Type'),relstr)) self.add(tobj,indent,"%s:\t%s\n" % (_('Type'),relstr))
event = ReportUtils.find_marriage(person,family) event = ReportUtils.find_marriage(self.db,family)
if event: if event:
self.add(tobj,indent,"%s:\t%s\n" % (_('Marriage'),self.get_event_info(event.get_handle()))) self.add(tobj,indent,"%s:\t%s\n" % (_('Marriage'),self.get_event_info(event.get_handle())))
for child_id in family.get_child_handle_list(): for child_id in family.get_child_handle_list():