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

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

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

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

@ -23,6 +23,7 @@
#
#------------------------------------------------------------------------
from gettext import gettext as _
from gettext import ngettext
import datetime
import time
@ -246,8 +247,9 @@ class CalendarReport(Report):
'person' : short_name,
'relation' : comment}
else:
text = _('%(person)s, %(age)d%(relation)s') % {
'person' : short_name,
text = ngettext('%(person)s, %(age)d%(relation)s',
'%(person)s, %(age)d%(relation)s', nyears)
% {'person' : short_name,
'age' : nyears,
'relation' : comment}
@ -293,8 +295,9 @@ class CalendarReport(Report):
'spouse' : spouse_name,
'person' : short_name}
else:
text = _("%(spouse)s and\n %(person)s, %(nyears)d") % {
'spouse' : spouse_name,
text = ngettext("%(spouse)s and\n %(person)s, %(nyears)d",
"%(spouse)s and\n %(person)s, %(nyears)d", nyears)
% {'spouse' : spouse_name,
'person' : short_name,
'nyears' : nyears}

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

@ -48,6 +48,7 @@ import calendar
import codecs
import shutil
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>') % {
'person' : text}
else:
txt_str = _('%(person)s, <em>%(age)s</em> old') % {
'person' : text,
'age' : age_str}
txt_str = ngettext('%(person)s, <em>%(age)s</em> old',
'%(person)s, <em>%(age)s</em> old', age_str)
% {'person' : text, 'age' : age_str}
# an 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>') % {
'couple' : text}
else:
txt_str = _('%(couple)s, <em>%(years)d</em> year anniversary') % {
'couple' : text,
'years' : nyears}
txt_str = ngettext('%(couple)s, <em>%(years)d</em> year anniversary'
'%(couple)s, <em>%(years)d</em> year anniversary', nyears)
% {'couple' : text, 'years' : nyears}
txt_str = '<span class="yearsmarried">%s</span>' % txt_str
if txt_str is not None: