[Translate-cvs] src/translate/convert csv2po.py,1.21,1.22

[Dwayne B. <dwa...@us...>]

Update of /cvsroot/translate/src/translate/convert
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3761

Modified Files:
	csv2po.py 
Log Message:
improve the error messages when entry can't be found


Index: csv2po.py
===================================================================
RCS file: /cvsroot/translate/src/translate/convert/csv2po.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- csv2po.py	7 Sep 2005 11:31:10 -0000	1.21
+++ csv2po.py	8 Sep 2005 14:25:48 -0000	1.22
@@ -99,14 +99,15 @@
     elif simplify(thecsv.msgid) in self.simpleindex:
       thepolist = self.simpleindex[simplify(thecsv.msgid)]
       if len(thepolist) > 1:
-        print >>sys.stderr, "trying to match by duplicate simpleid: original %s, simplified %s" % (thecsv.msgid, simplify(thecsv.msgid))
-        print >>sys.stderr, "\n".join(["possible match: " + po.getunquotedstr(thepo.msgid) for thepo in thepolist])
+        pofilename = getattr(self.pofile, "filename", "(unknown)")
+        matches = "\n  ".join(["possible match: " + po.getunquotedstr(thepo.msgid) for thepo in thepolist])
+        print >>sys.stderr, "%s - csv entry not found in pofile, multiple matches found:\n  location\t%s\n  original\t%s\n  translation\t%s\n  %s" % (pofilename, thecsv.source, thecsv.msgid, thecsv.msgstr, matches)
         self.unmatched += 1
         return
       thepo = thepolist[0]
     else:
-      print >>sys.stderr, "could not find csv entry in po: %r, %r, %r" % \
-        (thecsv.source, thecsv.msgid, thecsv.msgstr)
+      pofilename = getattr(self.pofile, "filename", "(unknown)")
+      print >>sys.stderr, "%s - csv entry not found in pofile:\n  location\t%s\n  original\t%s\n  translation\t%s" % (pofilename, thecsv.source, thecsv.msgid, thecsv.msgstr)
       self.unmatched += 1
       return
     csvmsgstr = [quotecsvstr(line) for line in thecsv.msgstr.split('\n')]