[FIX] orm: properly handle unicode values returned by ir.translation

lp bug: https://launchpad.net/bugs/613721 fixed

bzr revid: odo@openerp.com-20100908170257-bursdamzazhtbmas
This commit is contained in:
Raphael Valyi
2010-09-08 19:02:57 +02:00
committed by Olivier Dony
parent 7c3e6a6ed6
commit 80c4054ceb
+3 -3
View File
@@ -1349,13 +1349,13 @@ class orm_template(object):
# translate view
if ('lang' in context) and not result:
if node.get('string'):
trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('string').encode('utf8'))
trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('string'))
if not trans and ('base_model_name' in context):
trans = self.pool.get('ir.translation')._get_source(cr, user, context['base_model_name'], 'view', context['lang'], node.get('string').encode('utf8'))
trans = self.pool.get('ir.translation')._get_source(cr, user, context['base_model_name'], 'view', context['lang'], node.get('string'))
if trans:
node.set('string', trans)
if node.get('sum'):
trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('sum').encode('utf8'))
trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('sum'))
if trans:
node.set('sum', trans)