summaryrefslogtreecommitdiff
path: root/addons/website/static
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2014-04-25 14:49:13 +0200
committerFabien Meghazi <fme@openerp.com>2014-04-25 14:49:13 +0200
commiteae846f2c8f3ec9a84b38dcfe75b61b3107e438e (patch)
treea6102b5bb7096ff3e1160daa12cd659bbaf005a7 /addons/website/static
parent4f16d15120237c992ddd12ed69645798ca3157fd (diff)
[FIX] remove @translatable conditions and de-activate group_website_designer specifics
Bundlification (and later merge of editor and web client) can't work with conditional script inclusion bzr revid: fme@openerp.com-20140425124913-9jsfhbfhoq6j6xxl
Diffstat (limited to 'addons/website/static')
-rw-r--r--addons/website/static/src/js/website.js1
-rw-r--r--addons/website/static/src/js/website.translator.js5
2 files changed, 6 insertions, 0 deletions
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 31e39b3bbc4..b6f42c8b20e 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -3,6 +3,7 @@
var website = {};
openerp.website = website;
+ openerp.website.translatable = !!$('html').data('translatable');
/* ----------------------------------------------------
Helpers
diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js
index e88b1e4a6b6..5f0921abb3d 100644
--- a/addons/website/static/src/js/website.translator.js
+++ b/addons/website/static/src/js/website.translator.js
@@ -1,6 +1,11 @@
(function () {
'use strict';
+ if (!openerp.website.translatable) {
+ // Temporary hack until the editor bar is moved to the web client
+ return;
+ }
+
var website = openerp.website;
website.add_template_file('/website/static/src/xml/website.translator.xml');
var nodialog = 'website_translator_nodialog';