add the date-format option to narrativeweb and webcal. (#374)

This commit is contained in:
Serge Noiraud 2017-05-05 03:30:53 +02:00 committed by Sam Manzi
parent 41bd626aa2
commit 8f99b4b488
2 changed files with 10 additions and 6 deletions

View File

@ -8267,8 +8267,9 @@ class NavWebReport(Report):
menuopt = menu.get_option_by_name(optname) menuopt = menu.get_option_by_name(optname)
self.options[optname] = menuopt.get_value() self.options[optname] = menuopt.get_value()
lang = self.options['trans'] self.set_locale(options.menu.get_option_by_name('trans').get_value())
self.rlocale = self.set_locale(lang) stdoptions.run_date_format_option(self, menu)
self.rlocale = self._locale
stdoptions.run_private_data_option(self, menu) stdoptions.run_private_data_option(self, menu)
stdoptions.run_living_people_option(self, menu) stdoptions.run_living_people_option(self, menu)
@ -9687,7 +9688,8 @@ class NavWebOptions(MenuReportOptions):
stdoptions.add_name_format_option(menu, category_name) stdoptions.add_name_format_option(menu, category_name)
stdoptions.add_localization_option(menu, category_name) locale_opt = stdoptions.add_localization_option(menu, category_name)
stdoptions.add_date_format_option(menu, category_name, locale_opt)
self.__securesite = BooleanOption(_("This is a secure site (https)"), self.__securesite = BooleanOption(_("This is a secure site (https)"),
False) False)

View File

@ -126,8 +126,9 @@ class WebCalReport(Report):
mgobn = lambda name: options.menu.get_option_by_name(name).get_value() mgobn = lambda name: options.menu.get_option_by_name(name).get_value()
lang = mgobn('trans') self.set_locale(options.menu.get_option_by_name('trans').get_value())
self.rlocale = self.set_locale(lang) stdoptions.run_date_format_option(self, options.menu)
self.rlocale = self._locale
self._ = self.rlocale.translation.sgettext self._ = self.rlocale.translation.sgettext
self.html_dir = mgobn('target') self.html_dir = mgobn('target')
@ -1681,7 +1682,8 @@ class WebCalOptions(MenuReportOptions):
alive.set_help(_("Include only living people in the calendar")) alive.set_help(_("Include only living people in the calendar"))
menu.add_option(category_name, "alive", alive) menu.add_option(category_name, "alive", alive)
stdoptions.add_localization_option(menu, category_name) locale_opt = stdoptions.add_localization_option(menu, category_name)
stdoptions.add_date_format_option(menu, category_name, locale_opt)
def __add_content_options(self, menu): def __add_content_options(self, menu):
""" """