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

#2657,#1718 use ngettext

Browse Source 
svn: r11848
This commit is contained in:
Jérôme Rapinat 2009-02-04 16:58:46 +00:00
parent 1e8ec7eb2d
commit d587ffe618
3 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/drawreport/Calendar.py
View File

@ -23,6 +23,7 @@
# #
#------------------------------------------------------------------------ #------------------------------------------------------------------------
from gettext import gettext as _ from gettext import gettext as _
from gettext import ngettext
import datetime import datetime
import time import time
@ -290,10 +291,11 @@ class Calendar(Report):
'person' : short_name, 'person' : short_name,
'relation' : ""} 'relation' : ""}
else: else:
text = _('%(person)s, %(age)d%(relation)s') % { text = ngettext('%(person)s, %(age)d%(relation)s',
'person' : short_name, '%(person)s, %(age)d%(relation)s', nyears)
'age' : nyears, % {'person' : short_name,
'relation' : ""} 'age' : nyears,
'relation' : ""}
self.add_day_item(text, month, day) self.add_day_item(text, month, day)
if self.anniversaries: if self.anniversaries:
family_list = person.get_family_handle_list() family_list = person.get_family_handle_list()
@ -340,10 +342,11 @@ class Calendar(Report):
'person' : short_name, 'person' : short_name,
} }
else: else:
text = _("%(spouse)s and\n %(person)s, %(nyears)d") % { text = ngettext("%(spouse)s and\n %(person)s, %(nyears)d",
'spouse' : spouse_name, "%(spouse)s and\n %(person)s, %(nyears)d", nyears)
'person' : short_name, % {'spouse' : spouse_name,
'nyears' : nyears} 'person' : short_name,
'nyears' : nyears}
alive1 = probably_alive(person, self.database, \ alive1 = probably_alive(person, self.database, \
prob_alive_date) prob_alive_date)

19
src/plugins/textreport/BirthdayReport.py
View File

@ -23,6 +23,7 @@
# #
#------------------------------------------------------------------------ #------------------------------------------------------------------------
from gettext import gettext as _ from gettext import gettext as _
from gettext import ngettext
import datetime import datetime
import time import time
@ -246,10 +247,11 @@ class CalendarReport(Report):
'person' : short_name, 'person' : short_name,
'relation' : comment} 'relation' : comment}
else: else:
text = _('%(person)s, %(age)d%(relation)s') % { text = ngettext('%(person)s, %(age)d%(relation)s',
'person' : short_name, '%(person)s, %(age)d%(relation)s', nyears)
'age' : nyears, % {'person' : short_name,
'relation' : comment} 'age' : nyears,
'relation' : comment}
self.add_day_item(text, month, day) self.add_day_item(text, month, day)
if self.anniversaries: if self.anniversaries:
@ -293,10 +295,11 @@ class CalendarReport(Report):
'spouse' : spouse_name, 'spouse' : spouse_name,
'person' : short_name} 'person' : short_name}
else: else:
text = _("%(spouse)s and\n %(person)s, %(nyears)d") % { text = ngettext("%(spouse)s and\n %(person)s, %(nyears)d",
'spouse' : spouse_name, "%(spouse)s and\n %(person)s, %(nyears)d", nyears)
'person' : short_name, % {'spouse' : spouse_name,
'nyears' : nyears} 'person' : short_name,
'nyears' : nyears}
prob_alive_date = gen.lib.Date(self.year, month, day) prob_alive_date = gen.lib.Date(self.year, month, day)
alive1 = probably_alive(person, self.database, \ alive1 = probably_alive(person, self.database, \

13
src/plugins/webreport/WebCal.py
View File

@ -48,6 +48,7 @@ import calendar
import codecs import codecs
import shutil import shutil
from gettext import gettext as _ from gettext import gettext as _
from gettext import ngettext
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
@ -1527,9 +1528,9 @@ def get_day_list(event_date, holiday_list, bday_anniv_list):
txt_str = _('%(person)s, <em>birth</em>') % { txt_str = _('%(person)s, <em>birth</em>') % {
'person' : text} 'person' : text}
else: else:
txt_str = _('%(person)s, <em>%(age)s</em> old') % { txt_str = ngettext('%(person)s, <em>%(age)s</em> old',
'person' : text, '%(person)s, <em>%(age)s</em> old', age_str)
'age' : age_str} % {'person' : text, 'age' : age_str}
# an anniversary # an anniversary
elif event == 'Anniversary': elif event == 'Anniversary':
@ -1538,9 +1539,9 @@ def get_day_list(event_date, holiday_list, bday_anniv_list):
txt_str = _('%(couple)s, <em>wedding</em>') % { txt_str = _('%(couple)s, <em>wedding</em>') % {
'couple' : text} 'couple' : text}
else: else:
txt_str = _('%(couple)s, <em>%(years)d</em> year anniversary') % { txt_str = ngettext('%(couple)s, <em>%(years)d</em> year anniversary'
'couple' : text, '%(couple)s, <em>%(years)d</em> year anniversary', nyears)
'years' : nyears} % {'couple' : text, 'years' : nyears}
txt_str = '<span class="yearsmarried">%s</span>' % txt_str txt_str = '<span class="yearsmarried">%s</span>' % txt_str
if txt_str is not None: if txt_str is not None: