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

svn: r10917
This commit is contained in:
Jérôme Rapinat 2008-07-23 09:30:58 +00:00
parent 9722cac786
commit 162c5cf09f

View File

@ -2637,12 +2637,14 @@ def baptised_str(database, person, person_name=None, verbose=True, empty_date=""
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:
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