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

8451: Fix crash on Relationships Graph report with unknown gender, related sibling label and french locale

Browse Source
This commit is contained in:
Jérôme Rapinat 2015-03-19 15:25:16 +01:00 committed by Ross Gammon
parent ec427f602c
commit 0ae571de7d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gramps/plugins/rel/rel_fr.py
View File

@ -333,7 +333,7 @@ def get_child_unknown(level, inlaw=""):
else: else:
return "un descendant lointain%s" % inlaw return "un descendant lointain%s" % inlaw
def get_sibling_unknown(inlaw=""): def get_sibling_unknown(Ga, inlaw=""):
""" """
sibling of an ancestor, gender = unknown sibling of an ancestor, gender = unknown
""" """
@ -653,7 +653,7 @@ class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
elif gender_b == Person.FEMALE: elif gender_b == Person.FEMALE:
rel_str = "la tante lointaine" + bygen % (Ga + 1) rel_str = "la tante lointaine" + bygen % (Ga + 1)
elif gender_b == Person.UNKNOWN: elif gender_b == Person.UNKNOWN:
rel_str = get_sibling_unknown(inlaw) rel_str = get_sibling_unknown(Ga, inlaw)
else: else:
return rel_str return rel_str
elif Ga == 1: elif Ga == 1:
@ -672,7 +672,7 @@ class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
rel_str = "la nièce lointaine%s (%dème génération)" % \ rel_str = "la nièce lointaine%s (%dème génération)" % \
(inlaw, Gb) (inlaw, Gb)
elif gender_b == Person.UNKNOWN: elif gender_b == Person.UNKNOWN:
rel_str = get_sibling_unknown(inlaw) rel_str = get_sibling_unknown(Ga, inlaw)
else: else:
return rel_str return rel_str
elif Ga == Gb: elif Ga == Gb:
@ -684,7 +684,7 @@ class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
elif gender_b == Person.FEMALE: elif gender_b == Person.FEMALE:
rel_str = get_cousine(Ga - 1, 0, inlaw=inlaw) rel_str = get_cousine(Ga - 1, 0, inlaw=inlaw)
elif gender_b == Person.UNKNOWN: elif gender_b == Person.UNKNOWN:
rel_str = get_sibling_unknown(inlaw) rel_str = get_sibling_unknown(Ga, inlaw)
else: else:
return rel_str return rel_str
elif Ga > 1 and Ga > Gb: elif Ga > 1 and Ga > Gb: