From a12a7fb01e1bbfe44bf58daafb63faf8d068c38b Mon Sep 17 00:00:00 2001 From: Vincent Vinet Date: Fri, 1 May 2015 15:42:51 -0400 Subject: [PATCH] more choices for getting a language out of the qweb context --- qweb_usertime/qweb.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qweb_usertime/qweb.py b/qweb_usertime/qweb.py index ba7d6a8df..1d257675e 100644 --- a/qweb_usertime/qweb.py +++ b/qweb_usertime/qweb.py @@ -39,8 +39,12 @@ class QWeb(models.Model): generated_attributes, qwebcontext): tformat = template_attributes['usertime'] if not tformat: - # No format, use default time and date formats from user lang - lang = qwebcontext['user'].lang + # No format, use default time and date formats from qwebcontext + lang = ( + qwebcontext['env'].lang or + qwebcontext['env'].context['lang'] or + qwebcontext['user'].lang + ) if lang: lang = qwebcontext['env']['res.lang'].search( [('code', '=', lang)]