summaryrefslogtreecommitdiff
path: root/addons/website/static/src/js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2015-05-21 14:50:39 +0200
committerChristophe Simonis <chs@odoo.com>2015-05-21 14:50:39 +0200
commit14a7d52307fe30443e8f08a262d46f6d2f804bc1 (patch)
treeb8183ae7549206f27bac51d9f2eaaa5ce3e4a818 /addons/website/static/src/js
parent5cff8fbb7c70a372cb5116c2fb98fd622c4d4358 (diff)
parent327e471c9b5d30317b69396b0f0932ff445e3694 (diff)
[MERGE] forward port of branch 8.0 up to 327e471
Diffstat (limited to 'addons/website/static/src/js')
-rw-r--r--addons/website/static/src/js/website.translator.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js
index 12f6a1397f8..64683f7001f 100644
--- a/addons/website/static/src/js/website.translator.js
+++ b/addons/website/static/src/js/website.translator.js
@@ -60,9 +60,11 @@
ev.preventDefault();
var link = $('.js_language_selector a[data-default-lang]')[0];
if (link) {
- link.pathname = $(link).data('lang') + link.pathname;
link.search += (link.search ? '&' : '?') + 'enable_editor=1';
- window.location = link.attributes.href.value;
+ var url = link.pathname + link.search + window.location.hash;
+ link.pathname = '/website/lang/default';
+ link.search = '?' + $.param({r: url});
+ window.location = link.href;
}
},
translate: function () {