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

#2300: error in baptised_str()'s logic at the end

Browse Source 
svn: r10916
This commit is contained in:
Jérôme Rapinat 2008-07-23 09:11:08 +00:00
parent 3e311275ee
commit 26133e7fd8
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ReportBase/_ReportUtils.py
View File

@ -2531,12 +2531,12 @@ def buried_str(database, person, person_name=None,
text = buried_full_date_no_place['succinct'] % values
elif bdate and verbose:
if bplace: #male, month_year, place
text = buried_partial_date_place[gender][name_index] % values
text = buried_partial_date_place[gender][name_index] % values
else: #male, month_year, no place
text = buried_partial_date_no_place[gender][name_index] % values
elif bdate:
if bplace: #male, month_year, place
text = buried_partial_date_place['succinct'] % values
text = buried_partial_date_place['succinct'] % values
else: #male, month_year, no place
text = buried_partial_date_no_place['succinct'] % values
elif bplace and verbose: #male, no date, place
@ -2636,18 +2636,20 @@ def baptised_str(database, person, person_name=None, verbose=True, empty_date=""
text = baptised_full_date_no_place['succinct'] % values
elif bdate and verbose:
if bplace: #male, month_year, place
text = baptised_partial_date_place[gender][name_index] % values
text = baptised_partial_date_place[gender][name_index] % values
else: #male, month_year, no place
text = baptised_partial_date_no_place[gender][name_index] % values
elif bdate:
if bplace: #male, month_year, place
text = baptised_partial_date_place['succinct'] % values
elif bplace: #male, no date, place
text = baptised_no_date_place['succinct'] % values
elif verbose:
text = baptised_partial_date_place['succinct'] % values
else: #male, month_year, no place
text = baptised_partial_date_no_place['succinct'] % values
elif bplace and verbose: #male, no date, place
text = baptised_no_date_place[gender][name_index] % values
elif bplace: #male, no date, place
text = baptised_no_date_place['succinct'] % values
elif verbose:
text = baptised_no_date_no_place[gender][name_index] % values
else: #male, no date, no place
text = baptised_no_date_no_place['succinct'] % values
@ -2655,6 +2657,7 @@ def baptised_str(database, person, person_name=None, verbose=True, empty_date=""
text = text + " "
return text
#-------------------------------------------------------------------------
#
# list_person_str