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

/plugins/rel_fr.py use correct gen for nephew/niece (out of lists)

Browse Source 
svn: r9309
This commit is contained in:
Jérôme Rapinat
2007-11-06 14:01:09 +00:00
parent 7f973965e7
commit 96b9841e69
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/rel_fr.py
View File

@@ -222,15 +222,15 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
def get_nephew(self, level, step='', inlaw=''): def get_nephew(self, level, step='', inlaw=''):
if level > len(_nephew_level)-1: if level > len(_nephew_level)-1:
return "le neveu éloigné, relié à la %s génération" % ( return "le neveu éloigné, à la %s génération" % (
_level_name[level+1]) _level_name[level])
else: else:
return _nephew_level[level] % inlaw return _nephew_level[level] % inlaw
def get_niece(self, level, step='', inlaw=''): def get_niece(self, level, step='', inlaw=''):
if level > len(_niece_level)-1: if level > len(_niece_level)-1:
return "la nièce éloignée, reliée à la %s génération" % ( return "la nièce éloignée, à la %s génération" % (
_level_name[level+1]) _level_name[level])
else: else:
return _niece_level[level] % inlaw return _niece_level[level] % inlaw
@@ -270,7 +270,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
elif Ga == 1: elif Ga == 1:
# These are nieces/nephews # These are nieces/nephews
if Gb < len(_nephews_nieces_level): if Gb < len(_nephews_nieces_level):
rel_str = _nephews_nieces_level[Gb] rel_str = _nephews_nieces_level[Gb-1]
else: else:
rel_str = "les neveux et les nièces" + gen % ( rel_str = "les neveux et les nièces" + gen % (
Gb) Gb)
@@ -418,11 +418,11 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
rel_str = self.get_niece(Gb-1, inlaw) rel_str = self.get_niece(Gb-1, inlaw)
else: else:
if gender_b == gen.lib.Person.MALE: if gender_b == gen.lib.Person.MALE:
rel_str = "le neveu éloigné" + bygen % ( rel_str = "le neveu éloigné (%dème génération)" % (
Gb+1) Gb)
elif gender_b == gen.lib.Person.FEMALE: elif gender_b == gen.lib.Person.FEMALE:
rel_str = "la nièce éloignée" + bygen % ( rel_str = "la nièce éloignée (%dème génération)" % (
Gb+1) Gb)
else: else:
return rel_str return rel_str
elif Ga == Gb: elif Ga == Gb: