Adding named variables to format strings for errors in 'make distcheck' to work.

svn: r14465
This commit is contained in:
Rob G. Healey 2010-02-24 23:05:16 +00:00
parent 4989c9e5d4
commit 8b0b4a3785

View File

@ -185,7 +185,8 @@ class RelCalc(Tool.Tool, ManagedWindow.ManagedWindow):
if other_person is None: if other_person is None:
pass pass
elif self.person.handle == other_person.handle: elif self.person.handle == other_person.handle:
rstr = _("%s and %s are the same person.") % (p1, p2) rstr = _("%(person)s and %(active_person)s are the same person.")) % {
'person' : p1, 'active_person' : p2 }
text.append((rstr, "")) text.append((rstr, ""))
elif len(rel_strings) == 0: elif len(rel_strings) == 0:
rstr = _("%(person)s and %(active_person)s are not related.") % { rstr = _("%(person)s and %(active_person)s are not related.") % {
@ -209,8 +210,8 @@ class RelCalc(Tool.Tool, ManagedWindow.ManagedWindow):
p2c = self.db.get_person_from_handle(common[1]) p2c = self.db.get_person_from_handle(common[1])
p1str = name_displayer.display(p1c) p1str = name_displayer.display(p1c)
p2str = name_displayer.display(p2c) p2str = name_displayer.display(p2c)
commontext = " " + _("Their common ancestors are %s and %s." commontext = " " + _("Their common ancestors are %(acentor1)s and %(ancestor2)s.")
) % (p1str,p2str) % { 'ancestor1' : p1str, 'ancestor2' : p2str }
elif length > 2: elif length > 2:
index = 0 index = 0
commontext = " " + _("Their common ancestors are: ") commontext = " " + _("Their common ancestors are: ")