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

fixed small type-o's and does not print ', ' before marriage infomration if no birth and death information

Browse Source 
svn: r14765
This commit is contained in:
Craig J. Anderson 2010-03-11 21:22:34 +00:00
parent 6801063087
commit d9c5d83c33
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/textreport/DescendReport.py
View File

@ -68,7 +68,7 @@ class PrintSimple():
# de_Villiers_Pama numbering system # de_Villiers_Pama numbering system
# #
#------------------------------------------------------------------------ #------------------------------------------------------------------------
class PrintVlliers(): class PrintVilliers():
def __init__(self): def __init__(self):
self.pama = 'abcdefghijklmnopqrstuvwxyz' self.pama = 'abcdefghijklmnopqrstuvwxyz'
self.num = {0:1} self.num = {0:1}
@ -165,9 +165,7 @@ class Printinfo():
tmp = self.__date_place(ReportUtils.find_marriage(self.database, tmp = self.__date_place(ReportUtils.find_marriage(self.database,
family)) family))
if tmp: if tmp:
if string: string += ", " + tmp
string += ", "
string += tmp
self.doc.write_text(string) self.doc.write_text(string)
@ -273,7 +271,7 @@ class DescendantReport(Report):
if numbering == "Simple": if numbering == "Simple":
obj = PrintSimple() obj = PrintSimple()
elif numbering == "de Villiers/Pama": elif numbering == "de Villiers/Pama":
obj = PrintVlliers() obj = PrintVilliers()
elif numbering == "Meurgey de Tupigny": elif numbering == "Meurgey de Tupigny":
obj = PrintMeurgey() obj = PrintMeurgey()
else: else:
@ -327,8 +325,8 @@ class DescendantOptions(MenuReportOptions):
gen.set_help(_("The number of generations to include in the report")) gen.set_help(_("The number of generations to include in the report"))
menu.add_option(category_name, "gen", gen) menu.add_option(category_name, "gen", gen)
marrs = BooleanOption(_('Show Marriage info'), False) marrs = BooleanOption(_('Show marriage info'), False)
marrs.set_help(_("Whether to show marriage informaiton in the report.")) marrs.set_help(_("Whether to show marriage information in the report."))
menu.add_option(category_name, "marrs", marrs) menu.add_option(category_name, "marrs", marrs)
def make_default_style(self, default_style): def make_default_style(self, default_style):