From 46882b23cd94eba829fa149aa3f42a4d2ad86f5c Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Sun, 24 Apr 2005 15:00:40 +0000 Subject: [PATCH] * src/ReportUtils.py (list_person_str): Add missing periods; Use burial_date and burial_place for named format string parameters. svn: r4414 --- gramps2/ChangeLog | 4 +++- gramps2/src/ReportUtils.py | 32 ++++++++++++++++---------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 8f6acf85f..0cbe47032 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,6 +1,8 @@ 2005-04-24 Alex Roitman * 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 * src/po/es.po: Nearly complete update, but completely untested diff --git a/gramps2/src/ReportUtils.py b/gramps2/src/ReportUtils.py index b98238d92..f444c27c8 100644 --- a/gramps2/src/ReportUtils.py +++ b/gramps2/src/ReportUtils.py @@ -1464,25 +1464,25 @@ def buried_str(database,person,person_name=None,empty_date="",empty_place=""): if bdate and bdate_full: if bplace: #male, date, place 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, - 'birth_date' : bdate, 'birth_place' : bplace } + 'burial_date' : bdate, 'burial_place' : bplace } else: #male, date, no place - text = _("%(male_name)s was buried on %(birth_date)s.") % { - 'male_name' : person_name, 'birth_date' : bdate } + text = _("%(male_name)s was buried on %(burial_date)s.") % { + 'male_name' : person_name, 'burial_date' : bdate } elif bdate: if bplace: #male, month_year, place 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, - 'month_year' : bdate, 'birth_place' : bplace } + 'month_year' : bdate, 'burial_place' : bplace } else: #male, month_year, no place text = _("%(male_name)s was buried in %(month_year)s.") % { 'male_name' : person_name, 'month_year' : bdate } else: if bplace: #male, no date, place - text = _("%(male_name)s was buried in %(birth_place)s.") % { - 'male_name' : person_name, 'birth_place' : bplace } + text = _("%(male_name)s was buried in %(burial_place)s.") % { + 'male_name' : person_name, 'burial_place' : bplace } else: #male, no date, no place text = _("%(male_name)s was buried.") % { '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 bplace: #female, date, place 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, - 'birth_date' : bdate, 'birth_place' : bplace } + 'burial_date' : bdate, 'burial_place' : bplace } else: #female, date, no place - text = _("%(female_name)s was buried on %(birth_date)s.") % { - 'female_name' : person_name, 'birth_date' : bdate } + text = _("%(female_name)s was buried on %(burial_date)s.") % { + 'female_name' : person_name, 'burial_date' : bdate } elif bdate: if bplace: #female, month_year, place 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, - 'month_year' : bdate, 'birth_place' : bplace } + 'month_year' : bdate, 'burial_place' : bplace } else: #female, month_year, no place text = _("%(female_name)s was buried in %(month_year)s.") % { 'female_name' : person_name, 'month_year' : bdate } else: if bplace: #female, no date, place - text = _("%(female_name)s was buried in %(birth_place)s.") % { - 'female_name' : person_name, 'birth_place' : bplace } + text = _("%(female_name)s was buried in %(burial_place)s.") % { + 'female_name' : person_name, 'burial_place' : bplace } else: #female, no date, no place text = _("%(female_name)s was buried.") % { 'female_name' : person_name }