From 78b92eace8c0a5b4f2f3276dd186e62e0bc87bf8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 17 Dec 2012 11:01:27 +0100
Subject: [PATCH] [FIX] Defaults user's context.lang to 'en_US'

bzr revid: fme@openerp.com-20121217100127-i7hr6klay251jo39
---
 addons/web/http.py    | 2 +-
 addons/web/session.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 3a3ce9aeed9..25cbecc56fc 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -103,7 +103,7 @@ class WebRequest(object):
             lang = self.httprequest.cookies.get('lang')
         if lang is None:
             lang = self.httprequest.accept_languages.best
-        if lang is None:
+        if not lang:
             lang = 'en_US'
         # tranform 2 letters lang like 'en' into 5 letters like 'en_US'
         lang = babel.core.LOCALE_ALIASES.get(lang, lang)
diff --git a/addons/web/session.py b/addons/web/session.py
index 65e3beab84a..54ccac79578 100644
--- a/addons/web/session.py
+++ b/addons/web/session.py
@@ -186,6 +186,6 @@ class OpenERPSession(object):
         if lang in babel.core.LOCALE_ALIASES:
             lang = babel.core.LOCALE_ALIASES[lang]
 
-        context['lang'] = lang
+        context['lang'] = lang or 'en_US'
 
 # vim:et:ts=4:sw=4: