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

* src/FamilyView.py (north_american,latin_american,icelandic): Fix

Browse Source 
object/handle mixups.


svn: r4799
This commit is contained in:
Alex Roitman 2005-06-07 16:41:50 +00:00
parent e47701ab02
commit 4f15cfc10f
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2005-06-07 Alex Roitman <shura@gramps-project.org>
* src/FamilyView.py (north_american,latin_american,icelandic): Fix
object/handle mixups.
2005-06-05 Eero Tamminen <eerot@sf> 2005-06-05 Eero Tamminen <eerot@sf>
* src/po/fi.po: Translated rest of the tips (=everything). * src/po/fi.po: Translated rest of the tips (=everything).
Improved previous translations and fixed typos. Improved previous translations and fixed typos.

23
gramps2/src/FamilyView.py
View File

@ -1549,10 +1549,10 @@ class FamilyView:
pname = self.person.get_primary_name() pname = self.person.get_primary_name()
return (pname.get_surname_prefix(),pname.get_surname()) return (pname.get_surname_prefix(),pname.get_surname())
elif self.family: elif self.family:
fid = self.family.get_father_handle() father_handle = self.family.get_father_handle()
f = self.parent.db.get_family_from_handle(fid) if father_handle:
if f: father = self.parent.db.get_person_from_handle(father_handle)
pname = f.get_primary_name() pname = father.get_primary_name()
return (pname.get_surname_prefix(),pname.get_surname()) return (pname.get_surname_prefix(),pname.get_surname())
return ("","") return ("","")
@ -1561,10 +1561,12 @@ class FamilyView:
def latin_american(self,val): def latin_american(self,val):
if self.family: if self.family:
father = self.family.get_father_handle() father_handle = self.family.get_father_handle()
mother = self.family.get_mother_handle() mother_handle = self.family.get_mother_handle()
if not father or not mother: if not father_handle or not mother_handle:
return ("","") return ("","")
father = self.parent.db.get_person_from_handle(father_handle)
mother = self.parent.db.get_person_from_handle(mother_handle)
fsn = father.get_primary_name().get_surname() fsn = father.get_primary_name().get_surname()
msn = mother.get_primary_name().get_surname() msn = mother.get_primary_name().get_surname()
if not father or not mother: if not father or not mother:
@ -1581,9 +1583,10 @@ class FamilyView:
if self.person.get_gender() == RelLib.Person.MALE: if self.person.get_gender() == RelLib.Person.MALE:
fname = self.person.get_primary_name().get_first_name() fname = self.person.get_primary_name().get_first_name()
elif self.family: elif self.family:
f = self.family.get_father_handle() father_handle = self.family.get_father_handle()
if f: if father_handle:
fname = f.get_primary_name().get_first_name() father = self.parent.db.get_person_from_handle(father_handle)
fname = father.get_primary_name().get_first_name()
if fname: if fname:
fname = fname.split()[0] fname = fname.split()[0]
if val == 0: if val == 0: