more choices for getting a language out of the qweb context

seb-elico · May 1, 2015 · a12a7fb · a12a7fb
1 parent 3a28f87
commit a12a7fb
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/qweb_usertime/qweb.py b/qweb_usertime/qweb.py
@@ -39,8 +39,12 @@ def render_tag_usertime(self, element, template_attributes,
                             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)]