diff --git a/bin/osv/orm.py b/bin/osv/orm.py index fb9381ed0b1..0af78ab1cca 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -1386,6 +1386,12 @@ class orm_template(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').encode('utf8')) + 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('confirm').encode('utf8')) + 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: diff --git a/bin/tools/translate.py b/bin/tools/translate.py index 807de0d2cde..176e2825ea4 100644 --- a/bin/tools/translate.py +++ b/bin/tools/translate.py @@ -166,7 +166,7 @@ class GettextAlias(object): cr = pooler.get_db(dbs[0]).cursor() is_new_cr = True return cr, is_new_cr - + def _get_lang(self, frame): lang = frame.f_locals.get('context', {}).get('lang', False) if not lang: @@ -178,7 +178,7 @@ class GettextAlias(object): c = getattr(s, 'localcontext', {}) lang = c.get('lang', False) return lang - + def __call__(self, source): is_new_cr = False res = source @@ -464,6 +464,8 @@ def trans_parse_view(de): res.append(de.get('string').encode("utf8")) if de.get("sum"): res.append(de.get('sum').encode("utf8")) + if de.get("confirm"): + res.append(de.get('confirm').encode("utf8")) for n in de: res.extend(trans_parse_view(n)) return res