[Erp5-report] r7855 - /erp5/trunk/products/ERP5Type/Message.py

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Jun 19 14:03:00 2006
New Revision: 7855

URL: http://svn.erp5.org?rev=7855&view=rev
Log:
don't modify self.message;
fix not existing variable.



Modified:
    erp5/trunk/products/ERP5Type/Message.py

Modified: erp5/trunk/products/ERP5Type/Message.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Message.py?rev=7855&r1=7854&r2=7855&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Message.py (original)
+++ erp5/trunk/products/ERP5Type/Message.py Mon Jun 19 14:03:00 2006
@@ -97,12 +97,13 @@
     if self.domain is None or request is None or translation_service is None :
       # Map the translated string with given parameters
       if type(self.mapping) is type({}):
-        if isinstance(self.message, unicode) :
-          self.message = self.message.encode('utf8')
-        self.message = Template(self.message).substitute(mapping)
-        if not isinstance(self.message, unicode):
-          self.message = self.message.decode('utf8')
-      return self.message
+        message = self.message
+        if isinstance(message, unicode) :
+          message = message.encode('utf8')
+        message = Template(message).substitute(self.mapping)
+        if not isinstance(message, unicode):
+          message = message.decode('utf8')
+      return message
     else:
       translated_message = translation_service.translate(
                                              self.domain,