Merge lp:~openerp-dev/openobject-server/trunk-website_html_field_translation-pga into lp:openobject-server

[Thibault Delavallée (OpenERP)]

TO UDPATE

Unmerged revisions

5185. By Parth Gajjar(Open ERP) on 2014-04-16

merged with trunk

5184. By Parth Gajjar(Open ERP) on 2014-04-16

merged with trunk

5183. By Parth Gajjar(Open ERP) on 2014-04-15

[IMP] translated from translation term if field type is html

=== modified file 'openerp/addons/base/ir/ir_qweb.py'
--- openerp/addons/base/ir/ir_qweb.py	2014-04-16 08:54:07 +0000
+++ openerp/addons/base/ir/ir_qweb.py	2014-04-22 12:17:41 +0000
@@ -479,6 +479,13 @@
             ('data-oe-expression', t_att['field']),
         ]
 
+    def translate_html(self, cr, uid, trans_name, res_id, value, context=None):
+        if context.get('lang'):
+            for trans in self.pool['ir.translation'].search_read(cr, uid, [('name', '=', trans_name),('res_id', '=', res_id),('lang', '=', context.get('lang'))],['source','value']):
+                if trans['value']:
+                    value = value.replace(trans['source'], trans['value'])
+        return value
+
     def value_to_html(self, cr, uid, value, column, options=None, context=None):
         """ Converts a single value to its HTML version/output
         """
@@ -489,8 +496,14 @@
         """ Converts the specified field of the browse_record ``record`` to
         HTML
         """
-        return self.value_to_html(
-            cr, uid, record[field_name], column, options=options, context=context)
+        if column._type == 'html':
+            trans_name = ('%s,%s')%(record._table_name,field_name)
+            value = self.translate_html(cr, uid, trans_name, record.id, record[field_name],context)
+            return self.value_to_html(
+                cr, uid, value, column, options=options, context=context)
+        else:
+            return self.value_to_html(
+                cr, uid, record[field_name], column, options=options, context=context)
 
     def to_html(self, cr, uid, field_name, record, options,
                 source_element, t_att, g_att, qweb_context, context=None):