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

Patch from Matt Keenan <matt.keenan@gmail.com> - 0005149: Provide Name Format option for some text reports

Browse Source 
svn: r18118
This commit is contained in:
Brian Matherly
2011-09-07 02:49:08 +00:00
parent 147f74c3b1
commit c4d4762c30
11 changed files with 286 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/lib/libnarrate.py
View File

@ -2070,7 +2070,7 @@ class Narrator(object):
return text
def get_married_string(self, family, is_first=True):
def get_married_string(self, family, is_first=True, name_display=None):
"""
Get a string narrating the marriage of the subject.
Example sentences:
@ -2085,7 +2085,9 @@ class Narrator(object):
:param is_first: Indicates whether this sentence represents the first
marriage. If it is not the first marriage, the sentence will
include "also".
:type is_first: :class:`~gen.lib.family,Family`
:type is_first: bool
:param name_display: An object to be used for displaying names
:type is_first: :class:`~gen.display.name,NameDisplay`
:returns: A sentence about the subject's marriage.
:rtype: unicode
"""
@ -2100,8 +2102,11 @@ class Narrator(object):
date = self.__empty_date
place = self.__empty_place
spouse_name = _nd.display(spouse)
if not name_display:
spouse_name = _nd.display(spouse)
else:
spouse_name = name_display.display(spouse)
if event:
if self.__use_fulldate :
mdate = self.__get_date(event.get_date_object())