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

Fixed line ending issues, and syntax errors introduced by translation changes

Browse Source 
svn: r11860
This commit is contained in:
Doug Blank 2009-02-05 02:10:10 +00:00
parent de03d3d5a9
commit fc5dcee88b
3 changed files with 1010 additions and 1008 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -291,11 +291,11 @@ class Calendar(Report):
'person' : short_name,
'relation' : ""}
else:
text = ngettext('%(person)s, %(age)d%(relation)s',
'%(person)s, %(age)d%(relation)s', nyears)
text = (ngettext('%(person)s, %(age)d%(relation)s',
'%(person)s, %(age)d%(relation)s', nyears)
% {'person' : short_name,
'age' : nyears,
'relation' : ""}
'relation' : ""})
self.add_day_item(text, month, day)
if self.anniversaries:
family_list = person.get_family_handle_list()
@ -342,11 +342,11 @@ class Calendar(Report):
'person' : short_name,
}
else:
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}
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})
alive1 = probably_alive(person, self.database, \
prob_alive_date)
@ -539,3 +539,4 @@ pmgr.register_report(
author_email = "dblank@cs.brynmawr.edu",
description = _("Produces a graphical calendar"),
)

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

@ -247,11 +247,11 @@ class CalendarReport(Report):
'person' : short_name,
'relation' : comment}
else:
text = ngettext('%(person)s, %(age)d%(relation)s',
'%(person)s, %(age)d%(relation)s', nyears)
% {'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:
@ -295,11 +295,11 @@ class CalendarReport(Report):
'spouse' : spouse_name,
'person' : short_name}
else:
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}
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, \
@ -498,3 +498,4 @@ pmgr.register_report(
author_email = "dblank@cs.brynmawr.edu",
description = _("Produces a report of birthdays and anniversaries"),
)

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

@ -1528,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 = ngettext('%(person)s, <em>%(age)s</em> old',
'%(person)s, <em>%(age)s</em> old', age_str)
% {'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':
@ -1539,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 = ngettext('%(couple)s, <em>%(years)d</em> year anniversary'
'%(couple)s, <em>%(years)d</em> year anniversary', nyears)
% {'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: