py2/py3: make translation code compatible.

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_updateTranslationTable.py

-from Products.ERP5Type.Utils import getMessageIdWithContext
+from Products.ERP5Type.Utils import getMessageIdWithContext, str2unicode, unicode2str
 
 supported_languages = context.Localizer.get_supported_languages()
 translated_keys = {} # This dict prevents entering the same key twice
@@ -34,7 +34,7 @@ for portal_type in portal_type_list:
       for lang in supported_languages:
         key = (lang, portal_type.getId(), state_var, state_reference)
         if key not in translated_keys:
-          translated_message = context.Localizer.erp5_ui.gettext(state_reference, lang=lang).encode('utf-8')
+          translated_message = unicode2str(context.Localizer.erp5_ui.gettext(state_reference, lang=lang))
           translated_keys[key] = None # mark as translated
           object_list.append(dict(language=lang, message_context=state_var, portal_type=portal_type.getId(), original_message=state_reference,
                              translated_message=translated_message))
@@ -43,10 +43,10 @@ for portal_type in portal_type_list:
         if state.getTitle() is not None and state.getTitle() != '':
           state_var_title = '%s_title' % state_var
           msg_id = getMessageIdWithContext(state.getTitle(), 'state', wf_id)
-          translated_message = context.Localizer.erp5_ui.gettext(msg_id, default='', lang=lang).encode('utf-8')
+          translated_message = unicode2str(context.Localizer.erp5_ui.gettext(msg_id, default='', lang=lang))
           if translated_message == '':
             msg_id = state.getTitle()
-            translated_message = context.Localizer.erp5_ui.gettext(state.getTitle().decode('utf-8'), lang=lang).encode('utf-8')
+            translated_message = unicode2str(context.Localizer.erp5_ui.gettext(str2unicode(state.getTitle()), lang=lang))
           key = (lang, portal_type.getId(), state_var_title, state_reference, msg_id)
           if key not in translated_keys:
             translated_keys[key] = None # mark as translated
@@ -67,7 +67,7 @@ for ptype in context.portal_types.objectValues():
     if key not in translated_keys:
       translated_keys[key] = None # mark as translated
       object_list.append(dict(language=lang, message_context='portal_type', portal_type=portal_type, original_message=portal_type,
-                         translated_message=context.Localizer.erp5_ui.gettext(portal_type, lang=lang).encode('utf-8')))
+                         translated_message=unicode2str(context.Localizer.erp5_ui.gettext(portal_type, lang=lang))))
 if object_list:
   catalog_translation_list(object_list)
 

product/ERP5/tests/testTranslation.py

@@ -31,7 +31,7 @@ import unittest
 import MethodObject
 
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from Products.ERP5Type.Utils import getMessageIdWithContext
+from Products.ERP5Type.Utils import getMessageIdWithContext, str2unicode, unicode2str
 
 # dependency order
 target_business_templates = (
@@ -100,7 +100,7 @@ class TestWorkflowStateTitleTranslation(ERP5TypeTestCase):
     if (result == msgid) and (self.lang != 'en'):
       #result = None
       result = self.portal.Localizer.erp5_ui.gettext(msgid)
-    return result.encode('utf8')
+    return unicode2str(result)
 
   def logMessage(self, message):
     self.message += '%s\n' % message
@@ -180,7 +180,7 @@ class TestWorkflowStateTitleTranslation(ERP5TypeTestCase):
       if error:
         for key, item_list in error_dict.items():
           if len(item_list) != 0:
-            self.logMessage("\n'%s'" % key.encode('utf-8'))
+            self.logMessage("\n'%s'" % unicode2str(key))
             self.logMessage('\t### Conflicting workflow with common states (ie, what user can see) ###')
             for item in item_list:
               # XXX Improve rendering
@@ -250,7 +250,7 @@ class TestWorkflowStateTitleTranslation(ERP5TypeTestCase):
                                                     'item_workflow'),
                             add=1)
     message_catalog.message_edit('Validated', self.lang,
-                                 'Validé'.decode('utf8'), '')
+                                 str2unicode('Validé'), '')
     message_catalog.message_edit(getMessageIdWithContext('Validated',
                                                          'state',
                                                          'item_workflow'),
@@ -433,7 +433,7 @@ class TestTranslation(ERP5TypeTestCase):
     </tal:ommit>
     """ % domain
     self.myzpt.pt_edit(zpt_template, 'text/html')
-    return self.myzpt(words=words).encode('utf-8').split()
+    return unicode2str(self.myzpt(words=words)).split()
 
   def test_ZPT_translation(self):
     results = self.translate_by_zpt('erp5_ui', 'Person', 'Draft')

product/Localizer/MessageCatalog.py

@@ -688,8 +688,10 @@ class MessageCatalog(LanguageManager, ObjectManager, SimpleItem):
     def manage_import(self, lang, file, REQUEST=None, RESPONSE=None):
         """ """
         # XXX For backwards compatibility only, use "po_import" instead.
-        if isinstance(file, str):
+        if isinstance(file, str): # six.PY2
             content = file
+        elif isinstance(file, bytes): # six.PY3
+            content = file.decode()
         else:
             content = file.read()