From d5aa22ea5fb6821fd6eb8aaa0dd6c957f0d49fe3 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 18 May 2015 19:24:19 +0200
Subject: [PATCH] [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.
---
 addons/website/static/src/js/website.translator.js | 6 ++++--
 addons/website_report/views/layouts.xml            | 1 +
 2 files changed, 5 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 () {
diff --git a/addons/website_report/views/layouts.xml b/addons/website_report/views/layouts.xml
index c1cc3b49365..c40d5c8f62a 100644
--- a/addons/website_report/views/layouts.xml
+++ b/addons/website_report/views/layouts.xml
@@ -23,6 +23,7 @@
         <ul class="list-inline js_language_selector mt16" t-if="(request and request.website_multilang and len(languages) &gt; 1) or (website and editable)">
             <li t-foreach="languages" t-as="lg">
                 <a t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=lg[0])"
+                   t-att-data-lang="lg[0]"
                    t-att-data-default-lang="editable and 'true' if website and lg[0] == website.default_lang_code else None">
                     <t t-esc="lg[1].split('/').pop()"/>
                 </a>