[Erp5-report] r32373 leonardo - /experimental/erp5.buildout-zope-2.12/trunk/src/Products/Lo...

[nobody at svn.erp5.org]

Author: leonardo
Date: Tue Feb  9 17:40:56 2010
New Revision: 32373

URL: http://svn.erp5.org?rev=32373&view=rev
Log:
Work around http://bugs.hforge.org/show_bug.cgi?id=805 , fix testTranslation failure on Zope 2.12

Modified:
    experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/MessageCatalog.py

Modified: experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/MessageCatalog.py
URL: http://svn.erp5.org/experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/MessageCatalog.py?rev=32373&r1=32372&r2=32373&view=diff
==============================================================================
--- experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/MessageCatalog.py [utf8] (original)
+++ experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/MessageCatalog.py [utf8] Tue Feb  9 17:40:56 2010
@@ -653,6 +653,10 @@
         # Load the data
         po = itools.gettext.POFile(string=data)
         for msgid in po.get_msgids():
+            if not isinstance(msgid, basestring):
+                # new .get_msgids() of new itools.gettext return list of
+                # (context, msgid) tuples. 'context' is usually None
+                _context, msgid = msgid
             if msgid:
                 msgstr = po.get_msgstr(msgid) or ''
                 if not messages.has_key(msgid):