diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js index 77d0e30dd70..511a093489f 100644 --- a/addons/website/static/src/js/website.ace.js +++ b/addons/website/static/src/js/website.ace.js @@ -99,7 +99,7 @@ openerp.jsonRpc('/web/dataset/call', 'call', { model: 'ir.ui.view', method: 'read', - args: [[this.selectedViewId()], ['arch']], + args: [[this.selectedViewId()], ['arch'], website.get_context()], }).then(function(result) { if (result && result.length > 0) { var xml = new website.ace.XmlDocument(result[0].arch) @@ -123,7 +123,7 @@ openerp.jsonRpc('/web/dataset/call', 'call', { model: 'ir.ui.view', method: 'write', - args: [[this.selectedViewId()], { 'arch': xml.xml }], + args: [[this.selectedViewId()], { 'arch': xml.xml }, website.get_context()], }).then(function(result) { self.reloadPage(); }).fail(function (error) { diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 4d6ec2520fd..58d25143b5c 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -264,7 +264,7 @@ return openerp.jsonRpc('/web/dataset/call', 'call', { model: 'ir.ui.view', method: 'save', - args: [data.oeModel, data.oeId, data.oeField, html, xpath] + args: [data.oeModel, data.oeId, data.oeField, html, xpath, website.get_context()] }); }, cancel: function () { @@ -549,7 +549,9 @@ model: 'website', method: 'list_pages', args: [], - kwargs: {} + kwargs: { + context: website.get_context() + }, }); }, fill_pages: function (results) { @@ -653,6 +655,7 @@ fields: ['name'], domain: [['res_model', '=', 'ir.ui.view']], order: 'name', + context: website.get_context(), } }); }, diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index 00ee14aac00..395b1f54a09 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -9,6 +9,12 @@ '/website/static/src/xml/website.xml' ]; + website.get_context = function (dict) { + return _.extend({ + lang: $('html').attr('lang').replace('-', '_') + }, dict); + }; + /* ----- TEMPLATE LOADING ---- */ website.add_template = function(template) { templates.push(template); diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml index bfe81c8b44f..3a1104e586c 100644 --- a/addons/website/views/views.xml +++ b/addons/website/views/views.xml @@ -13,7 +13,9 @@