From 96b9841e69416f67de18044d9e56877aa72e067f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= Date: Tue, 6 Nov 2007 14:01:09 +0000 Subject: [PATCH] /plugins/rel_fr.py use correct gen for nephew/niece (out of lists) svn: r9309 --- src/plugins/rel_fr.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/plugins/rel_fr.py b/src/plugins/rel_fr.py index 90a0a3482..5dc57c502 100644 --- a/src/plugins/rel_fr.py +++ b/src/plugins/rel_fr.py @@ -222,15 +222,15 @@ class RelationshipCalculator(Relationship.RelationshipCalculator): def get_nephew(self, level, step='', inlaw=''): if level > len(_nephew_level)-1: - return "le neveu éloigné, relié à la %s génération" % ( - _level_name[level+1]) + return "le neveu éloigné, à la %s génération" % ( + _level_name[level]) else: return _nephew_level[level] % inlaw def get_niece(self, level, step='', inlaw=''): if level > len(_niece_level)-1: - return "la nièce éloignée, reliée à la %s génération" % ( - _level_name[level+1]) + return "la nièce éloignée, à la %s génération" % ( + _level_name[level]) else: return _niece_level[level] % inlaw @@ -270,7 +270,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator): elif Ga == 1: # These are nieces/nephews if Gb < len(_nephews_nieces_level): - rel_str = _nephews_nieces_level[Gb] + rel_str = _nephews_nieces_level[Gb-1] else: rel_str = "les neveux et les nièces" + gen % ( Gb) @@ -418,11 +418,11 @@ class RelationshipCalculator(Relationship.RelationshipCalculator): rel_str = self.get_niece(Gb-1, inlaw) else: if gender_b == gen.lib.Person.MALE: - rel_str = "le neveu éloigné" + bygen % ( - Gb+1) + rel_str = "le neveu éloigné (%dème génération)" % ( + Gb) elif gender_b == gen.lib.Person.FEMALE: - rel_str = "la nièce éloignée" + bygen % ( - Gb+1) + rel_str = "la nièce éloignée (%dème génération)" % ( + Gb) else: return rel_str elif Ga == Gb: