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

NarrativeWeb should show patronymic in individuals (#1048)

Browse Source 
In the individuals and in surnames pages, we should show the complete name
like defined in the display tab from the narrative web configuration.

Fixes #04404
This commit is contained in:
Serge Noiraud 2020-07-08 23:07:37 +02:00 committed by GitHub
parent b523530fb0
commit e8eb5bf0a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gramps/plugins/webreport/basepage.py
View File

@ -2393,9 +2393,6 @@ class BasePage: # pylint: disable=C1001
# not necessarily mean that a page has been generated # not necessarily mean that a page has been generated
(link, name, gid) = result (link, name, gid) = result
if name_style == _NAME_STYLE_FIRST and person:
name = _get_short_name(person.get_gender(),
person.get_primary_name())
name = html_escape(name) name = html_escape(name)
# construct the result # construct the result
if not self.noid and gid != "": if not self.noid and gid != "":

9
gramps/plugins/webreport/person.py
View File

@ -70,7 +70,7 @@ from gramps.gen.proxy import LivingProxyDb
from gramps.plugins.webreport.basepage import BasePage from gramps.plugins.webreport.basepage import BasePage
from gramps.plugins.webreport.common import (get_first_letters, _KEYPERSON, from gramps.plugins.webreport.common import (get_first_letters, _KEYPERSON,
alphabet_navigation, sort_people, alphabet_navigation, sort_people,
_NAME_STYLE_FIRST, first_letter, first_letter,
get_index_letter, add_birthdate, get_index_letter, add_birthdate,
primary_difference, FULLCLEAR, primary_difference, FULLCLEAR,
_find_birth_date, _find_death_date, _find_birth_date, _find_death_date,
@ -210,9 +210,9 @@ class PersonPages(BasePage):
thead += trow thead += trow
# show surname and first name # show surname and first name
trow += Html("th", self._("Surname"), class_="ColumnSurname", trow += Html("th", self._("Group as"), class_="ColumnSurname",
inline=True) inline=True)
trow += Html("th", self._("Given Name"), class_="ColumnName", trow += Html("th", self._("Name"), class_="ColumnName",
inline=True) inline=True)
if showbirth: if showbirth:
@ -294,8 +294,7 @@ class PersonPages(BasePage):
tcell += " " tcell += " "
# firstname column # firstname column
link = self.new_person_link(person_handle, person=person, link = self.new_person_link(person_handle, person=person)
name_style=_NAME_STYLE_FIRST)
trow += Html("td", link, class_="ColumnName") trow += Html("td", link, class_="ColumnName")
# birth column # birth column

7
gramps/plugins/webreport/surname.py
View File

@ -56,7 +56,7 @@ from gramps.plugins.lib.libhtml import Html
# specific narrative web import # specific narrative web import
#------------------------------------------------ #------------------------------------------------
from gramps.plugins.webreport.basepage import BasePage from gramps.plugins.webreport.basepage import BasePage
from gramps.plugins.webreport.common import (name_to_md5, _NAME_STYLE_FIRST, from gramps.plugins.webreport.common import (name_to_md5,
_find_birth_date, _find_death_date, _find_birth_date, _find_death_date,
FULLCLEAR, html_escape) FULLCLEAR, html_escape)
@ -134,7 +134,7 @@ class SurnamePage(BasePage):
thead += trow thead += trow
# Name Column # Name Column
trow += Html("th", self._("Given Name"), class_="ColumnName", trow += Html("th", self._("Name"), class_="ColumnName",
inline=True) inline=True)
if showbirth: if showbirth:
@ -170,8 +170,7 @@ class SurnamePage(BasePage):
# firstname column # firstname column
link = self.new_person_link(person_handle, uplink=True, link = self.new_person_link(person_handle, uplink=True,
person=person, person=person)
name_style=_NAME_STYLE_FIRST)
trow += Html("td", link, class_="ColumnName") trow += Html("td", link, class_="ColumnName")
# birth column # birth column