diff --git a/src/Marriage.py b/src/Marriage.py index 2d1d44d4a..f42e3f8a4 100644 --- a/src/Marriage.py +++ b/src/Marriage.py @@ -369,21 +369,22 @@ class Marriage: GnomeWarningDialog("%s" % msg1) relation = self.type_field.entry.get_text() - if const.save_frel(relation) != self.family.getRelationship(): - father = self.family.getFather() - mother = self.family.getMother() - if father.getGender() == mother.getGender(): - self.family.setRelationship("Partners") - else: - val = const.save_frel(relation) - if val == "Partners": - val = "Unknown" - if father.getGender() == Person.female or \ - mother.getGender() == Person.male: - self.family.setFather(mother) - self.family.setMother(father) - self.family.setRelationship(val) - Utils.modified() + father = self.family.getFather() + mother = self.family.getMother() + if father and mother: + if const.save_frel(relation) != self.family.getRelationship(): + if father.getGender() == mother.getGender(): + self.family.setRelationship("Partners") + else: + val = const.save_frel(relation) + if val == "Partners": + val = "Unknown" + if father.getGender() == Person.female or \ + mother.getGender() == Person.male: + self.family.setFather(mother) + self.family.setMother(father) + self.family.setRelationship(val) + Utils.modified() text = self.notes_field.get_chars(0,-1) if text != self.family.getNote(): diff --git a/src/locale/fr/LC_MESSAGES/gramps.mo b/src/locale/fr/LC_MESSAGES/gramps.mo index b01b29c05..e84d38e23 100644 Binary files a/src/locale/fr/LC_MESSAGES/gramps.mo and b/src/locale/fr/LC_MESSAGES/gramps.mo differ diff --git a/src/po/fr.po b/src/po/fr.po index 77874d450..633b87301 100644 --- a/src/po/fr.po +++ b/src/po/fr.po @@ -270,11 +270,11 @@ msgstr "Septembre" #: Date.py:108 msgid "(from|between|bet|bet." -msgstr "(de|entre|ent|ent.)" +msgstr "(de|entre|ent|ent." #: Date.py:109 msgid "(and|to|-" -msgstr "(et|à|-)" +msgstr "(et|à|-" #: Date.py:241 Date.py:267 Date.py:280 msgid "from"