8451: Fix crash on Relationships Graph report with unknown gender, related sibling label and french locale
This commit is contained in:
parent
ac21380b60
commit
cc1f5b734a
@ -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:
|
||||||
|
Loading…
Reference in New Issue
Block a user