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

Add a new primary surname substitution keyword option

Browse Source 
Adds a new "p" option to display the primary surname with prefix
if present as part of a name format.

For example:  $n(f p)

to display a name as a first name with primary surname only.
This commit is contained in:
Nick Hall 2023-06-08 18:31:05 +01:00
parent 36b01e25f2
commit 262440fcea
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gramps/gen/lib/surnamebase.py
View File

@ -197,6 +197,18 @@ class SurnameBase:
'second': fsurn} 'second': fsurn}
return totalsurn.strip() return totalsurn.strip()
def get_primary(self):
"""
Return a fully formatted primary surname
"""
primary = self.get_primary_surname()
partsurn = primary.get_surname()
if primary.get_prefix():
fsurn = _('%(first)s %(second)s') % {'first': primary.get_prefix(),
'second': partsurn}
else:
fsurn = partsurn
return fsurn.strip()
def get_upper_surname(self): def get_upper_surname(self):
"""Return a fully formatted surname capitalized""" """Return a fully formatted surname capitalized"""

5
gramps/plugins/lib/libsubstkeyword.py
View File

@ -177,7 +177,7 @@ class NameFormat(GenericFormat):
return (name.get_call_name() or return (name.get_call_name() or
name.get_first_name().split(' ')[0]) name.get_first_name().split(' ')[0])
code = "tfcnxslg" code = "tfcnxslgp"
upper = code.upper() upper = code.upper()
function = [name.get_title, # t function = [name.get_title, # t
name.get_first_name, # f name.get_first_name, # f
@ -186,7 +186,8 @@ class NameFormat(GenericFormat):
common, # x common, # x
name.get_suffix, # s name.get_suffix, # s
name.get_surname, # l name.get_surname, # l
name.get_family_nick_name # g name.get_family_nick_name, # g
name.get_primary # p
] ]
return self.generic_format(name, code, upper, function) return self.generic_format(name, code, upper, function)