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

* src/plugins/all_relations.py: english issues

Browse Source 
* src/Relationship.py: english issues

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


svn: r9313
This commit is contained in:
Benny Malengier 2007-11-06 19:46:07 +00:00
parent 5cc8a5357b
commit 9147ed2a9a
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2007-11-06 Benny Malengier <benny.malengier@gramps-project.org>
* src/plugins/all_relations.py: english issues
* src/Relationship.py: english issues
2007-11-06 Benny Malengier <benny.malengier@gramps-project.org> 2007-11-06 Benny Malengier <benny.malengier@gramps-project.org>
* src/Relationship.py: fix error with nephew, niece * src/Relationship.py: fix error with nephew, niece

19
src/Relationship.py
View File

@ -36,10 +36,6 @@ from TransUtils import sgettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
STEP= 'step'
INLAW='-in-law'
HALF = 'half'
_level_name = [ "", "first", "second", "third", "fourth", "fifth", "sixth", _level_name = [ "", "first", "second", "third", "fourth", "fifth", "sixth",
"seventh", "eighth", "ninth", "tenth", "eleventh", "twelfth", "seventh", "eighth", "ninth", "tenth", "eleventh", "twelfth",
"thirteenth", "fourteenth", "fifteenth", "sixteenth", "thirteenth", "fourteenth", "fifteenth", "sixteenth",
@ -260,6 +256,11 @@ class RelationshipCalculator:
STEP_SIB = 2 STEP_SIB = 2
UNKNOWN_SIB = 3 UNKNOWN_SIB = 3
#sibling strings
STEP= 'step'
INLAW='-in-law'
HALF = 'half-'
#partner types #partner types
PARTNER_MARRIED = 1 PARTNER_MARRIED = 1
PARTNER_UNMARRIED = 2 PARTNER_UNMARRIED = 2
@ -1357,10 +1358,10 @@ class RelationshipCalculator:
if only_birth: if only_birth:
step = '' step = ''
else: else:
step = STEP step = self.STEP
if in_law_a or in_law_b : if in_law_a or in_law_b :
inlaw = INLAW inlaw = self.INLAW
else: else:
inlaw = '' inlaw = ''
@ -1443,12 +1444,12 @@ class RelationshipCalculator:
if sib_type == self.NORM_SIB or sib_type == self.UNKNOWN_SIB: if sib_type == self.NORM_SIB or sib_type == self.UNKNOWN_SIB:
typestr = '' typestr = ''
elif sib_type == self.HALF_SIB: elif sib_type == self.HALF_SIB:
typestr = HALF typestr = self.HALF
elif sib_type == self.STEP_SIB: elif sib_type == self.STEP_SIB:
typestr = STEP typestr = self.STEP
if in_law_a or in_law_b : if in_law_a or in_law_b :
inlaw = INLAW inlaw = self.INLAW
else: else:
inlaw = '' inlaw = ''

8
src/plugins/all_relations.py
View File

@ -204,16 +204,18 @@ class AllRelReport():
and self.rel_class.only_birth(relation[4]) and self.rel_class.only_birth(relation[4])
distorig = len(relation[4]) distorig = len(relation[4])
distother = len(relation[2]) distother = len(relation[2])
if distorig == 1 or distother ==1 : if distorig == 1 and distother == 1 and not inlawa \
and not inlawb:
rel_str = self.rel_class.get_sibling_relationship_string( rel_str = self.rel_class.get_sibling_relationship_string(
self.rel_class.get_sibling_type( self.rel_class.get_sibling_type(
self.database, pers1, pers2), self.database, pers1, pers2),
self.home_person.get_gender(), self.home_person.get_gender(),
pers2.get_gender()) self.person.get_gender())
else:
rel_str = self.rel_class.get_single_relationship_string( rel_str = self.rel_class.get_single_relationship_string(
distorig, distother, distorig, distother,
self.home_person.get_gender(), self.home_person.get_gender(),
pers2.get_gender(), self.person.get_gender(),
relation[4], relation[2], relation[4], relation[2],
only_birth = birth, only_birth = birth,
in_law_a = inlawa, in_law_b = inlawb) in_law_a = inlawa, in_law_b = inlawb)