svn: r1596
This commit is contained in:
Alex Roitman
2003-05-27 18:06:45 +00:00
parent bb851dfdf4
commit 579f4a27d0
3 changed files with 18 additions and 31 deletions

View File

@@ -471,7 +471,7 @@ class FtmAncestorReport(Report.Report):
})
else:
self.doc.write_text(_("%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
"and died %(death_date)s$(death_endnotes)s.") % {
"and died %(death_date)s%(death_endnotes)s.") % {
'male_name' : _('He'), 'endnotes' : '',
'birth_endnotes' : self.endnotes(birth),
'death_endnotes' : self.endnotes(death),
@@ -613,7 +613,7 @@ class FtmAncestorReport(Report.Report):
else:
if dplace:
self.doc.write_text(_("%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
"and died in %(death_place)s$(death_endnotes)s.") % {
"and died in %(death_place)s%(death_endnotes)s.") % {
'female_name' : _('She'), 'endnotes' : '',
'birth_endnotes' : self.endnotes(birth),
'death_endnotes' : self.endnotes(death),
@@ -635,14 +635,14 @@ class FtmAncestorReport(Report.Report):
'death_date' : ddate, 'death_place' : dplace,
})
else:
self.doc.write_text(_("%(female_name)s%(endnotes)s died %(death_date)s$(death_endotes)s.") % {
self.doc.write_text(_("%(female_name)s%(endnotes)s died %(death_date)s%(death_endotes)s.") % {
'female_name' : _('She'), 'endnotes' : '',
'death_endnotes' : self.endnotes(death),
'death_date' : ddate,
})
else:
if dplace:
self.doc.write_text(_("%(female_name)s%(endnotes)s died in %(death_place)s$(death_endnotes)s.") % {
self.doc.write_text(_("%(female_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s.") % {
'female_name' : _('She'), 'endnotes' : '',
'death_endnotes' : self.endnotes(death),
'birth_date' : bdate, 'death_place' : dplace,

View File

@@ -863,7 +863,7 @@ class FtmDescendantReport(Report.Report):
})
else:
self.doc.write_text(_("%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
"and died %(death_date)s$(death_endnotes)s.") % {
"and died %(death_date)s%(death_endnotes)s.") % {
'male_name' : _('He'), 'endnotes' : '',
'birth_endnotes' : self.endnotes(birth),
'death_endnotes' : self.endnotes(death),
@@ -1010,7 +1010,7 @@ class FtmDescendantReport(Report.Report):
else:
if dplace:
self.doc.write_text(_("%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
"and died in %(death_place)s$(death_endnotes)s.") % {
"and died in %(death_place)s%(death_endnotes)s.") % {
'female_name' : _('She'), 'endnotes' : '',
'birth_endnotes' : self.endnotes(birth),
'death_endnotes' : self.endnotes(death),