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

* src/ReportUtils.py (list_person_str): Add missing periods;

Browse Source 
Use burial_date and burial_place for named format string parameters.


svn: r4414
This commit is contained in:
Alex Roitman
2005-04-24 15:00:40 +00:00
parent cde895aa1d
commit 46882b23cd
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,6 +1,8 @@
2005-04-24 Alex Roitman <shura@gramps-project.org> 2005-04-24 Alex Roitman <shura@gramps-project.org>
* src/plugins/rel_ru.py (get_parents): Remove gettext string. * src/plugins/rel_ru.py (get_parents): Remove gettext string.
* src/ReportUtils.py (list_person_str): Add missing periods.
* src/ReportUtils.py (list_person_str): Add missing periods;
Use burial_date and burial_place for named format string parameters.
2005-04-23 Julio Sanchez <jsanchez@users.sourceforge.net> 2005-04-23 Julio Sanchez <jsanchez@users.sourceforge.net>
* src/po/es.po: Nearly complete update, but completely untested * src/po/es.po: Nearly complete update, but completely untested

32
gramps2/src/ReportUtils.py
View File

@ -1464,25 +1464,25 @@ def buried_str(database,person,person_name=None,empty_date="",empty_place=""):
if bdate and bdate_full: if bdate and bdate_full:
if bplace: #male, date, place if bplace: #male, date, place
text = _("%(male_name)s " text = _("%(male_name)s "
"was buried on %(birth_date)s in %(birth_place)s.") % { "was buried on %(burial_date)s in %(burial_place)s.") % {
'male_name' : person_name, 'male_name' : person_name,
'birth_date' : bdate, 'birth_place' : bplace } 'burial_date' : bdate, 'burial_place' : bplace }
else: #male, date, no place else: #male, date, no place
text = _("%(male_name)s was buried on %(birth_date)s.") % { text = _("%(male_name)s was buried on %(burial_date)s.") % {
'male_name' : person_name, 'birth_date' : bdate } 'male_name' : person_name, 'burial_date' : bdate }
elif bdate: elif bdate:
if bplace: #male, month_year, place if bplace: #male, month_year, place
text = _("%(male_name)s " text = _("%(male_name)s "
"was buried in %(month_year)s in %(birth_place)s.") % { "was buried in %(month_year)s in %(burial_place)s.") % {
'male_name' : person_name, 'male_name' : person_name,
'month_year' : bdate, 'birth_place' : bplace } 'month_year' : bdate, 'burial_place' : bplace }
else: #male, month_year, no place else: #male, month_year, no place
text = _("%(male_name)s was buried in %(month_year)s.") % { text = _("%(male_name)s was buried in %(month_year)s.") % {
'male_name' : person_name, 'month_year' : bdate } 'male_name' : person_name, 'month_year' : bdate }
else: else:
if bplace: #male, no date, place if bplace: #male, no date, place
text = _("%(male_name)s was buried in %(birth_place)s.") % { text = _("%(male_name)s was buried in %(burial_place)s.") % {
'male_name' : person_name, 'birth_place' : bplace } 'male_name' : person_name, 'burial_place' : bplace }
else: #male, no date, no place else: #male, no date, no place
text = _("%(male_name)s was buried.") % { text = _("%(male_name)s was buried.") % {
'male_name' : person_name } 'male_name' : person_name }
@ -1490,25 +1490,25 @@ def buried_str(database,person,person_name=None,empty_date="",empty_place=""):
if bdate and bdate_full: if bdate and bdate_full:
if bplace: #female, date, place if bplace: #female, date, place
text = _("%(female_name)s " text = _("%(female_name)s "
"was buried on %(birth_date)s in %(birth_place)s.") % { "was buried on %(burial_date)s in %(burial_place)s.") % {
'female_name' : person_name, 'female_name' : person_name,
'birth_date' : bdate, 'birth_place' : bplace } 'burial_date' : bdate, 'burial_place' : bplace }
else: #female, date, no place else: #female, date, no place
text = _("%(female_name)s was buried on %(birth_date)s.") % { text = _("%(female_name)s was buried on %(burial_date)s.") % {
'female_name' : person_name, 'birth_date' : bdate } 'female_name' : person_name, 'burial_date' : bdate }
elif bdate: elif bdate:
if bplace: #female, month_year, place if bplace: #female, month_year, place
text = _("%(female_name)s " text = _("%(female_name)s "
"was buried in %(month_year)s in %(birth_place)s.") % { "was buried in %(month_year)s in %(burial_place)s.") % {
'female_name' : person_name, 'female_name' : person_name,
'month_year' : bdate, 'birth_place' : bplace } 'month_year' : bdate, 'burial_place' : bplace }
else: #female, month_year, no place else: #female, month_year, no place
text = _("%(female_name)s was buried in %(month_year)s.") % { text = _("%(female_name)s was buried in %(month_year)s.") % {
'female_name' : person_name, 'month_year' : bdate } 'female_name' : person_name, 'month_year' : bdate }
else: else:
if bplace: #female, no date, place if bplace: #female, no date, place
text = _("%(female_name)s was buried in %(birth_place)s.") % { text = _("%(female_name)s was buried in %(burial_place)s.") % {
'female_name' : person_name, 'birth_place' : bplace } 'female_name' : person_name, 'burial_place' : bplace }
else: #female, no date, no place else: #female, no date, no place
text = _("%(female_name)s was buried.") % { text = _("%(female_name)s was buried.") % {
'female_name' : person_name } 'female_name' : person_name }