diff --git a/src/plugins/webreport/WebCal.py b/src/plugins/webreport/WebCal.py index dc72e3754..d0e7abae8 100644 --- a/src/plugins/webreport/WebCal.py +++ b/src/plugins/webreport/WebCal.py @@ -559,7 +559,7 @@ class WebCalReport(Report): elif url_fname == 'fullyearlinked': myTitle = _('Full year at a Glance') else: - myTitle = _(url_fname) + myTitle = _(url_fname) hyper = Html("a", nav_text, href = url, name = url_fname, title = myTitle) if check_cs: @@ -1084,6 +1084,7 @@ class WebCalReport(Report): # determine birthday information??? if (self.birthday and birth_date is not gen.lib.Date.EMPTY and birth_date.is_valid()): + birth_date = gregorian(birth_date) year = birth_date.get_year() or this_year month = birth_date.get_month() @@ -1147,6 +1148,7 @@ class WebCalReport(Report): if marriage_event: event_date = marriage_event.get_date_object() if event_date is not gen.lib.Date.EMPTY and event_date.is_valid(): + event_date = gregorian(event_date) year = event_date.get_year() month = event_date.get_month() day = event_date.get_day() @@ -1711,3 +1713,10 @@ def get_day_list(event_date, holiday_list, bday_anniv_list): # return to its caller calendar_build() return day_list + +def gregorian(date): + """Convert given date to gregorian""" + date = gen.lib.Date(date) + date.convert_calendar(gen.lib.Date.CAL_GREGORIAN) + return date +