* src/RelLib/Makefile.am: Ship new file.
	* src/PluginUtils/_ReportUtils.py: Use fam relations from new module.
	* src/Relationship.py: Use family relations from new module.
	* src/Utils.py: Remove family relations.
	* src/RelLib/__init__.py: Expose new module.
	* src/RelLib/_Family.py: Adapt to new types.
	* src/GrampsDb/_ReadXML.py: Adapt to new types.
	* src/GrampsDb/_ConstXML.py: Remove family relations.
	* src/RelLib/_FamilyRelType.py: Add new class
In po:
2006-04-19  Alex Roitman  <shura@gramps-project.org>
	* POTFILES.in: Add new files.



svn: r6369
This commit is contained in:
Alex Roitman
2006-04-19 18:27:51 +00:00
parent 4944e06cef
commit 90832a683e
12 changed files with 135 additions and 68 deletions

View File

@@ -260,33 +260,33 @@ class RelationshipCalculator:
gender = RelLib.Person.FEMALE
# Person's gender is unknown, try guessing from spouse's
elif orig.get_gender() == RelLib.Person.MALE:
if family_rel == RelLib.Family.CIVIL_UNION:
if family_rel == RelLib.FamilyRelType.CIVIL_UNION:
gender = RelLib.Person.MALE
else:
gender = RelLib.Person.FEMALE
elif orig.get_gender() == RelLib.Person.FEMALE:
if family_rel == RelLib.Family.CIVIL_UNION:
if family_rel == RelLib.FamilyRelType.CIVIL_UNION:
gender = RelLib.Person.FEMALE
else:
gender = RelLib.Person.MALE
else:
gender = RelLib.Person.UNKNOWN
if family_rel == RelLib.Family.MARRIED:
if family_rel == RelLib.FamilyRelType.MARRIED:
if gender == RelLib.Person.MALE:
return _("husband")
elif gender == RelLib.Person.FEMALE:
return _("wife")
else:
return _("gender unknown|spouse")
elif family_rel == RelLib.Family.UNMARRIED:
elif family_rel == RelLib.FamilyRelType.UNMARRIED:
if gender == RelLib.Person.MALE:
return _("unmarried|husband")
elif gender == RelLib.Person.FEMALE:
return _("unmarried|wife")
else:
return _("gender unknown,unmarried|spouse")
elif family_rel == RelLib.Family.CIVIL_UNION:
elif family_rel == RelLib.FamilyRelType.CIVIL_UNION:
if gender == RelLib.Person.MALE:
return _("male,civil union|partner")
elif gender == RelLib.Person.FEMALE: