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

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

Browse Source 
svn: r14458
This commit is contained in:
Rob G. Healey 2010-02-24 22:58:17 +00:00
parent f99b1ac371
commit 6cbe9e3c0d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/import/ImportXml.py
View File

@ -1310,9 +1310,9 @@ class GrampsParser(UpdateCallback):
if self.db.has_name_group_key(key) : if self.db.has_name_group_key(key) :
present = self.db.get_name_group_mapping(key) present = self.db.get_name_group_mapping(key)
if not value == present: if not value == present:
msg = _("Your family tree groups name %s together" msg = _("Your family tree groups name %(key)s together"
" with %s, did not change this grouping to %s") % ( " with %(parent)s, did not change this grouping to %(value)s") % {
key, present, value) 'key' : key, 'parent' : present, 'value' : value }
self.errmsg(msg) self.errmsg(msg)
else: else:
self.db.set_name_group_mapping(key, value) self.db.set_name_group_mapping(key, value)
@ -2479,11 +2479,11 @@ def version_is_valid(filename, cli):
parser = VersionParser(filename) parser = VersionParser(filename)
if parser.get_xmlns_version() > libgrampsxml.GRAMPS_XML_VERSION: if parser.get_xmlns_version() > libgrampsxml.GRAMPS_XML_VERSION:
msg = _("The .gramps file you are importing was made by version %s of " msg = _("The .gramps file you are importing was made by version %(newer)s of "
"Gramps, while you are running an older version %s. " "Gramps, while you are running an older version %(older)s. "
"The file will not be imported. Please upgrade to the latest " "The file will not be imported. Please upgrade to the latest "
"version of Gramps and try again." "version of Gramps and try again." ) % {
) % (parser.get_gramps_version(), const.VERSION) 'newer' : parser.get_gramps_version(), 'older' : const.VERSION }
if cli: if cli:
LOG.warn(msg) LOG.warn(msg)
return False return False