Correct English in narrative web report
This commit is contained in:
parent
e4571211d4
commit
ccf316f59e
@ -219,7 +219,7 @@ class NavWebReport(Report):
|
|||||||
self.inc_updates = self.opts['updates']
|
self.inc_updates = self.opts['updates']
|
||||||
self.create_unused_media = self.opts['unused']
|
self.create_unused_media = self.opts['unused']
|
||||||
|
|
||||||
# Do we need to include this in a cms ?
|
# Do we need to include this in a CMS?
|
||||||
self.usecms = self.options['usecms']
|
self.usecms = self.options['usecms']
|
||||||
self.target_uri = self.options['cmsuri']
|
self.target_uri = self.options['cmsuri']
|
||||||
|
|
||||||
@ -1230,8 +1230,8 @@ class NavWebReport(Report):
|
|||||||
* field 6: date of death or burial (optional)
|
* field 6: date of death or burial (optional)
|
||||||
* field 7: place of death or burial (optional)
|
* field 7: place of death or burial (optional)
|
||||||
|
|
||||||
@param: filep -- The gendex output file name
|
@param: filep -- The GENDEX output filename
|
||||||
@param: person -- The person to use for gendex file
|
@param: person -- The person to use for GENDEX file
|
||||||
"""
|
"""
|
||||||
url = self.build_url_fname_html(person.handle, "ppl")
|
url = self.build_url_fname_html(person.handle, "ppl")
|
||||||
surname = person.get_primary_name().get_surname()
|
surname = person.get_primary_name().get_surname()
|
||||||
@ -1250,7 +1250,7 @@ class NavWebReport(Report):
|
|||||||
|
|
||||||
def surname_pages(self, ind_list, the_lang, the_title):
|
def surname_pages(self, ind_list, the_lang, the_title):
|
||||||
"""
|
"""
|
||||||
Generates the surname related pages from list of individual
|
Generates the surname-related pages from list of individual
|
||||||
people.
|
people.
|
||||||
|
|
||||||
@param: ind_list -- The list of person to use
|
@param: ind_list -- The list of person to use
|
||||||
@ -1585,7 +1585,7 @@ class NavWebReport(Report):
|
|||||||
The extension is added to the filename as well.
|
The extension is added to the filename as well.
|
||||||
|
|
||||||
Notice that we do NOT use os.path.join() because we're creating a URL.
|
Notice that we do NOT use os.path.join() because we're creating a URL.
|
||||||
Imagine we run gramps on Windows (heaven forbits), we don't want to
|
Imagine we run Gramps on Windows (gods forbidding), we don't want to
|
||||||
see backslashes in the URL.
|
see backslashes in the URL.
|
||||||
"""
|
"""
|
||||||
if not fname:
|
if not fname:
|
||||||
@ -1711,7 +1711,7 @@ class NavWebReport(Report):
|
|||||||
@param: string_io -- The string IO used when we are in archive mode
|
@param: string_io -- The string IO used when we are in archive mode
|
||||||
@param: date -- The last modification date for this object
|
@param: date -- The last modification date for this object
|
||||||
If we have "zero", we use the current time.
|
If we have "zero", we use the current time.
|
||||||
This is related to bug 8950 and very useful
|
This is related to bug #8950 and very useful
|
||||||
when we use rsync.
|
when we use rsync.
|
||||||
"""
|
"""
|
||||||
if self.archive:
|
if self.archive:
|
||||||
@ -1825,9 +1825,9 @@ class NavWebReport(Report):
|
|||||||
if languages[language] == the_lang:
|
if languages[language] == the_lang:
|
||||||
lang = language
|
lang = language
|
||||||
break
|
break
|
||||||
return _("Narrative Web Site Report for the %s language") % lang
|
return _("Narrative Website Report for the %s language") % lang
|
||||||
else:
|
else:
|
||||||
return _("Narrative Web Site Report")
|
return _("Narrative Website Report")
|
||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
#
|
#
|
||||||
@ -1940,9 +1940,9 @@ class NavWebOptions(MenuReportOptions):
|
|||||||
category_name = _("Report Options")
|
category_name = _("Report Options")
|
||||||
addopt = partial(menu.add_option, category_name)
|
addopt = partial(menu.add_option, category_name)
|
||||||
|
|
||||||
self.__archive = BooleanOption(_('Store web pages in .tar.gz archive'),
|
self.__archive = BooleanOption(_('Store website in .tar.gz archive'),
|
||||||
False)
|
False)
|
||||||
self.__archive.set_help(_('Whether to store the web pages in an '
|
self.__archive.set_help(_('Whether to store the website in an '
|
||||||
'archive file'))
|
'archive file'))
|
||||||
addopt("archive", self.__archive)
|
addopt("archive", self.__archive)
|
||||||
self.__archive.connect('value-changed', self.__archive_changed)
|
self.__archive.connect('value-changed', self.__archive_changed)
|
||||||
@ -1965,7 +1965,7 @@ class NavWebOptions(MenuReportOptions):
|
|||||||
|
|
||||||
self.__filter = FilterOption(_("Filter"), 0)
|
self.__filter = FilterOption(_("Filter"), 0)
|
||||||
self.__filter.set_help(
|
self.__filter.set_help(
|
||||||
_("Select filter to restrict people that appear on web site"))
|
_("Select filter to restrict people that appear on the website"))
|
||||||
addopt("filter", self.__filter)
|
addopt("filter", self.__filter)
|
||||||
self.__filter.connect('value-changed', self.__filter_changed)
|
self.__filter.connect('value-changed', self.__filter_changed)
|
||||||
|
|
||||||
@ -2064,7 +2064,7 @@ class NavWebOptions(MenuReportOptions):
|
|||||||
self.__prevnext.set_help(_("Add previous/next to the navigation bar."))
|
self.__prevnext.set_help(_("Add previous/next to the navigation bar."))
|
||||||
addopt("prevnext", self.__prevnext)
|
addopt("prevnext", self.__prevnext)
|
||||||
|
|
||||||
self.__securesite = BooleanOption(_("This is a secure site (https)"),
|
self.__securesite = BooleanOption(_("This is a secure site (HTTPS)"),
|
||||||
False)
|
False)
|
||||||
self.__securesite.set_help(_('Whether to use http:// or https://'))
|
self.__securesite.set_help(_('Whether to use http:// or https://'))
|
||||||
addopt("securesite", self.__securesite)
|
addopt("securesite", self.__securesite)
|
||||||
@ -2384,17 +2384,17 @@ class NavWebOptions(MenuReportOptions):
|
|||||||
|
|
||||||
inc_places = BooleanOption(_('Include places pages'), False)
|
inc_places = BooleanOption(_('Include places pages'), False)
|
||||||
inc_places.set_help(
|
inc_places.set_help(
|
||||||
_('Whether or not to include the places Pages.'))
|
_('Whether or not to include the places pages.'))
|
||||||
addopt("inc_places", inc_places)
|
addopt("inc_places", inc_places)
|
||||||
|
|
||||||
inc_sources = BooleanOption(_('Include sources pages'), False)
|
inc_sources = BooleanOption(_('Include sources pages'), False)
|
||||||
inc_sources.set_help(
|
inc_sources.set_help(
|
||||||
_('Whether or not to include the sources Pages.'))
|
_('Whether or not to include the sources pages.'))
|
||||||
addopt("inc_sources", inc_sources)
|
addopt("inc_sources", inc_sources)
|
||||||
|
|
||||||
inc_repository = BooleanOption(_('Include repository pages'), False)
|
inc_repository = BooleanOption(_('Include repository pages'), False)
|
||||||
inc_repository.set_help(
|
inc_repository.set_help(
|
||||||
_('Whether or not to include the Repository Pages.'))
|
_('Whether or not to include the repository pages.'))
|
||||||
addopt("inc_repository", inc_repository)
|
addopt("inc_repository", inc_repository)
|
||||||
|
|
||||||
inc_gendex = BooleanOption(
|
inc_gendex = BooleanOption(
|
||||||
@ -2464,7 +2464,7 @@ class NavWebOptions(MenuReportOptions):
|
|||||||
self.__googleopts.add_item(opt, trans)
|
self.__googleopts.add_item(opt, trans)
|
||||||
self.__googleopts.set_help(
|
self.__googleopts.set_help(
|
||||||
_("Select which option that you would like "
|
_("Select which option that you would like "
|
||||||
"to have for the Google Maps Family Map pages..."))
|
"to have for the Google Maps family-map pages..."))
|
||||||
addopt("googleopts", self.__googleopts)
|
addopt("googleopts", self.__googleopts)
|
||||||
|
|
||||||
self.__googlemapkey = StringOption(_("Google maps API key"), "")
|
self.__googlemapkey = StringOption(_("Google maps API key"), "")
|
||||||
@ -2481,22 +2481,22 @@ class NavWebOptions(MenuReportOptions):
|
|||||||
self.__stamenopts.add_item(opt, trans)
|
self.__stamenopts.add_item(opt, trans)
|
||||||
self.__stamenopts.set_help(
|
self.__stamenopts.set_help(
|
||||||
_("Select which option that you would like "
|
_("Select which option that you would like "
|
||||||
"to have for the Stamenmap Map pages..."))
|
"to have for the Stamen map map-pages..."))
|
||||||
addopt("stamenopts", self.__stamenopts)
|
addopt("stamenopts", self.__stamenopts)
|
||||||
|
|
||||||
self.__placemap_options()
|
self.__placemap_options()
|
||||||
|
|
||||||
def __add_others_options(self, menu):
|
def __add_others_options(self, menu):
|
||||||
"""
|
"""
|
||||||
Options for the cms tab, web calendar inclusion, php ...
|
Options for the cms tab, web calendar inclusion, PHP ...
|
||||||
|
|
||||||
@param: menu -- The menu for which we add options
|
@param: menu -- The menu for which we add options
|
||||||
"""
|
"""
|
||||||
category_name = _("Other inclusion (CMS, Web Calendar, Php)")
|
category_name = _("Other inclusion (CMS, web calendar, PHP)")
|
||||||
addopt = partial(menu.add_option, category_name)
|
addopt = partial(menu.add_option, category_name)
|
||||||
|
|
||||||
self.__usecms = BooleanOption(
|
self.__usecms = BooleanOption(
|
||||||
_("Do we include these pages in a cms web ?"), False)
|
_("Do we include these pages in a CMS web?"), False)
|
||||||
self.__usecms.connect('value-changed', self.__usecms_changed)
|
self.__usecms.connect('value-changed', self.__usecms_changed)
|
||||||
addopt("usecms", self.__usecms)
|
addopt("usecms", self.__usecms)
|
||||||
|
|
||||||
@ -2537,7 +2537,8 @@ class NavWebOptions(MenuReportOptions):
|
|||||||
"""
|
"""
|
||||||
Options for selecting multiple languages. The default one is
|
Options for selecting multiple languages. The default one is
|
||||||
displayed in the display tab. If the option "use multiple
|
displayed in the display tab. If the option "use multiple
|
||||||
languages is not selected, all the fields in this menu will be grayed.
|
languages" is not selected, all the fields in this menu will be
|
||||||
|
grayed out.
|
||||||
|
|
||||||
@param: menu -- The menu for which we add options
|
@param: menu -- The menu for which we add options
|
||||||
"""
|
"""
|
||||||
@ -2550,7 +2551,7 @@ class NavWebOptions(MenuReportOptions):
|
|||||||
mess, "lang2")
|
mess, "lang2")
|
||||||
self.__titl_2 = StringOption(_("Site name for your second language"),
|
self.__titl_2 = StringOption(_("Site name for your second language"),
|
||||||
_('This site title'))
|
_('This site title'))
|
||||||
self.__titl_2.set_help(_('Give a title in the appropriate language'))
|
self.__titl_2.set_help(_('Enter a title in the respective language'))
|
||||||
addopt("title2", self.__titl_2)
|
addopt("title2", self.__titl_2)
|
||||||
mess = _("third language")
|
mess = _("third language")
|
||||||
self.__lang_3 = stdoptions.add_extra_localization_option(menu,
|
self.__lang_3 = stdoptions.add_extra_localization_option(menu,
|
||||||
@ -2558,7 +2559,7 @@ class NavWebOptions(MenuReportOptions):
|
|||||||
mess, "lang3")
|
mess, "lang3")
|
||||||
self.__titl_3 = StringOption(_("Site name for your third language"),
|
self.__titl_3 = StringOption(_("Site name for your third language"),
|
||||||
_('This site title'))
|
_('This site title'))
|
||||||
self.__titl_3.set_help(_('Give a title in the appropriate language'))
|
self.__titl_3.set_help(_('Enter a title in the respective language'))
|
||||||
addopt("title3", self.__titl_3)
|
addopt("title3", self.__titl_3)
|
||||||
mess = _("fourth language")
|
mess = _("fourth language")
|
||||||
self.__lang_4 = stdoptions.add_extra_localization_option(menu,
|
self.__lang_4 = stdoptions.add_extra_localization_option(menu,
|
||||||
@ -2566,7 +2567,7 @@ class NavWebOptions(MenuReportOptions):
|
|||||||
mess, "lang4")
|
mess, "lang4")
|
||||||
self.__titl_4 = StringOption(_("Site name for your fourth language"),
|
self.__titl_4 = StringOption(_("Site name for your fourth language"),
|
||||||
_('This site title'))
|
_('This site title'))
|
||||||
self.__titl_4.set_help(_('Give a title in the appropriate language'))
|
self.__titl_4.set_help(_('Enter a title in the respective language'))
|
||||||
addopt("title4", self.__titl_4)
|
addopt("title4", self.__titl_4)
|
||||||
mess = _("fifth language")
|
mess = _("fifth language")
|
||||||
self.__lang_5 = stdoptions.add_extra_localization_option(menu,
|
self.__lang_5 = stdoptions.add_extra_localization_option(menu,
|
||||||
@ -2574,7 +2575,7 @@ class NavWebOptions(MenuReportOptions):
|
|||||||
mess, "lang5")
|
mess, "lang5")
|
||||||
self.__titl_5 = StringOption(_("Site name for your fifth language"),
|
self.__titl_5 = StringOption(_("Site name for your fifth language"),
|
||||||
_('This site title'))
|
_('This site title'))
|
||||||
self.__titl_5.set_help(_('Give a title in the appropriate language'))
|
self.__titl_5.set_help(_('Enter a title in the respective language'))
|
||||||
addopt("title5", self.__titl_5)
|
addopt("title5", self.__titl_5)
|
||||||
mess = _("sixth language")
|
mess = _("sixth language")
|
||||||
self.__lang_6 = stdoptions.add_extra_localization_option(menu,
|
self.__lang_6 = stdoptions.add_extra_localization_option(menu,
|
||||||
@ -2582,7 +2583,7 @@ class NavWebOptions(MenuReportOptions):
|
|||||||
mess, "lang6")
|
mess, "lang6")
|
||||||
self.__titl_6 = StringOption(_("Site name for your sixth language"),
|
self.__titl_6 = StringOption(_("Site name for your sixth language"),
|
||||||
_('This site title'))
|
_('This site title'))
|
||||||
self.__titl_6.set_help(_('Give a title in the appropriate language'))
|
self.__titl_6.set_help(_('Enter a title in the respective language'))
|
||||||
addopt("title6", self.__titl_6)
|
addopt("title6", self.__titl_6)
|
||||||
|
|
||||||
def __activate_translations(self):
|
def __activate_translations(self):
|
||||||
@ -2625,8 +2626,8 @@ class NavWebOptions(MenuReportOptions):
|
|||||||
|
|
||||||
def __usecms_changed(self):
|
def __usecms_changed(self):
|
||||||
"""
|
"""
|
||||||
We need to use cms or not
|
We need to use CMS or not
|
||||||
If we use a cms, the storage must be an archive
|
If we use a CMS, the storage must be an archive
|
||||||
"""
|
"""
|
||||||
if self.__usecms.get_value():
|
if self.__usecms.get_value():
|
||||||
self.__archive.set_value(True)
|
self.__archive.set_value(True)
|
||||||
@ -2679,7 +2680,7 @@ class NavWebOptions(MenuReportOptions):
|
|||||||
def __filter_changed(self):
|
def __filter_changed(self):
|
||||||
"""
|
"""
|
||||||
Handle filter change. If the filter is not specific to a person,
|
Handle filter change. If the filter is not specific to a person,
|
||||||
disable the person option
|
disable the "Person" option
|
||||||
"""
|
"""
|
||||||
filter_value = self.__filter.get_value()
|
filter_value = self.__filter.get_value()
|
||||||
if filter_value == 0: # "Entire Database" (as "include_single=False")
|
if filter_value == 0: # "Entire Database" (as "include_single=False")
|
||||||
@ -2761,7 +2762,7 @@ class NavWebOptions(MenuReportOptions):
|
|||||||
|
|
||||||
def __placemap_options(self):
|
def __placemap_options(self):
|
||||||
"""
|
"""
|
||||||
Handles the changing nature of the place map Options
|
Handles the changing nature of the "Place map" options
|
||||||
"""
|
"""
|
||||||
# get values for all Place Map Options tab...
|
# get values for all Place Map Options tab...
|
||||||
place_active = self.__placemappages.get_value()
|
place_active = self.__placemappages.get_value()
|
||||||
|
Loading…
Reference in New Issue
Block a user