Removing redundant strings
svn: r1595
This commit is contained in:
@ -437,7 +437,7 @@ class FtmDescendantReport(Report.Report):
|
||||
if ddate:
|
||||
if dplace:
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s "
|
||||
"was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s "
|
||||
"was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s in %(death_place)s%(death_endnotes)s.") % {
|
||||
'male_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()),
|
||||
'birth_date' : bdate, 'birth_place' : bplace,
|
||||
@ -446,7 +446,7 @@ class FtmDescendantReport(Report.Report):
|
||||
'death_endnotes' : self.endnotes(death) })
|
||||
else:
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s "
|
||||
"was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s "
|
||||
"was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s%(death_endnotes)s.") % {
|
||||
'male_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()),
|
||||
'birth_date' : bdate, 'birth_place' : bplace, 'death_date' : ddate,
|
||||
@ -455,7 +455,7 @@ class FtmDescendantReport(Report.Report):
|
||||
else:
|
||||
if dplace:
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s "
|
||||
"was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s "
|
||||
"was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, "
|
||||
"and died in %(death_place)s%(death_endnotes)s.") % {
|
||||
'male_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()),
|
||||
'birth_date' : bdate, 'birth_place' : bplace, 'death_place' : dplace,
|
||||
@ -471,7 +471,7 @@ class FtmDescendantReport(Report.Report):
|
||||
if ddate:
|
||||
if dplace:
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s "
|
||||
"was born %(birth_date)s%(birth_endnotes)s "
|
||||
"was born %(birth_date)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s in %(death_place)s%(death_endnotes)s.") % {
|
||||
'male_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()),
|
||||
'birth_date' : bdate,
|
||||
@ -480,7 +480,7 @@ class FtmDescendantReport(Report.Report):
|
||||
'death_endnotes' : self.endnotes(death) })
|
||||
else:
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s "
|
||||
"was born %(birth_date)s%(birth_endnotes)s "
|
||||
"was born %(birth_date)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s%(death_endnotes)s.") % {
|
||||
'male_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()),
|
||||
'birth_date' : bdate, 'death_date' : ddate,
|
||||
@ -489,7 +489,7 @@ class FtmDescendantReport(Report.Report):
|
||||
else:
|
||||
if dplace:
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s "
|
||||
"was born %(birth_date)s%(birth_endnotes)s "
|
||||
"was born %(birth_date)s%(birth_endnotes)s, "
|
||||
"and died in %(death_place)s%(death_endnotes)s.") % {
|
||||
'male_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()),
|
||||
'birth_date' : bdate, 'death_place' : dplace,
|
||||
@ -505,7 +505,7 @@ class FtmDescendantReport(Report.Report):
|
||||
if ddate:
|
||||
if dplace:
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s "
|
||||
"was born in %(birth_place)s%(birth_endnotes)s "
|
||||
"was born in %(birth_place)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s in %(death_place)s%(death_endnotes)s.") % {
|
||||
'male_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()),
|
||||
'birth_place' : bplace,
|
||||
@ -514,7 +514,7 @@ class FtmDescendantReport(Report.Report):
|
||||
'death_endnotes' : self.endnotes(death) })
|
||||
else:
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s "
|
||||
"was born in %(birth_place)s%(birth_endnotes)s "
|
||||
"was born in %(birth_place)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s%(death_endnotes)s.") % {
|
||||
'male_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()),
|
||||
'birth_place' : bplace, 'death_date' : ddate,
|
||||
@ -523,7 +523,7 @@ class FtmDescendantReport(Report.Report):
|
||||
else:
|
||||
if dplace:
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s "
|
||||
"was born in %(birth_place)s%(birth_endnotes)s "
|
||||
"was born in %(birth_place)s%(birth_endnotes)s, "
|
||||
"and died in %(death_place)s%(death_endnotes)s.") % {
|
||||
'male_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()),
|
||||
'birth_place' : bplace, 'death_place' : dplace,
|
||||
@ -565,7 +565,7 @@ class FtmDescendantReport(Report.Report):
|
||||
if ddate:
|
||||
if dplace:
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s "
|
||||
"was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s "
|
||||
"was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s in %(death_place)s%(death_endnotes)s.") % {
|
||||
'female_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()),
|
||||
'birth_date' : bdate, 'birth_place' : bplace,
|
||||
@ -574,7 +574,7 @@ class FtmDescendantReport(Report.Report):
|
||||
'death_endnotes' : self.endnotes(death) })
|
||||
else:
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s "
|
||||
"was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s "
|
||||
"was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s%(death_endnotes)s.") % {
|
||||
'female_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()),
|
||||
'birth_date' : bdate, 'birth_place' : bplace, 'death_date' : ddate,
|
||||
@ -583,7 +583,7 @@ class FtmDescendantReport(Report.Report):
|
||||
else:
|
||||
if dplace:
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s "
|
||||
"was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s "
|
||||
"was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, "
|
||||
"and died in %(death_place)s%(death_endnotes)s.") % {
|
||||
'female_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()),
|
||||
'birth_date' : bdate, 'birth_place' : bplace, 'death_place' : dplace,
|
||||
@ -599,7 +599,7 @@ class FtmDescendantReport(Report.Report):
|
||||
if ddate:
|
||||
if dplace:
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s "
|
||||
"was born %(birth_date)s%(birth_endnotes)s "
|
||||
"was born %(birth_date)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s in %(death_place)s%(death_endnotes)s.") % {
|
||||
'female_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()),
|
||||
'birth_date' : bdate,
|
||||
@ -608,7 +608,7 @@ class FtmDescendantReport(Report.Report):
|
||||
'death_endnotes' : self.endnotes(death) })
|
||||
else:
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s "
|
||||
"was born %(birth_date)s%(birth_endnotes)s "
|
||||
"was born %(birth_date)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s%(death_endnotes)s.") % {
|
||||
'female_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()),
|
||||
'birth_date' : bdate, 'death_date' : ddate,
|
||||
@ -617,7 +617,7 @@ class FtmDescendantReport(Report.Report):
|
||||
else:
|
||||
if dplace:
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s "
|
||||
"was born %(birth_date)s%(birth_endnotes)s "
|
||||
"was born %(birth_date)s%(birth_endnotes)s, "
|
||||
"and died in %(death_place)s%(death_endnotes)s.") % {
|
||||
'female_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()),
|
||||
'birth_date' : bdate, 'death_place' : dplace,
|
||||
@ -633,7 +633,7 @@ class FtmDescendantReport(Report.Report):
|
||||
if ddate:
|
||||
if dplace:
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s "
|
||||
"was born in %(birth_place)s%(birth_endnotes)s "
|
||||
"was born in %(birth_place)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s in %(death_place)s%(death_endnotes)s.") % {
|
||||
'female_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()),
|
||||
'birth_place' : bplace,
|
||||
@ -642,7 +642,7 @@ class FtmDescendantReport(Report.Report):
|
||||
'death_endnotes' : self.endnotes(death) })
|
||||
else:
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s "
|
||||
"was born in %(birth_place)s%(birth_endnotes)s "
|
||||
"was born in %(birth_place)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s%(death_endnotes)s.") % {
|
||||
'female_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()),
|
||||
'birth_place' : bplace, 'death_date' : ddate,
|
||||
@ -651,7 +651,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 "
|
||||
"was born in %(birth_place)s%(birth_endnotes)s, "
|
||||
"and died in %(death_place)s%(death_endnotes)s.") % {
|
||||
'female_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()),
|
||||
'birth_place' : bplace, 'death_place' : dplace,
|
||||
@ -775,19 +775,21 @@ class FtmDescendantReport(Report.Report):
|
||||
if bplace:
|
||||
if ddate:
|
||||
if dplace:
|
||||
self.doc.write_text(_("He was born %(birth_date)s in %(birth_place)s"
|
||||
"%(birth_endnotes)s, "
|
||||
"and died %(death_date)s in %(death_place)s"
|
||||
"%(death_endnotes)s.") % {
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s "
|
||||
"in %(birth_place)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s in %(death_place)s"
|
||||
"%(death_endnotes)s.") % {
|
||||
'male_name' : _('He'), 'endnotes' : '',
|
||||
'birth_date' : bdate, 'birth_place' : bplace,
|
||||
'death_date' : ddate,'death_place' : dplace,
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
})
|
||||
else:
|
||||
self.doc.write_text(_("He was born %(birth_date)s in %(birth_place)s"
|
||||
"%(birth_endnotes)s, "
|
||||
"and died %(death_date)s%(death_endnotes)s.") % {
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s "
|
||||
"in %(birth_place)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s%(death_endnotes)s.") % {
|
||||
'male_name' : _('He'), 'endnotes' : '',
|
||||
'birth_date' : bdate, 'birth_place' : bplace,
|
||||
'death_date' : ddate,
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
@ -795,48 +797,55 @@ class FtmDescendantReport(Report.Report):
|
||||
})
|
||||
else:
|
||||
if dplace:
|
||||
self.doc.write_text(_("He was born %(birth_date)s in %(birth_place)s"
|
||||
"%(birth_endnotes)s, "
|
||||
"and died in %(death_place)s%(death_endnotes)s.") % {
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s "
|
||||
"in %(birth_place)s %(birth_endnotes)s, "
|
||||
"and died in %(death_place)s%(death_endnotes)s.") % {
|
||||
'male_name' : _('He'), 'endnotes' : '',
|
||||
'birth_date' : bdate, 'birth_place' : bplace,
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
'death_place' : dplace,
|
||||
})
|
||||
else:
|
||||
self.doc.write_text(_("He was born %(birth_date)s in "
|
||||
"%(birth_place)s%(birth_endnotes)s. ") % {
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s in "
|
||||
"%(birth_place)s%(birth_endnotes)s.") % {
|
||||
'male_name' : _('He'), 'endnotes' : '',
|
||||
'birth_date' : bdate, 'birth_place' : bplace,
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
})
|
||||
else:
|
||||
if ddate:
|
||||
if dplace:
|
||||
self.doc.write_text(_("He was born %(birth_date)s%(birth_endnotes)s, "
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s in %(death_place)s"
|
||||
"%(death_endnotes)s.") % {
|
||||
'male_name' : _('He'), 'endnotes' : '',
|
||||
'birth_date' : bdate, 'death_date' : ddate,
|
||||
'death_place' : dplace,
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
})
|
||||
else:
|
||||
self.doc.write_text(_("He was born %(birth_date)s%(birth_endnotes)s, "
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s%(death_endnotes)s.") % {
|
||||
'male_name' : _('He'), 'endnotes' : '',
|
||||
'birth_date' : bdate, 'death_date' : ddate,
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
})
|
||||
else:
|
||||
if dplace:
|
||||
self.doc.write_text(_("He was born %(birth_date)s%(birth_endnotes)s, "
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, "
|
||||
"and died in %(death_place)s%(death_endnotes)s.") % {
|
||||
'male_name' : _('He'), 'endnotes' : '',
|
||||
'birth_date' : bdate, 'death_place' : dplace,
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
})
|
||||
else:
|
||||
self.doc.write_text(_("He was born %(birth_date)s%(birth_endnotes)s. ") % {
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s was born "
|
||||
"%(birth_date)s%(birth_endnotes)s.") % {
|
||||
'male_name' : _('He'), 'endnotes' : '',
|
||||
'birth_date' : bdate,
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
})
|
||||
@ -844,49 +853,59 @@ class FtmDescendantReport(Report.Report):
|
||||
if bplace:
|
||||
if ddate:
|
||||
if dplace:
|
||||
self.doc.write_text(_("He was born in %(birth_place)s%(birth_endnotes)s, "
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s in %(death_place)s"
|
||||
"%(death_endnotes)s.") % {
|
||||
'male_name' : _('He'), 'endnotes' : '',
|
||||
'birth_place' : bplace, 'death_date' : ddate, 'death_place' : dplace,
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
})
|
||||
else:
|
||||
self.doc.write_text(_("He was born in %(birth_place)s%(birth_endnotes)s, "
|
||||
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.") % {
|
||||
'male_name' : _('He'), 'endnotes' : '',
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
'birth_place' : bplace, 'death_date' : ddate,
|
||||
})
|
||||
else:
|
||||
if dplace:
|
||||
self.doc.write_text(_("He was born in %(birth_place)s%(birth_endnotes)s, "
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
|
||||
"and died in %(death_place)s%(death_endnotes)s.") % {
|
||||
'male_name' : _('He'), 'endnotes' : '',
|
||||
'birth_place' : bplace,'death_place' : dplace,
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
})
|
||||
else:
|
||||
self.doc.write_text(_("He was born in %(birth_place)s%(birth_endnotes)s. ") % {
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s was born "
|
||||
"in %(birth_place)s%(birth_endnotes)s.") % {
|
||||
'male_name' : _('He'), 'endnotes' : '',
|
||||
'birth_place' : bplace,
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
})
|
||||
else:
|
||||
if ddate:
|
||||
if dplace:
|
||||
self.doc.write_text(_("He died %(death_date)s in "
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s died %(death_date)s in "
|
||||
"%(death_place)s%(death_endnotes)s.") % {
|
||||
'male_name' : _('He'), 'endnotes' : '',
|
||||
'death_date' : ddate, 'death_place' : dplace,
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
})
|
||||
else:
|
||||
self.doc.write_text(_("He died %(death_date)s%(death_endnotes)s.") % {
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s "
|
||||
"died %(death_date)s%(death_endnotes)s.") % {
|
||||
'male_name' : _('He'), 'endnotes' : '',
|
||||
'death_date' : ddate,
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
})
|
||||
else:
|
||||
if dplace:
|
||||
self.doc.write_text(_("He died in %(death_place)s%(death_endnotes)s.") % {
|
||||
self.doc.write_text(_("%(male_name)s%(endnotes)s died "
|
||||
"in %(death_place)s%(death_endnotes)s.") % {
|
||||
'male_name' : _('He'), 'endnotes' : '',
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
'death_place' : dplace,
|
||||
})
|
||||
@ -895,19 +914,21 @@ class FtmDescendantReport(Report.Report):
|
||||
if bplace:
|
||||
if ddate:
|
||||
if dplace:
|
||||
self.doc.write_text(_("She was born %(birth_date)s in %(birth_place)s"
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s"
|
||||
"%(birth_endnotes)s, "
|
||||
"and died %(death_date)s in %(death_place)s"
|
||||
"%(death_endnotes)s.") % {
|
||||
'female_name' : _('She'), 'endnotes' : '',
|
||||
'birth_date' : bdate, 'birth_place' : bplace,
|
||||
'death_date' : ddate,'death_place' : dplace,
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
})
|
||||
else:
|
||||
self.doc.write_text(_("She was born %(birth_date)s in %(birth_place)s"
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s"
|
||||
"%(birth_endnotes)s, "
|
||||
"and died %(death_date)s%(death_endnotes)s.") % {
|
||||
'female_name' : _('She'), 'endnotes' : '',
|
||||
'birth_date' : bdate, 'birth_place' : bplace,
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
@ -915,48 +936,55 @@ class FtmDescendantReport(Report.Report):
|
||||
})
|
||||
else:
|
||||
if dplace:
|
||||
self.doc.write_text(_("She was born %(birth_date)s in %(birth_place)s"
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s"
|
||||
"%(birth_endnotes)s, "
|
||||
"and died in %(death_place)s%(death_endnotes)s.") % {
|
||||
'female_name' : _('She'), 'endnotes' : '',
|
||||
'birth_date' : bdate, 'birth_place' : bplace,
|
||||
'death_place' : dplace,
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
})
|
||||
else:
|
||||
self.doc.write_text(_("She was born %(birth_date)s in %(birth_place)s"
|
||||
"%(birth_endnotes)s. ") % {
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s "
|
||||
"in %(birth_place)s %(birth_endnotes)s.") % {
|
||||
'female_name' : _('She'), 'endnotes' : '',
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'birth_date' : bdate, 'birth_place' : bplace,
|
||||
})
|
||||
else:
|
||||
if ddate:
|
||||
if dplace:
|
||||
self.doc.write_text(_("She was born %(birth_date)s%(birth_endnotes)s, "
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s in %(death_place)s"
|
||||
"%(death_endnotes)s.") % {
|
||||
'female_name' : _('She'), 'endnotes' : '',
|
||||
'birth_date' : bdate, 'death_date' : ddate,
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
'death_place' : dplace,
|
||||
})
|
||||
else:
|
||||
self.doc.write_text(_("She was born %(birth_date)s%(birth_endnotes)s, "
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s%(death_endnotes)s.") % {
|
||||
'female_name' : _('She'), 'endnotes' : '',
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
'birth_date' : bdate, 'death_date' : ddate,
|
||||
})
|
||||
else:
|
||||
if dplace:
|
||||
self.doc.write_text(_("She was born %(birth_date)s%(birth_endnotes)s, "
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_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),
|
||||
'birth_date' : bdate, 'death_place' : dplace,
|
||||
})
|
||||
else:
|
||||
self.doc.write_text(_("She was born %(birth_date)s%(birth_endnotes)s. ") % {
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s was "
|
||||
"born %(birth_date)s%(birth_endnotes)s.") % {
|
||||
'female_name' : _('She'), 'endnotes' : '',
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'birth_date' : bdate,
|
||||
})
|
||||
@ -964,48 +992,58 @@ class FtmDescendantReport(Report.Report):
|
||||
if bplace:
|
||||
if ddate:
|
||||
if dplace:
|
||||
self.doc.write_text(_("She was born in %(birth_place)s%(birth_endnotes)s, "
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s in %(death_place)s%(death_endnotes)s.") % {
|
||||
'female_name' : _('She'), 'endnotes' : '',
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
'birth_place' : bplace, 'death_date' : ddate, 'death_place' : dplace,
|
||||
})
|
||||
else:
|
||||
self.doc.write_text(_("She was born in %(birth_place)s%(birth_endnotes)s, "
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
|
||||
"and died %(death_date)s%(death_endnotes)s.") % {
|
||||
'female_name' : _('She'), 'endnotes' : '',
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
'birth_place' : bplace, 'death_date' : ddate,
|
||||
})
|
||||
else:
|
||||
if dplace:
|
||||
self.doc.write_text(_("She was born in %(birth_place)s%(birth_endnotes)s, "
|
||||
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.") % {
|
||||
'female_name' : _('She'), 'endnotes' : '',
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
'birth_place' : bplace,'death_place' : dplace,
|
||||
})
|
||||
else:
|
||||
self.doc.write_text(_("She was born in %(birth_place)s%(birth_endnotes)s. ") % {
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s was born "
|
||||
"in %(birth_place)s%(birth_endnotes)s.") % {
|
||||
'female_name' : _('She'), 'endnotes' : '',
|
||||
'birth_endnotes' : self.endnotes(birth),
|
||||
'birth_place' : bplace,
|
||||
})
|
||||
else:
|
||||
if ddate:
|
||||
if dplace:
|
||||
self.doc.write_text(_("She died %(death_date)s in "
|
||||
self.doc.write_text(_("%(female_name)s%(endnotes)s died %(death_date)s in "
|
||||
"%(death_place)s%(death_endnotes)s.") % {
|
||||
'female_name' : _('She'), 'endnotes' : '',
|
||||
'death_endnotes' : self.endnotes(death),
|
||||
'death_date' : ddate, 'death_place' : dplace,
|
||||
})
|
||||
else:
|
||||
self.doc.write_text(_("She 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(_("She 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,
|
||||
})
|
||||
|
Reference in New Issue
Block a user