From a0fb9d83c74c598b76066f6c4062ec2d6302c6ea Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Fri, 21 Aug 2015 16:44:48 +0200 Subject: [PATCH] Revert "[IMP] fields: translated html fields must use xml_translate or a callable" This reverts commit 75140d7ea13fae96709e3e7251a4602c4832597c. --- openerp/fields.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/openerp/fields.py b/openerp/fields.py index 8186ca95fb8..120de08b2fa 100644 --- a/openerp/fields.py +++ b/openerp/fields.py @@ -15,7 +15,7 @@ import xmlrpclib from openerp.tools import float_round, frozendict, html_sanitize, ustr, OrderedSet from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DATE_FORMAT from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT as DATETIME_FORMAT -from openerp.tools.translate import xml_translate +from openerp.exceptions import UserError DATE_LENGTH = len(date.today().strftime(DATE_FORMAT)) DATETIME_LENGTH = len(datetime.now().strftime(DATETIME_FORMAT)) @@ -1227,12 +1227,6 @@ class Html(_String): 'strip_style': False, # whether to strip style attributes } - def _setup_attrs(self, model, name): - super(Html, self)._setup_attrs(model, name) - # Translated html fields must use xml_translate or a callable. - if self.translate and not callable(self.translate): - self.translate = xml_translate - _column_sanitize = property(attrgetter('sanitize')) _related_sanitize = property(attrgetter('sanitize')) _description_sanitize = property(attrgetter('sanitize'))