Birthday report dead indicator now user defineable

Fixed the birthday report so the dead icon is able to be set within the
options window
This commit is contained in:
Jgon6 2018-03-05 20:53:33 -05:00 committed by Nick Hall
parent 5dc06d023d
commit 1995a7068c

View File

@ -99,6 +99,7 @@ class BirthdayReport(Report):
self.text1 = mgobn('text1') self.text1 = mgobn('text1')
self.text2 = mgobn('text2') self.text2 = mgobn('text2')
self.text3 = mgobn('text3') self.text3 = mgobn('text3')
self.deadtxt = mgobn('deadtxt')
self.filter_option = menu.get_option_by_name('filter') self.filter_option = menu.get_option_by_name('filter')
self.filter = self.filter_option.get_filter() self.filter = self.filter_option.get_filter()
pid = mgobn('pid') pid = mgobn('pid')
@ -319,7 +320,7 @@ class BirthdayReport(Report):
comment = " --- %s" % relation comment = " --- %s" % relation
deadtxt = "" deadtxt = ""
if (not alive): if (not alive):
deadtxt = _DEADTXT deadtxt = self.deadtxt
if nyears == 0: if nyears == 0:
text = self._('%(person)s, birth%(relation)s') % { text = self._('%(person)s, birth%(relation)s') % {
'person' : short_name, 'person' : short_name,
@ -382,9 +383,9 @@ class BirthdayReport(Report):
deadtxt1 = "" deadtxt1 = ""
deadtxt2 = "" deadtxt2 = ""
if (not alive1): if (not alive1):
deadtxt1 = _DEADTXT deadtxt1 = self.deadtxt
if (not alive2): if (not alive2):
deadtxt2 = _DEADTXT deadtxt2 = self.deadtxt
if nyears == 0: if nyears == 0:
text = self._("%(spouse)s and\n %(person)s, wedding") % { text = self._("%(spouse)s and\n %(person)s, wedding") % {
'spouse' : spouse_name, 'spouse' : spouse_name,