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

Some dates are not translated in webcal (#545)

Browse Source 
* Some dates are not translated in webcal

Fixes #10425

* Webcal link problem in the year glance page

* Link problems depending on LANGUAGES.
This commit is contained in:
Serge Noiraud 2018-02-13 10:01:17 +01:00 committed by GitHub
parent 1e73ab5be7
commit 3f368b2e02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gramps/plugins/webreport/webcal.py
View File

@ -529,6 +529,7 @@ class WebCalReport(Report):
# each year will link to current month. # each year will link to current month.
# this will always need an extension added # this will always need an extension added
month = int(self.today.get_month()) month = int(self.today.get_month())
month = month.lower()
full_month_name = self.rlocale.date_displayer.long_months[month] full_month_name = self.rlocale.date_displayer.long_months[month]
# Note. We use '/' here because it is a URL, not a OS dependent # Note. We use '/' here because it is a URL, not a OS dependent
@ -589,6 +590,7 @@ class WebCalReport(Report):
# Note. We use '/' here because it is a URL, not a OS # Note. We use '/' here because it is a URL, not a OS
# dependent pathname need to leave home link alone, # dependent pathname need to leave home link alone,
# so look for it ... # so look for it ...
url_fname = url_fname.lower()
url = url_fname url = url_fname
add_subdirs = False add_subdirs = False
if not (url.startswith('http:') or url.startswith('/')): if not (url.startswith('http:') or url.startswith('/')):
@ -718,20 +720,20 @@ class WebCalReport(Report):
self.end_year = self.start_year self.end_year = self.start_year
if month > 1: if month > 1:
full_month_name = date_displayer.long_months[month-1] full_month_name = date_displayer.long_months[month-1]
url = full_month_name + self.ext url = full_month_name.lower() + self.ext
prevm = Date(int(year), int(month-1), 0) prevm = Date(int(year), int(month-1), 0)
my_title = Html("a", _escape("<"), href=url, my_title = Html("a", _escape("<"), href=url,
title=date_displayer.display(prevm)) title=date_displayer.display(prevm))
elif self.multiyear and year > self.start_year: elif self.multiyear and year > self.start_year:
full_month_name = date_displayer.long_months[12] full_month_name = date_displayer.long_months[12]
url = full_month_name + self.ext url = full_month_name.lower() + self.ext
dest = os.path.join("../", str(year-1), url) dest = os.path.join("../", str(year-1), url)
prevm = Date(int(year-1), 12, 0) prevm = Date(int(year-1), 12, 0)
my_title = Html("a", _escape("<"), href=dest, my_title = Html("a", _escape("<"), href=dest,
title=date_displayer.display(prevm)) title=date_displayer.display(prevm))
else: else:
full_month_name = date_displayer.long_months[12] full_month_name = date_displayer.long_months[12]
url = full_month_name + self.ext url = full_month_name.lower() + self.ext
dest = os.path.join("../", str(self.end_year), url) dest = os.path.join("../", str(self.end_year), url)
prevy = Date(self.end_year, 12, 0) prevy = Date(self.end_year, 12, 0)
my_title = Html("a", _escape("<"), href=dest, my_title = Html("a", _escape("<"), href=dest,
@ -739,20 +741,20 @@ class WebCalReport(Report):
my_title += Html("</a>&nbsp;") my_title += Html("</a>&nbsp;")
if month < 12: if month < 12:
full_month_name = date_displayer.long_months[month+1] full_month_name = date_displayer.long_months[month+1]
url = full_month_name + self.ext url = full_month_name.lower() + self.ext
nextd = Date(int(year), int(month+1), 0) nextd = Date(int(year), int(month+1), 0)
my_title += Html("a", _escape(">"), href=url, my_title += Html("a", _escape(">"), href=url,
title=date_displayer.display(nextd)) title=date_displayer.display(nextd))
elif self.multiyear and year < self.end_year: elif self.multiyear and year < self.end_year:
full_month_name = date_displayer.long_months[1] full_month_name = date_displayer.long_months[1]
url = full_month_name + self.ext url = full_month_name.lower() + self.ext
dest = os.path.join("../", str(year+1), url) dest = os.path.join("../", str(year+1), url)
nextd = Date(int(year+1), 1, 0) nextd = Date(int(year+1), 1, 0)
my_title += Html("a", _escape(">"), href=dest, my_title += Html("a", _escape(">"), href=dest,
title=date_displayer.display(nextd)) title=date_displayer.display(nextd))
else: else:
full_month_name = date_displayer.long_months[1] full_month_name = date_displayer.long_months[1]
url = full_month_name + self.ext url = full_month_name.lower() + self.ext
dest = os.path.join("../", str(self.start_year), url) dest = os.path.join("../", str(self.start_year), url)
nexty = Date(self.start_year, 1, 0) nexty = Date(self.start_year, 1, 0)
my_title += Html("a", _escape(">"), href=dest, my_title += Html("a", _escape(">"), href=dest,
@ -967,6 +969,7 @@ class WebCalReport(Report):
for month in range(1, 13): for month in range(1, 13):
cal_fname = self.rlocale.date_displayer.long_months[int(month)] cal_fname = self.rlocale.date_displayer.long_months[int(month)]
cal_fname = cal_fname.lower()
open_file = self.create_file(cal_fname, str(year)) open_file = self.create_file(cal_fname, str(year))
# Add xml, doctype, meta and stylesheets # Add xml, doctype, meta and stylesheets
@ -2008,8 +2011,9 @@ def get_day_list(event_date, holiday_list, bday_anniv_list, rlocale=glocale):
if age_at_death is not None: if age_at_death is not None:
death_symbol = "&#10014;" # latin cross for html code death_symbol = "&#10014;" # latin cross for html code
mess = trans_text("Died %(death_date)s.") % { trans_date = trans_text("Died %(death_date)s.")
'death_date' : dead_event_date} translated_date = rlocale.get_date(dead_event_date)
mess = trans_date % {'death_date' : translated_date}
age = ", <font size='+1' ><b>%s</b></font> <em>%s (%s)" % ( age = ", <font size='+1' ><b>%s</b></font> <em>%s (%s)" % (
death_symbol, mess, age_at_death) death_symbol, mess, age_at_death)
else: else:
@ -2017,9 +2021,12 @@ def get_day_list(event_date, holiday_list, bday_anniv_list, rlocale=glocale):
# where "12 years" is already localized to your language # where "12 years" is already localized to your language
age = ', <em>' age = ', <em>'
date_y = date.get_year() date_y = date.get_year()
age += trans_text('%s old') % str(age_str) if date_y != 0 else \ trans_date = trans_text("Born %(birth_date)s.")
trans_text("Born %(birth_date)s.") % { old_date = trans_text('%s old')
'birth_date' : dead_event_date} tranlated_date = rlocale.get_date(dead_event_date)
age += old_date % str(age_str) if date_y != 0 else \
trans_date % {
'birth_date' : translated_date}
txt_str = (text + age + '</em>') txt_str = (text + age + '</em>')
# an anniversary # an anniversary
@ -2035,7 +2042,7 @@ def get_day_list(event_date, holiday_list, bday_anniv_list, rlocale=glocale):
if isinstance(dead_event_date, if isinstance(dead_event_date,
Date) and dead_event_date.get_year() > 0: Date) and dead_event_date.get_year() > 0:
txt_str += " (" + trans_text("Until") + " " txt_str += " (" + trans_text("Until") + " "
txt_str += str(dead_event_date) txt_str += rlocale.get_date(dead_event_date)
txt_str += ")</em>" txt_str += ")</em>"
else: else:
txt_str += "</em>" txt_str += "</em>"