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

Changed some formatted strings to named variables for 'make distcheck' to work properly.

Browse Source 
svn: r14483
This commit is contained in:
Rob G. Healey
2010-02-25 15:52:32 +00:00
parent b2cfa9c776
commit 36a91b6cb9
19 changed files with 393 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/import/ImportProGen.py
View File

@ -688,7 +688,8 @@ class ProgenParser(object):
date.set(gen.lib.Date.QUAL_NONE, gen.lib.Date.MOD_ABOUT, gen.lib.Date.CAL_GREGORIAN, (0, month, year, None))
return date
log.warning(_("date did not match: '%s' (%s)") % (txt.encode('utf-8'), diag_msg or ''))
log.warning(_("date did not match: '(text)%s' (%(msg)s)")) % {
'text' : txt.encode('utf-8'), 'msg' : diag_msg or '' }
# Hmmm. Just use the plain text.
date.set_as_text(txt)
return date
@ -1238,9 +1239,11 @@ class ProgenParser(object):
father_handle = father > 0 and self.__find_person_handle("I%d" % father) or None
mother_handle = mother > 0 and self.__find_person_handle("I%d" % mother) or None
if father > 0 and not father_handle:
log.warning(_("cannot find father for I%s (father=%d)") % (pers_id, father))
log.warning(_("cannot find father for I%(person)s (father=%(id)d)")) % {
'person' : pers_id, 'id' : father }
elif mother > 0 and not mother_handle:
log.warning(_("cannot find mother for I%s (mother=%d)") % (pers_id, mother))
log.warning(_("cannot find mother for I(person)%s (mother=%(mother)d)")) % {
'person' : pers_id, 'mother' : mother }
else:
fam = self.fm2fam.get((father_handle, mother_handle), None)
if not fam: