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

Fix typo nefew -> nephew in KinshipReport.

Browse Source 
svn: r8835
This commit is contained in:
Brian Matherly 2007-08-19 01:51:26 +00:00
parent c0f14c9070
commit 1a2e9e96df
3 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2007-08-18 Brian Matherly <brian@gramps-project.org>
* src/plugins/KinshipReport.py: fix typo nefew -> nephew
* src/Relationship.py: fix typo nefew -> nephew
2007-08-18 Benny Malengier <bm@cage.ugent.be>
* src/ExportAssistant.py: begin of new export manager based on gtk.Assistant...
* src/ManagedWindow.py : allow a gtk.Window to be a ManagedWindow itself

44
src/Relationship.py
View File

@ -176,18 +176,30 @@ _siblings_level = [ "",
"eighteenth great granduncles/aunts", "nineteenth great granduncles/aunts",
"twentieth great granduncles/aunts", ]
_nefews_nieces_level = [ "", "siblings",
"nefews/nieces", "grandnefews/nieces",
"great grandnefews/nieces", "second great grandnefews/nieces",
"third great grandnefews/nieces", "fourth great grandnefews/nieces",
"fifth great grandnefews/nieces", "sixth great grandnefews/nieces",
"seventh great grandnefews/nieces", "eighth great grandnefews/nieces",
"ninth great grandnefews/nieces", "tenth great grandnefews/nieces",
"eleventh great grandnefews/nieces", "twelfth great grandnefews/nieces",
"thirteenth great grandnefews/nieces", "fourteenth great grandnefews/nieces",
"fifteenth great grandnefews/nieces", "sixteenth great grandnefews/nieces",
"seventeenth great grandnefews/nieces", "eighteenth great grandnefews/nieces",
"nineteenth great grandnefews/nieces", "twentieth great grandnefews/nieces", ]
_nephews_nieces_level = [ "",
"siblings",
"nephews/nieces",
"grandnephews/nieces",
"great grandnephews/nieces",
"second great grandnephews/nieces",
"third great grandnephews/nieces",
"fourth great grandnephews/nieces",
"fifth great grandnephews/nieces",
"sixth great grandnephews/nieces",
"seventh great grandnephews/nieces",
"eighth great grandnephews/nieces",
"ninth great grandnephews/nieces",
"tenth great grandnephews/nieces",
"eleventh great grandnephews/nieces",
"twelfth great grandnephews/nieces",
"thirteenth great grandnephews/nieces",
"fourteenth great grandnephews/nieces",
"fifteenth great grandnephews/nieces",
"sixteenth great grandnephews/nieces",
"seventeenth great grandnephews/nieces",
"eighteenth great grandnephews/nieces",
"nineteenth great grandnephews/nieces",
"twentieth great grandnephews/nieces", ]
#-------------------------------------------------------------------------
@ -516,11 +528,11 @@ class RelationshipCalculator:
else:
rel_str = "distant uncles/aunts"
elif Ga == 1:
# These are nieces/nefews
if Ga < len(_nefews_nieces_level):
rel_str = _nefews_nieces_level[Gb]
# These are nieces/nephews
if Ga < len(_nephews_nieces_level):
rel_str = _nephews_nieces_level[Gb]
else:
rel_str = "distant nefews/nieces"
rel_str = "distant nephews/nieces"
elif Ga > 1 and Ga == Gb:
# These are cousins in the same generation
if Ga <= len(_level_name):

10
src/plugins/KinshipReport.py
View File

@ -73,7 +73,7 @@ class KinshipReport(Report):
maxascend - Maximum generations of ancestors to include.
incspouses - Whether to include spouses.
inccousins - Whether to include cousins.
incaunts - Whether to include aunts/uncles/nefews/nieces.
incaunts - Whether to include aunts/uncles/nephews/nieces.
"""
Report.__init__(self,database,person,options_class)
@ -110,7 +110,7 @@ class KinshipReport(Report):
# Collect all descendants of the person
self.traverse_down(self.person.get_handle(),0,1)
# Collect all ancestors/aunts/uncles/nefews/cousins of the person
# Collect all ancestors/aunts/uncles/nephews/cousins of the person
self.traverse_up(self.person.get_handle(),1,0)
# Write Ancestors
@ -353,7 +353,8 @@ class KinshipOptions(ReportOptions):
'inccousins' : ("=0/1","Whether to include cousins",
["Do not include cousins","Include cousins"],
True),
'incaunts': ("=0/1","Whether to include aunts/uncles/nefews/nieces",
'incaunts' : ("=0/1",
"Whether to include aunts/uncles/nephews/nieces",
["Do not include aunts","Include aunts"],
True),
}
@ -371,7 +372,8 @@ class KinshipOptions(ReportOptions):
self.inccousins = gtk.CheckButton(_("Include cousins"))
self.inccousins.set_active(self.options_dict['inccousins'])
self.incaunts = gtk.CheckButton(_("Include aunts/uncles/nefews/nieces"))
self.incaunts = gtk.CheckButton(
_("Include aunts/uncles/nephews/nieces"))
self.incaunts.set_active(self.options_dict['incaunts'])
dialog.add_option (_('Max Descendant Generations'), self.maxdescend)