Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/Relationship.py: fix error with nephew, niece

Browse Source 
2007-11-06 Benny Malengier <benny.malengier@gramps-project.org>


svn: r9312
This commit is contained in:
Benny Malengier 2007-11-06 18:58:44 +00:00
parent 90a29e390b
commit 5cc8a5357b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2007-11-06 Benny Malengier <benny.malengier@gramps-project.org>
* src/Relationship.py: fix error with nephew, niece
2007-11-06 Benny Malengier <benny.malengier@gramps-project.org> 2007-11-06 Benny Malengier <benny.malengier@gramps-project.org>
* src/gramps.py: text error, issue #1342 * src/gramps.py: text error, issue #1342

8
src/Relationship.py
View File

@ -1403,12 +1403,12 @@ class RelationshipCalculator:
elif Ga == 1: elif Ga == 1:
# b is niece/nephew of a # b is niece/nephew of a
if gender_b == gen.lib.Person.MALE: if gender_b == gen.lib.Person.MALE:
rel_str = self.get_nephew(Gb, step, inlaw) rel_str = self.get_nephew(Gb-1, step, inlaw)
elif gender_b == gen.lib.Person.FEMALE: elif gender_b == gen.lib.Person.FEMALE:
rel_str = self.get_niece(Gb, step, inlaw) rel_str = self.get_niece(Gb-1, step, inlaw)
elif Gb < len(_niece_level) and Gb < len(_nephew_level): elif Gb < len(_niece_level) and Gb < len(_nephew_level):
rel_str = "%s or %s" % (self.get_nephew(Gb, step, inlaw), rel_str = "%s or %s" % (self.get_nephew(Gb-1, step, inlaw),
self.get_niece(Gb, step, inlaw)) self.get_niece(Gb-1, step, inlaw))
else: else:
rel_str = "distant %snephews/nieces%s" % (step, inlaw) rel_str = "distant %snephews/nieces%s" % (step, inlaw)
elif Ga == Gb: elif Ga == Gb: