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

[FIX] website: pass `lang` to js and css bundle controllers 

bzr revid: fme@openerp.com-20140422135022-u9p7zofv5sbeqo30
This commit is contained in:
Fabien Meghazi 2014-04-22 15:50:22 +02:00
parent c117c3e10f
commit 7f29d7e371
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/website/controllers/main.py
View File

@ -48,6 +48,16 @@ class Website(openerp.addons.web.controllers.main.Home):
# TODO: can't we just put auth=public, ... in web client ?
return super(Website, self).web_login(*args, **kw)
@http.route(website=True, auth="public")
def js_bundle(self, xmlid, **kw):
request.context['lang'] = kw.get('lang', request.context.get('lang'))
return super(Website, self).js_bundle(xmlid, **kw)
@http.route(website=True, auth='public')
def css_bundle(self, xmlid, **kw):
request.context['lang'] = kw.get('lang', request.context.get('lang'))
return super(Website, self).css_bundle(xmlid, **kw)
@http.route('/page/<page:page>', type='http', auth="public", website=True, multilang=True)
def page(self, page, **opt):
values = {

4
addons/website/models/ir_qweb.py
View File

@ -59,6 +59,10 @@ class QWeb(orm.AbstractModel):
val = qwebcontext.get('url_for')(val)
return att, val
def render_tag_call_assets(self, element, template_attributes, generated_attributes, qwebcontext):
qwebcontext['assets_query'] = dict(lang=qwebcontext['lang'])
return super(QWeb, self).render_tag_call_assets(element, template_attributes, generated_attributes, qwebcontext)
def get_converter_for(self, field_type):
return self.pool.get(
'website.qweb.field.' + field_type,