#2657,#1718 use ngettext
svn: r11848
This commit is contained in:
@@ -23,6 +23,7 @@
|
||||
#
|
||||
#------------------------------------------------------------------------
|
||||
from gettext import gettext as _
|
||||
from gettext import ngettext
|
||||
import datetime
|
||||
import time
|
||||
|
||||
@@ -246,10 +247,11 @@ class CalendarReport(Report):
|
||||
'person' : short_name,
|
||||
'relation' : comment}
|
||||
else:
|
||||
text = _('%(person)s, %(age)d%(relation)s') % {
|
||||
'person' : short_name,
|
||||
'age' : nyears,
|
||||
'relation' : comment}
|
||||
text = ngettext('%(person)s, %(age)d%(relation)s',
|
||||
'%(person)s, %(age)d%(relation)s', nyears)
|
||||
% {'person' : short_name,
|
||||
'age' : nyears,
|
||||
'relation' : comment}
|
||||
|
||||
self.add_day_item(text, month, day)
|
||||
if self.anniversaries:
|
||||
@@ -293,10 +295,11 @@ class CalendarReport(Report):
|
||||
'spouse' : spouse_name,
|
||||
'person' : short_name}
|
||||
else:
|
||||
text = _("%(spouse)s and\n %(person)s, %(nyears)d") % {
|
||||
'spouse' : spouse_name,
|
||||
'person' : short_name,
|
||||
'nyears' : nyears}
|
||||
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}
|
||||
|
||||
prob_alive_date = gen.lib.Date(self.year, month, day)
|
||||
alive1 = probably_alive(person, self.database, \
|
||||
|
||||
Reference in New Issue
Block a user