odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] translate: lang detection fallback actually falls back 

For instance, when a context was passed to a method, but no lang was defined in the context, it did not tried to fallback to other places where we could have find the user language.
This commit is contained in:
Denis Ledoux 2014-11-27 17:18:46 +01:00
parent de27e19794
commit 1cbf48417e
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
openerp/tools/translate.py
View File

@ -195,26 +195,31 @@ class GettextAlias(object):
def _get_lang(self, frame):
# try, in order: context.get('lang'), kwargs['context'].get('lang'),
# self.env.lang, self.localcontext.get('lang')
if 'context' in frame.f_locals:
return frame.f_locals['context'].get('lang')
kwargs = frame.f_locals.get('kwargs', {})
if 'context' in kwargs:
return kwargs['context'].get('lang')
s = frame.f_locals.get('self')
if hasattr(s, 'env'):
return s.env.lang
if hasattr(s, 'localcontext'):
return s.localcontext.get('lang')
# Last resort: attempt to guess the language of the user
# Pitfall: some operations are performed in sudo mode, and we
# don't know the originial uid, so the language may
# be wrong when the admin language differs.
pool = getattr(s, 'pool', None)
(cr, dummy) = self._get_cr(frame, allow_create=False)
uid = self._get_uid(frame)
if pool and cr and uid:
return pool['res.users'].context_get(cr, uid)['lang']
return None
lang = None
if frame.f_locals.get('context'):
lang = frame.f_locals['context'].get('lang')
if not lang:
kwargs = frame.f_locals.get('kwargs', {})
if kwargs.get('context'):
lang = kwargs['context'].get('lang')
if not lang:
s = frame.f_locals.get('self')
if hasattr(s, 'env'):
lang = s.env.lang
if not lang:
if hasattr(s, 'localcontext'):
lang = s.localcontext.get('lang')
if not lang:
# Last resort: attempt to guess the language of the user
# Pitfall: some operations are performed in sudo mode, and we
# don't know the originial uid, so the language may
# be wrong when the admin language differs.
pool = getattr(s, 'pool', None)
(cr, dummy) = self._get_cr(frame, allow_create=False)
uid = self._get_uid(frame)
if pool and cr and uid:
lang = pool['res.users'].context_get(cr, uid)['lang']
return lang
def __call__(self, source):
res = source