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

Fixed issues #1881, #1910

Browse Source 
svn: r10220
This commit is contained in:
Peter Landgren 2008-03-08 10:51:33 +00:00
parent ca85ef1151
commit e31ffee680
1 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/plugins/rel_sv.py
View File

@ -42,23 +42,25 @@ from PluginUtils import register_relcalc
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
_cousin_level = [ "", "kusin", _cousin_level = [ "", "kusin",
"tremänning", "fyrmänning", "femmänning", u"tremänning", u"fyrmänning", u"femmänning",
"sexmänning", "sjumänning", "åttamänning", u"sexmänning", u"sjumänning", u"åttamänning",
"niomänning", "tiomänning", "elvammänning", u"niomänning", u"tiomänning", u"elvammänning",
"tolvmänning", "trettonmänning", "fjortonmänning", u"tolvmänning", u"trettonmänning", u"fjortonmänning",
"femtonmänning", "sextonmänning", "sjuttonmänning", u"femtonmänning", u"sextonmänning", u"sjuttonmänning",
"artonmänning", "nittonmänning", "tjugomänning", u"artonmänning", u"nittonmänning", u"tjugomänning",
"tjugoettmänning", "tjugotvåmänning", "tjugotremänning", u"tjugoettmänning", u"tjugotvåmänning", u"tjugotremänning",
"tjugofyramänning","tjugofemmänning","tjugoexmänning", u"tjugofyramänning",u"tjugofemmänning",u"tjugoexmänning",
"tjugosjumänning","tjugoåttamänning","tjugoniomänning", u"tjugosjumänning",u"tjugoåttamänning",u"tjugoniomänning",
"trettiomänning" ] u"trettiomänning" ]
_children_level = 20 _children_level = 20
_level_name = [ "", "första", "andra", "tredje", "fjärde", "femte", _level_name = [ "", u"första",
"sjätte", "sjunde", "åttonde", "nionde", "tionde", u"andra", u"tredje", u"fjärde", u"femte",
"elfte", "tolfte", "trettonde", "fjortonde", "femtonde", u"sjätte", u"sjunde", u"åttonde", u"nionde",
"sextonde", "sjuttonde", "artonde", "nittonde", "tjugonde" ] u"tionde", u"elfte", u"tolfte", u"trettonde",
u"fjortonde", u"femtonde", u"sextonde", u"sjuttonde",
u"artonde", u"nittonde", u"tjugonde" ]
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -79,7 +81,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
def _get_cousin(self, level, step, inlaw): def _get_cousin(self, level, step, inlaw):
if level > len(_cousin_level)-1: if level > len(_cousin_level)-1:
return "avlägset släkt" return u"avlägset släkt"
else: else:
result = inlaw + _cousin_level[level] result = inlaw + _cousin_level[level]
if step: if step:
@ -129,13 +131,13 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if person_gender == gen.lib.Person.FEMALE: if person_gender == gen.lib.Person.FEMALE:
result[-1] = 'mor' result[-1] = 'mor'
if person_gender == gen.lib.Person.UNKNOWN: if person_gender == gen.lib.Person.UNKNOWN:
result[-1] = 'förälder' result[-1] = u'förälder'
if step != '' and len(result)==1: if step != '' and len(result)==1:
#Preceed with step prefix of father/mother #Preceed with step prefix of father/mother
result[0] = self.STEP + result[0] result[0] = self.STEP + result[0]
if inlaw != '': if inlaw != '':
#Preceed with inlaw prefix #Preceed with inlaw prefix
result[-1] = 'svär' + result[-1] result[-1] = u'svär' + result[-1]
if len(result)>1 and len(result) % 2 == 0 and (person_gender == gen.lib.Person.UNKNOWN or inlaw != ''): if len(result)>1 and len(result) % 2 == 0 and (person_gender == gen.lib.Person.UNKNOWN or inlaw != ''):
# Correct string "-2" with genitive s and add a space to get correctSwedish, if even number in result # Correct string "-2" with genitive s and add a space to get correctSwedish, if even number in result
result[-2] = result[-2] + 's ' result[-2] = result[-2] + 's '
@ -161,7 +163,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
result[0] = self.STEP + result[0] result[0] = self.STEP + result[0]
if inlaw != '': if inlaw != '':
#Preceed with inlaw prefix #Preceed with inlaw prefix
result[-1] = 'svär' + result[-1] result[-1] = u'svär' + result[-1]
if len(result)>1 and len(result) % 2 == 0 and (person_gender == gen.lib.Person.UNKNOWN or inlaw != ''): if len(result)>1 and len(result) % 2 == 0 and (person_gender == gen.lib.Person.UNKNOWN or inlaw != ''):
# Correct string "-2" with genitive s and add a space to get correct Swedish, if even number in result # Correct string "-2" with genitive s and add a space to get correct Swedish, if even number in result
result[-2] = result[-2] + 's ' result[-2] = result[-2] + 's '
@ -214,7 +216,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
result[0] = self.STEP + result[0] result[0] = self.STEP + result[0]
if inlaw != '': if inlaw != '':
#Preceed with inlaw prefix #Preceed with inlaw prefix
result[-1] = 'svär' + result[-1] result[-1] = u'svär' + result[-1]
if len(result)>1 and len(result) % 2 == 0 and (person_gender == gen.lib.Person.UNKNOWN or inlaw != ''): if len(result)>1 and len(result) % 2 == 0 and (person_gender == gen.lib.Person.UNKNOWN or inlaw != ''):
# Correct string "-2" with genitive s and add a space to get correct Swedish, if even number in result # Correct string "-2" with genitive s and add a space to get correct Swedish, if even number in result
result[-2] = result[-2] + 's ' result[-2] = result[-2] + 's '
@ -233,10 +235,10 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
result[0] = self.STEP + result[0] result[0] = self.STEP + result[0]
if inlaw != '': if inlaw != '':
#Preceed with inlaw prefix #Preceed with inlaw prefix
result[-1] = 'svåger' result[-1] = u'svåger'
if inlaw != '' and person_gender == gen.lib.Person.UNKNOWN: if inlaw != '' and person_gender == gen.lib.Person.UNKNOWN:
#Preceed with inlaw prefix #Preceed with inlaw prefix
result[-1] = 'svåger/svägerska' result[-1] = u'svåger/svägerska'
if len(result)>1 and len(result) % 2 == 0 and (person_gender == gen.lib.Person.UNKNOWN or inlaw != ''): if len(result)>1 and len(result) % 2 == 0 and (person_gender == gen.lib.Person.UNKNOWN or inlaw != ''):
# Correct string "-2" with genitive s and add a space to get correct Swedish, if even number in result # Correct string "-2" with genitive s and add a space to get correct Swedish, if even number in result
result[-2] = result[-2] + 's ' result[-2] = result[-2] + 's '
@ -254,7 +256,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
result[0] = self.STEP + result[0] result[0] = self.STEP + result[0]
if inlaw != '' : if inlaw != '' :
#Preceed with inlaw prefix #Preceed with inlaw prefix
result[-1] = 'svägerska' result[-1] = u'svägerska'
if len(result)>1 and len(result) % 2 == 0 and inlaw != '': if len(result)>1 and len(result) % 2 == 0 and inlaw != '':
# Correct string "-2" with genitive s and add a space to get # Correct string "-2" with genitive s and add a space to get
# correct Swedish, if even number in result # correct Swedish, if even number in result
@ -321,7 +323,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
@rtype: str @rtype: str
""" """
rel_str = "avlägsna släktingar" rel_str = u"avlägsna släktingar"
if Ga == 0: if Ga == 0:
result = [] result = []
# These are descendants # These are descendants
@ -330,25 +332,25 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
result.append("barn") result.append("barn")
rel_str = self.pair_up(result,'') rel_str = self.pair_up(result,'')
else: else:
rel_str = "avlägsna ättlingar" rel_str = u"avlägsna ättlingar"
elif Gb == 0: elif Gb == 0:
# These are parents/grand parents # These are parents/grand parents
if Ga < len(_level_name): if Ga < len(_level_name):
if Ga == 1: if Ga == 1:
rel_str = "föräldrar" rel_str = u"föräldrar"
else: else:
rel_str = "far- och morföräldrar i %s generationen" % _level_name[Ga] rel_str = u"far- och morföräldrar i %s generationen" % _level_name[Ga]
else: else:
rel_str = "avlägsna förfäder" rel_str = u"avlägsna förfäder"
elif Gb == 1: elif Gb == 1:
# These are siblings/aunts/uncles # These are siblings/aunts/uncles
if Ga < len(_level_name): if Ga < len(_level_name):
if Ga == 1: if Ga == 1:
rel_str = "syskon" rel_str = "syskon"
else: else:
rel_str = "förfäders syskon i %s generationen" % _level_name[Ga-1] rel_str = u"förfäders syskon i %s generationen" % _level_name[Ga-1]
else: else:
rel_str = "avlägsna farbröder/morbröder/fastrar/mostrar" rel_str = u"avlägsna farbröder/morbröder/fastrar/mostrar"
elif Ga == 1: elif Ga == 1:
# These are nieces/nephews # These are nieces/nephews
if Gb < len(_level_name): if Gb < len(_level_name):
@ -358,7 +360,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
result.append("barn") result.append("barn")
rel_str = self.pair_up(result,'') rel_str = self.pair_up(result,'')
else: else:
rel_str = "avlägsna brorsöner/systersöner/brorsdöttrar/systerdöttrar" rel_str = u"avlägsna brorsöner/systersöner/brorsdöttrar/systerdöttrar"
elif Ga > 1 and Ga == Gb: elif Ga > 1 and Ga == Gb:
# These are cousins in the same generation # These are cousins in the same generation
rel_str = self._get_cousin_kinship(Ga) rel_str = self._get_cousin_kinship(Ga)
@ -367,9 +369,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
# being in a higher generation from the common ancestor than the # being in a higher generation from the common ancestor than the
# first person. # first person.
if Gb <= len(_level_name): if Gb <= len(_level_name):
rel_str = "förfäders " + self._get_cousin_kinship(Ga) + " i "+ _level_name[Gb] + " generationen" rel_str = u"förfäders " + self._get_cousin_kinship(Ga) + " i "+ _level_name[Gb] + " generationen"
else: else:
rel_str = "avlägsna kusiner" rel_str = u"avlägsna kusiner"
elif Gb > 1 and Gb > Ga: elif Gb > 1 and Gb > Ga:
# These are cousins in different generations with the second person # These are cousins in different generations with the second person
# being in a lower generation from the common ancestor than the # being in a lower generation from the common ancestor than the
@ -381,7 +383,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
result.append("barn") result.append("barn")
rel_str = self.pair_up(result,'') rel_str = self.pair_up(result,'')
else: else:
rel_str = "avlägsna kusiner" rel_str = u"avlägsna kusiner"
return rel_str return rel_str
def get_single_relationship_string(self, Ga, Gb, gender_a, gender_b, def get_single_relationship_string(self, Ga, Gb, gender_a, gender_b,
@ -476,7 +478,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
inlaw = self.INLAW inlaw = self.INLAW
else: else:
inlaw = '' inlaw = ''
rel_str = "avlägsen %s-släkting eller %s släkting" % (step, inlaw) rel_str = u"avlägsen %s-släkting eller %s släkting" % (step, inlaw)
if Ga == 0: if Ga == 0:
# b is descendant of a # b is descendant of a
if Gb == 0 : if Gb == 0 :