diff options
| author | Olivier Dony <odo@openerp.com> | 2015-05-18 19:24:19 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2015-05-18 19:34:11 +0200 |
| commit | d5aa22ea5fb6821fd6eb8aaa0dd6c957f0d49fe3 (patch) | |
| tree | 51c998b19a729a00330457855b77cde456752834 /addons/website/static/src/js/website.translator.js | |
| parent | 235cd2d015980265dbf8de5cff7caa50d1ce543b (diff) | |
[FIX] website, website_report: backwards compatibility with outdated templates
* Complements commits a696913364ffc4d5f1ce0675bc9be82f84f3ff93 and
21d4b3fda9dd1ba480ee407f62c83375cfe1d8ef by adding the missing `data-lang`
attribute also in the report layout (in saas-6 a single QWeb
template is used for language links in both reports and website
layouts).
* Fix the "Edit Master" link to work also for outdated templates
where the data-lang attribute is dynamically set to 'default',
and thus cannot be used as URL prefix -> use /website/lang
controller to switch lang instead.
Diffstat (limited to 'addons/website/static/src/js/website.translator.js')
| -rw-r--r-- | addons/website/static/src/js/website.translator.js | 6 |
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 d5cbbf6668d..bea3406a40f 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 () { |