From dce9cd65836f966f8d41d8c19ae158240202a4a3 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 4 Sep 2013 10:16:59 +0200 Subject: [PATCH] [FIX] language selection bzr revid: fme@openerp.com-20130904081659-f2vyt3iy9pr6d3yq --- addons/website/website.py | 4 ++-- addons/website_project/controllers/main.py | 2 +- addons/website_sale/controllers/main.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/website/website.py b/addons/website/website.py index 839a1baa1d7..0c6f540c986 100644 --- a/addons/website/website.py +++ b/addons/website/website.py @@ -83,7 +83,7 @@ class website(osv.osv): languages = lang_obj.search_read( request.cr, openerp.SUPERUSER_ID, [('website_activated', '=', True)], fields ) - activated = [lg['code'] for lg in languages] + activated = [lg['code'].lower() for lg in languages] default = [lg['code'] for lg in languages if lg['website_default']] default = default[0] if default else None @@ -103,7 +103,7 @@ class website(osv.osv): return { 'lang_list': languages, 'lang_default': default, - 'lang_selected': (lg for lg in languages if lg['code'] == lang).next(), + 'lang_selected': (lg for lg in languages if lg['code'].lower() == lang).next(), } def get_rendering_context(self, additional_values=None, lang=None): diff --git a/addons/website_project/controllers/main.py b/addons/website_project/controllers/main.py index 5831bfadf31..a279f010dfd 100644 --- a/addons/website_project/controllers/main.py +++ b/addons/website_project/controllers/main.py @@ -15,7 +15,7 @@ class website(osv.osv): } if additional_values: values.update(additional_values) - return super(website, self).get_rendering_context(values) + return super(website, self).get_rendering_context(values, **kw) class website_project(http.Controller): diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py index f03ad5459b9..1a6341a6bb7 100644 --- a/addons/website_sale/controllers/main.py +++ b/addons/website_sale/controllers/main.py @@ -49,7 +49,7 @@ class website(osv.osv): } if additional_values: values.update(additional_values) - return super(website, self).get_rendering_context(values) + return super(website, self).get_rendering_context(values, **kw) class Ecommerce(http.Controller):