* various: Change Person.male, Person.female, and Person.unkwown
to Person.MALE, Person.FEMALE and Person.UNKNOWN * gramps.spec.in: bring up to date, support Fedora Core and Mandrake * src/plugins/NavWebPage.py: Start of the Narrative Web Page plugin svn: r4008
This commit is contained in:
@@ -225,32 +225,32 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
|
||||
if firstRel == 0:
|
||||
if secondRel == 0:
|
||||
return ('',common)
|
||||
elif other_person.get_gender() == RelLib.Person.male:
|
||||
elif other_person.get_gender() == RelLib.Person.MALE:
|
||||
return (self.get_father(secondRel),common)
|
||||
else:
|
||||
return (self.get_mother(secondRel),common)
|
||||
elif secondRel == 0:
|
||||
if other_person.get_gender() == RelLib.Person.male:
|
||||
if other_person.get_gender() == RelLib.Person.MALE:
|
||||
return (self.get_son(firstRel),common)
|
||||
else:
|
||||
return (self.get_daughter(firstRel),common)
|
||||
elif firstRel == 1:
|
||||
if other_person.get_gender() == RelLib.Person.male:
|
||||
if other_person.get_gender() == RelLib.Person.MALE:
|
||||
return (self.get_uncle(secondRel),common)
|
||||
else:
|
||||
return (self.get_aunt(secondRel),common)
|
||||
elif secondRel == 1:
|
||||
if other_person.get_gender() == RelLib.Person.male:
|
||||
if other_person.get_gender() == RelLib.Person.MALE:
|
||||
return (self.get_nephew(firstRel-1),common)
|
||||
else:
|
||||
return (self.get_niece(firstRel-1),common)
|
||||
elif secondRel > firstRel:
|
||||
if other_person.get_gender() == RelLib.Person.male:
|
||||
if other_person.get_gender() == RelLib.Person.MALE:
|
||||
return (self.get_senior_male_cousin(firstRel-1,secondRel-firstRel),common)
|
||||
else:
|
||||
return (self.get_senior_female_cousin(firstRel-1,secondRel-firstRel),common)
|
||||
else:
|
||||
if other_person.get_gender() == RelLib.Person.male:
|
||||
if other_person.get_gender() == RelLib.Person.MALE:
|
||||
return (self.get_junior_male_cousin(secondRel-1,firstRel-secondRel),common)
|
||||
else:
|
||||
return (self.get_junior_female_cousin(secondRel-1,firstRel-secondRel),common)
|
||||
|
||||
Reference in New Issue
Block a user