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

Fixed BirthdayReport and Calendar report from errors in commit 14178, which I created.

Browse Source 
svn: r14185
This commit is contained in:
Rob G. Healey
2010-02-01 23:07:44 +00:00
parent 2828363e9e
commit 28b8f6a0f3
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/drawreport/Calendar.py
View File

@ -34,7 +34,7 @@ import time
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------ #------------------------------------------------------------------------
from gen.display.name import displayer as name_displayer from gen.display.name import displayer as _nd
from Errors import ReportError from Errors import ReportError
import Relationship import Relationship
from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle,
@ -46,7 +46,7 @@ from gen.plug.menu import (BooleanOption, StringOption, NumberOption,
from gui.utils import ProgressMeter from gui.utils import ProgressMeter
from ReportBase import Report, ReportUtils, MenuReportOptions from ReportBase import Report, ReportUtils, MenuReportOptions
from Utils import probably_alive from Utils import probably_alive
from DateHandler import display as _dd from DateHandler import displayer as _dd
import GrampsLocale import GrampsLocale
import gen.lib import gen.lib
@ -114,7 +114,7 @@ class Calendar(Report):
else: else:
name = gen.lib.Name(primary_name) name = gen.lib.Name(primary_name)
name.set_display_as(self.name_format) name.set_display_as(self.name_format)
return name_displayer.display_name(name) return _nd.display_name(name)
def draw_rectangle(self, style, sx, sy, ex, ey): def draw_rectangle(self, style, sx, sy, ex, ey):
""" This should be in BaseDoc """ """ This should be in BaseDoc """
@ -405,7 +405,7 @@ class CalendarOptions(MenuReportOptions):
# We must figure out the value of the first option before we can # We must figure out the value of the first option before we can
# create the EnumeratedListOption # create the EnumeratedListOption
fmt_list = name_displayer.get_name_format() fmt_list = _nd.get_name_format()
name_format = EnumeratedListOption(_("Name format"), fmt_list[0][0]) name_format = EnumeratedListOption(_("Name format"), fmt_list[0][0])
for num, name, fmt_str, act in fmt_list: for num, name, fmt_str, act in fmt_list:
name_format.add_item(num, name) name_format.add_item(num, name)

4
src/plugins/textreport/BirthdayReport.py
View File

@ -171,8 +171,8 @@ class CalendarReport(Report):
""" Prints a month as a page """ """ Prints a month as a page """
year = self.year year = self.year
self.doc.start_paragraph('BIR-Monthstyle') self.doc.start_paragraph('BIR-Monthstyle')
self.doc.write_text(_dd[month].capitalize()) self.doc.write_text(_dd.long_months[month].capitalize())
self.doc.end_paragraph(.long_months) self.doc.end_paragraph()
current_date = datetime.date(year, month, 1) current_date = datetime.date(year, month, 1)
current_ord = current_date.toordinal() current_ord = current_date.toordinal()
started_day = {} started_day = {}