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

Now I got it right!

Browse Source 
svn: r1483
This commit is contained in:
Alex Roitman 2003-04-30 13:23:25 +00:00
parent 7e3546eb89
commit 8a514751d0
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gramps2/src/plugins/rel_ru.py
View File

@ -33,13 +33,13 @@ import GrampsCfg
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# # Russian-specific definitions of relationships
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
_male_cousin_level = [ "двоюродный", "троюродный", "четвероюродный", ] _male_cousin_level = [ "", "двоюродный", "троюродный", "четвероюродный", ]
_female_cousin_level = [ "двоюродная", "троюродная", "четвероюродная", ] _female_cousin_level = [ "", "двоюродная", "троюродная", "четвероюродная", ]
_junior_male_removed_level = [ "брат", "племянник", "внучатый племянник", _junior_male_removed_level = [ "брат", "племянник", "внучатый племянник",
"правнучатый племянник", "праправнучатый племянник", ] "правнучатый племянник", "праправнучатый племянник", ]
@ -47,9 +47,9 @@ _junior_male_removed_level = [ "брат", "племянник", "внучаты
_junior_female_removed_level = [ "сестра", "племянница", "внучатая племянница", _junior_female_removed_level = [ "сестра", "племянница", "внучатая племянница",
"правнучатая племянница", "праправнучатая племянница", ] "правнучатая племянница", "праправнучатая племянница", ]
_senior_male_removed_level = [ "дядя", "дед", "прадед", "прапрадед", ] _senior_male_removed_level = [ "", "дядя", "дед", "прадед", "прапрадед", ]
_senior_female_removed_level = [ "тетка", "бабка", "прабабка", "прапрабабка", ] _senior_female_removed_level = [ "", "тетка", "бабка", "прабабка", "прапрабабка", ]
_father_level = [ "", "отец", "дед", "прадед", "прапрадед", _father_level = [ "", "отец", "дед", "прадед", "прапрадед",
"пра-пра-прадед", "пра-пра-пра-прадед", ] "пра-пра-прадед", "пра-пра-пра-прадед", ]
@ -138,7 +138,7 @@ def get_relationship(orig_person,other_person):
Returns a string representing the relationshp between the two people, Returns a string representing the relationshp between the two people,
along with a list of common ancestors (typically father,mother) along with a list of common ancestors (typically father,mother)
Special cases: relation strings "undefined" and "spouse". Special cases: relation strings "", "undefined" and "spouse".
""" """
firstMap = {} firstMap = {}
@ -213,8 +213,7 @@ def get_relationship(orig_person,other_person):
return (get_nephew(firstRel-1),common) return (get_nephew(firstRel-1),common)
else: else:
return (get_niece(firstRel-1),common) return (get_niece(firstRel-1),common)
else: elif secondRel > firstRel:
if secondRel > firstRel:
if other_person.getGender() == RelLib.Person.male: if other_person.getGender() == RelLib.Person.male:
return (get_senior_male_cousin(firstRel-1,secondRel-firstRel),common) return (get_senior_male_cousin(firstRel-1,secondRel-firstRel),common)
else: else:
@ -223,7 +222,7 @@ def get_relationship(orig_person,other_person):
if other_person.getGender() == RelLib.Person.male: if other_person.getGender() == RelLib.Person.male:
return (get_junior_male_cousin(secondRel-1,firstRel-secondRel),common) return (get_junior_male_cousin(secondRel-1,firstRel-secondRel),common)
else: else:
return (get_junior_female_cousin(firstRel-1,secondRel-firstRel),common) return (get_junior_female_cousin(secondRel-1,firstRel-secondRel),common)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------