summaryrefslogtreecommitdiff
path: root/addons/website/static/src/js/menu
diff options
context:
space:
mode:
authorRomain Derie <rde@odoo.com>2019-03-26 05:56:55 +0000
committerRomain Derie <rde@odoo.com>2019-08-26 16:35:19 +0000
commit269aa594111a152ad4b7714856ea745bfef57155 (patch)
treed5f8f7e86209102d831b2e222038d45bd7fe7626 /addons/website/static/src/js/menu
parentf10f120de3017bc8d0e9a5ac72eeec1280374a1d (diff)
[IMP] http_routing, website: allow to customize the lang in URL
With this commit it is now possible to change the lang displayed in the URL. Eg, you could use `/fr` instead of `/fr_BE`, or even a fancier `/french`. Task-32838 Courtesy of pla@odoo.com closes odoo/odoo#35135 Signed-off-by: Romain Derie (rde) <rde@odoo.com>
Diffstat (limited to 'addons/website/static/src/js/menu')
-rw-r--r--addons/website/static/src/js/menu/seo.js4
-rw-r--r--addons/website/static/src/js/menu/translate.js7
2 files changed, 3 insertions, 8 deletions
diff --git a/addons/website/static/src/js/menu/seo.js b/addons/website/static/src/js/menu/seo.js
index 3844a1d4731..2ac6d7fcded 100644
--- a/addons/website/static/src/js/menu/seo.js
+++ b/addons/website/static/src/js/menu/seo.js
@@ -497,9 +497,7 @@ var MetaKeywords = Widget.extend({
},
});
this._rpc({
- model: 'website',
- method: 'get_languages',
- args: [[context.website_id]],
+ route: '/website/get_languages',
}).then(function (data) {
self.$('#language-box').html(core.qweb.render('Configurator.language_promote', {
'language': data,
diff --git a/addons/website/static/src/js/menu/translate.js b/addons/website/static/src/js/menu/translate.js
index 043a900fff6..cab37bf3473 100644
--- a/addons/website/static/src/js/menu/translate.js
+++ b/addons/website/static/src/js/menu/translate.js
@@ -46,14 +46,11 @@ var TranslatePageMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({
* @returns {Promise}
*/
_goToMasterPage: function () {
- var lang = '/' + utils.get_cookie('frontend_lang');
-
var current = document.createElement('a');
current.href = window.location.toString();
current.search += (current.search ? '&' : '?') + 'enable_editor=1';
- if (current.pathname.indexOf(lang) === 0) {
- current.pathname = current.pathname.replace(lang, '');
- }
+ // we are in translate mode, the pathname starts with '/<url_code/'
+ current.pathname = current.pathname.substr(current.pathname.indexOf('/', 1));
var link = document.createElement('a');
link.href = '/website/lang/default';