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

Allow for ID values to be strings

Browse Source 
svn: r243
This commit is contained in:
Don Allingham
2001-07-13 04:32:59 +00:00
parent f57adb09df
commit 6267eb4fc9
11 changed files with 49 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/Merge.py
View File

@@ -538,8 +538,8 @@ class Merge:
else:
mother2 = ""
label1 = "%s (%s)" % (_("First Person"),str(person1.getId()))
label2 = "%s (%s)" % (_("Second Person"),str(person2.getId()))
label1 = "%s (%s)" % (_("First Person"),person1.getId())
label2 = "%s (%s)" % (_("Second Person"),person2.getId())
self.topDialog.get_widget("PersonFrame1").set_label(label1)
self.topDialog.get_widget("PersonFrame2").set_label(label2)
@@ -613,7 +613,7 @@ class Merge:
name = "unknown"
else:
name = spouse.getPrimaryName().getName() + \
" (" + str(spouse.getId()) + ")"
" (" + spouse.getId() + ")"
self.topDialog.get_widget("spouse1").append([name])
length = min(len(p2list),3)
@@ -631,7 +631,7 @@ class Merge:
name = "unknown"
else:
name = spouse.getPrimaryName().getName() + \
" (" + str(spouse.getId()) + ")"
" (" + spouse.getId() + ")"
self.topDialog.get_widget("spouse2").append([name])
self.mergee = person1