odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] language selection 

bzr revid: fme@openerp.com-20130904081659-f2vyt3iy9pr6d3yq
This commit is contained in:
Fabien Meghazi 2013-09-04 10:16:59 +02:00
parent 16995938b2
commit dce9cd6583
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/website/website.py
View File

@ -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):

2
addons/website_project/controllers/main.py
View File

@ -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):

2
addons/website_sale/controllers/main.py
View File

@ -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):