Updated french translation, bug fix in Marriage.py

svn: r838
This commit is contained in:
Don Allingham 2002-03-14 15:04:48 +00:00
parent 6b096c67f8
commit 7ffc18be0f
3 changed files with 18 additions and 17 deletions

View File

@ -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():

Binary file not shown.

View File

@ -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"