From 8212127ecf44156d8424d8ea36136647683f8ac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= Date: Sat, 24 Nov 2007 19:47:04 +0000 Subject: [PATCH] /src/plugins/rel_fr.py update svn: r9399 --- src/plugins/rel_fr.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/plugins/rel_fr.py b/src/plugins/rel_fr.py index c9c6d7f5c..991b1dd6c 100644 --- a/src/plugins/rel_fr.py +++ b/src/plugins/rel_fr.py @@ -536,11 +536,11 @@ class RelationshipCalculator(Relationship.RelationshipCalculator): rel_str = 'le frère ou la sœur (germain)' else: if gender_b == gen.lib.Person.MALE: - rel_str = self.get_uncle(1, '') + rel_str = "le beau-frère" elif gender_b == gen.lib.Person.FEMALE: - rel_str = self.get_aunt(1, '') + rel_str = "la belle-sœur" else: - rel_str = self.get_sibling_unknown(1, '') + rel_str = "le beau-frère ou la belle-sœur" elif sib_type == self.UNKNOWN_SIB: if not inlaw: if gender_b == gen.lib.Person.MALE: @@ -551,12 +551,11 @@ class RelationshipCalculator(Relationship.RelationshipCalculator): rel_str = 'le frère ou la sœur' else: if gender_b == gen.lib.Person.MALE: - rel_str = self.get_uncle(1, '') + rel_str = "le beau-frère" elif gender_b == gen.lib.Person.FEMALE: - rel_str = self.get_aunt(1, '') + rel_str = "la belle-sœur" else: - rel_str = self.get_sibling_unknown(1, '') - + rel_str = "le beau-frère ou la belle-sœur" elif sib_type == self.HALF_SIB_FATHER: if gender_b == gen.lib.Person.MALE: rel_str = "le demi-frère consanguin" @@ -573,12 +572,11 @@ class RelationshipCalculator(Relationship.RelationshipCalculator): rel_str = "le demi-frère ou la demi-sœur utérin(e)" elif sib_type == self.STEP_SIB: if gender_b == gen.lib.Person.MALE: - rel_str = "le beau-frère" + rel_str = "le demi-frère" elif gender_b == gen.lib.Person.FEMALE: - rel_str = "la belle-sœur" + rel_str = "la demi-sœur" else: - rel_str = "le beau-frère ou la belle-sœur" - + rel_str = "le demi-frère ou la demi-sœur" return rel_str