Merge lp:~savoirfairelinux-openerp/openobject-server/translate_warnings_1297525-trunk into lp:openobject-server

[Sandy Carter (http://www.savoirfairelinux.com)]

When searching a frame for context, the _() call looks for self.localcontext but misses self.context.
The integration of this patch allows for web warnings (such as except_orm) to be translated by _()

[lp:~savoirfairelinux-openerp/openobject-server/translate_warnings_1297525-trunk]

5151. By El Hadji Dem (http://www.savoirfairelinux.com) on 2014-04-06

[FIX] Fixed instance of ValidateError not being translated

Unmerged revisions

5151. By El Hadji Dem (http://www.savoirfairelinux.com) on 2014-04-06

[FIX] Fixed instance of ValidateError not being translated

5150. By Sandy Carter (http://www.savoirfairelinux.com) on 2014-03-25

Also look for context in self

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2014-04-01 10:08:19 +0000
+++ openerp/osv/orm.py	2014-04-06 00:17:16 +0000
@@ -1576,7 +1576,7 @@
                 )
                 self._invalids.update(fields)
         if error_msgs:
-            raise except_orm('ValidateError', '\n'.join(error_msgs))
+            raise except_orm(_('ValidateError'), '\n'.join(error_msgs))
         else:
             self._invalids.clear()
 
 
=== modified file 'openerp/tools/translate.py'
--- openerp/tools/translate.py	2014-03-20 09:01:05 +0000
+++ openerp/tools/translate.py	2014-04-06 00:17:16 +0000
@@ -196,7 +196,7 @@
             lang = ctx.get('lang')
         s = frame.f_locals.get('self', {})
         if not lang:
-            c = getattr(s, 'localcontext', None)
+            c = getattr(s, 'localcontext', None) or getattr(s, 'context', None)
             if c:
                 lang = c.get('lang')
         if not lang: