[MERGE] forward port branch saas-12.5 up to 197474e5b9a

1 files changed, 11 insertions, 1 deletions

diff --git a/addons/website/tools.py b/addons/website/tools.py
index e3bb897ec52..e7058d65541 100644
--- a/addons/website/tools.py
+++ b/addons/website/tools.py
@@ -84,14 +84,24 @@ class MockRequest(object):
         app.get_db_router = app.bind = app.match = app
         if not kw.get('routing', True):
             app.match = werkzeugRaiseNotFound
+
+        lang = kw.get('lang')
+        if not lang:
+            lang_code = kw.get('context', {}).get('lang', env.context.get('lang', 'en_US'))
+            lang = env['res.lang']._lang_get(lang_code)
+
+        context = kw.get('context', {})
+        context.setdefault('lang', lang_code)
+
         self.request = DotDict({
-            'context': kw.get('context', {}),
+            'context': context,
             'db': None,
             'env': env,
             'httprequest': {
                 'path': '/hello/',
                 'app': app,
             },
+            'lang': lang,
             'redirect': werkzeug.utils.redirect,
             'session': {
                 'geoip': {