Fix spouse's name and underlined call names in records

Fixes #12391
This commit is contained in:
Nick Hall 2022-03-08 19:31:49 +00:00
parent 66cac5e852
commit 2ca3839904

View File

@ -314,13 +314,16 @@ def find_records(db, filter, top_size, callname,
if mother is None: if mother is None:
continue continue
name = StyledText(trans_text("%(father)s and %(mother)s")) % { father_name = _get_styled_primary_name(father, callname,
'father': _get_styled_primary_name(father, callname, trans_text=trans_text,
trans_text=trans_text, name_format=name_format)
name_format=name_format), mother_name = _get_styled_primary_name(mother, callname,
'mother': _get_styled_primary_name(mother, callname, trans_text=trans_text,
trans_text=trans_text, name_format=name_format)
name_format=name_format)}
name = StyledText(trans_text("%(father)s and %(mother)s"))
name = name.replace('%(father)s', father_name)
name = name.replace('%(mother)s', mother_name)
if (living_mode == LivingProxyDb.MODE_INCLUDE_ALL if (living_mode == LivingProxyDb.MODE_INCLUDE_ALL
or (not probably_alive(unfil_father, db) and or (not probably_alive(unfil_father, db) and