* src/MergePeople.py: Avoid creating duplicate spouse-to-family links

* src/po/es.po: Partial translation update.


svn: r5470
This commit is contained in:
Julio Sánchez 2005-12-03 17:36:29 +00:00
parent 0f5e8db002
commit 0ead40054e
3 changed files with 4718 additions and 3202 deletions

View File

@ -1,3 +1,7 @@
2005-12-03 Julio Sanchez <jsanchez@users.sourceforge.net>
* src/MergePeople.py: Avoid creating duplicate spouse-to-family links
* src/po/es.po: Partial translation update.
2005-12-02 Alex Roitman <shura@gramps-project.org>
* src/po/ru.po: Partial translation update.

View File

@ -768,7 +768,8 @@ class MergePeople:
if __debug__:
print "Deleted src_family %s" % src_family_handle
self.db.commit_family(tgt_family,trans)
new.add_family_handle(tgt_family.get_handle())
if tgt_family.get_handle() not in new.get_family_handle_list():
new.add_family_handle(tgt_family.get_handle())
def merge_family_pair(self,tgt_family,src_family,trans):

File diff suppressed because it is too large Load Diff