From d7be7ed802a06627f5073ab0697a045a54400e32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Thu, 2 Mar 2006 10:36:59 +0000
Subject: [PATCH] Always return an unicode object.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5903 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/ERP5Type/patches/Localizer.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/product/ERP5Type/patches/Localizer.py b/product/ERP5Type/patches/Localizer.py
index 405cfbb6c0..e7289cfb76 100755
--- a/product/ERP5Type/patches/Localizer.py
+++ b/product/ERP5Type/patches/Localizer.py
@@ -67,7 +67,9 @@ def Localizer_translate(self, domain, msgid, mapping=None, *args, **kw):
     if type(mapping) is type({}):
       if isinstance(translated_str, unicode) :
         translated_str = translated_str.encode('utf8')
-      return Template(translated_str).substitute(mapping)
+      translated_str = Template(translated_str).substitute(mapping)
+      if not isinstance(translated_str, unicode):
+        translated_str = translated_str.decode('utf8')
     return translated_str
 
 def GlobalTranslationService_translate(self, domain, msgid, *args, **kw):
-- 
2.30.9