From dee93136d1a5d7fa4d95fb3dcba1568377132a02 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 2 Jul 2012 08:35:11 +0200 Subject: [PATCH] [IMP] massage all translatable attributes in a loop instead of copy/pasting a billion versions bzr revid: xmo@openerp.com-20120702063511-o3nrikklzgubkals --- openerp/osv/orm.py | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index face4a815cd..a3e291524a8 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -1754,22 +1754,14 @@ class BaseModel(object): 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('confirm'): - trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('confirm')) - if trans: - node.set('confirm', trans) - if node.get('sum'): - trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('sum')) - if trans: - node.set('sum', trans) - if node.get('help'): - trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('help')) - if trans: - node.set('help', trans) - if node.get('placeholder'): - trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('placeholder')) - if trans: - node.set('placeholder', trans) + + for translatable in ('confirm', 'sum', 'help', 'placeholder'): + attr = node.get(translatable) + if attr: + translation = self.pool['ir.translation']._get_source( + cr, user, self._name, view, context['lang'], attr) + if translation: + node.set(translatable, attr) for f in node: if children or (node.tag == 'field' and f.tag in ('filter','separator')):