[Erp5-report] r20036 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: alex
Date: Wed Mar 19 14:47:43 2008
New Revision: 20036

URL: http://svn.erp5.org?rev=20036&view=rev
Log:
Base_translateString: do not try to encode if encoding is None or an empty string (still defaults to 'utf8')

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_translateString.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_translateString.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_translateString.xml?rev=20036&r1=20035&r2=20036&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_translateString.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_translateString.xml Wed Mar 19 14:47:43 2008
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -78,6 +75,8 @@
 translation_service = getToolByName(context, \'Localizer\', None)\n
 if translation_service is not None :\n
   try:\n
+    if not encoding:\n
+      return translation_service.translate(catalog, msg, lang=lang, **kw)\n
     return translation_service.translate(catalog, msg, lang=lang, **kw).encode(encoding)\n
   except AttributeError: # This happens in unit testing, because it is not able to find something with get_context()\n
     pass\n
@@ -140,8 +139,8 @@
                             <string>context</string>
                             <string>None</string>
                             <string>translation_service</string>
+                            <string>_apply_</string>
                             <string>_getattr_</string>
-                            <string>_apply_</string>
                             <string>AttributeError</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=20036&r1=20035&r2=20036&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Wed Mar 19 14:47:43 2008
@@ -1,1 +1,1 @@
-754
+755