[MERGE] Merge with trunk

bzr revid: jke@openerp.com-20140502123149-4g7d7xh07i5z9dct

40 files changed, 6 insertions, 0 deletions

diff --git a/addons/website/static/src/img/banner/banner_picture.png b/addons/website/static/src/img/banner/banner_picture.png
index 47836637498..df10c6658c5 100644
--- a/addons/website/static/src/img/banner/banner_picture.png
+++ b/addons/website/static/src/img/banner/banner_picture.png
diff --git a/addons/website/static/src/img/bglink.png b/addons/website/static/src/img/bglink.png
index e25f81c8414..c7f1c2c8373 100644
--- a/addons/website/static/src/img/bglink.png
+++ b/addons/website/static/src/img/bglink.png
diff --git a/addons/website/static/src/img/big_picture.png b/addons/website/static/src/img/big_picture.png
index 519e713ff7f..befa6839d11 100644
--- a/addons/website/static/src/img/big_picture.png
+++ b/addons/website/static/src/img/big_picture.png
diff --git a/addons/website/static/src/img/blocks/block_banner.png b/addons/website/static/src/img/blocks/block_banner.png
index 305ffb8855b..b9b188d144a 100644
--- a/addons/website/static/src/img/blocks/block_banner.png
+++ b/addons/website/static/src/img/blocks/block_banner.png
diff --git a/addons/website/static/src/img/blocks/block_big_picture.png b/addons/website/static/src/img/blocks/block_big_picture.png
index 8fd913efcdc..633d1e5326d 100644
--- a/addons/website/static/src/img/blocks/block_big_picture.png
+++ b/addons/website/static/src/img/blocks/block_big_picture.png
diff --git a/addons/website/static/src/img/blocks/block_button.png b/addons/website/static/src/img/blocks/block_button.png
index 8daf48ec3bc..69b7d72275b 100644
--- a/addons/website/static/src/img/blocks/block_button.png
+++ b/addons/website/static/src/img/blocks/block_button.png
diff --git a/addons/website/static/src/img/blocks/block_column.png b/addons/website/static/src/img/blocks/block_column.png
index 159cb7c4594..c739ea7cdb9 100644
--- a/addons/website/static/src/img/blocks/block_column.png
+++ b/addons/website/static/src/img/blocks/block_column.png
diff --git a/addons/website/static/src/img/blocks/block_comparison.png b/addons/website/static/src/img/blocks/block_comparison.png
index 610f7658e96..6bfc5fa85dc 100644
--- a/addons/website/static/src/img/blocks/block_comparison.png
+++ b/addons/website/static/src/img/blocks/block_comparison.png
diff --git a/addons/website/static/src/img/blocks/block_faq.png b/addons/website/static/src/img/blocks/block_faq.png
index fe0f819143b..a8106012c53 100644
--- a/addons/website/static/src/img/blocks/block_faq.png
+++ b/addons/website/static/src/img/blocks/block_faq.png
diff --git a/addons/website/static/src/img/blocks/block_features.png b/addons/website/static/src/img/blocks/block_features.png
index b56b1f7ba98..c4d00bd492e 100644
--- a/addons/website/static/src/img/blocks/block_features.png
+++ b/addons/website/static/src/img/blocks/block_features.png
diff --git a/addons/website/static/src/img/blocks/block_image_gallery.png b/addons/website/static/src/img/blocks/block_image_gallery.png
index 2b70ce2557a..0db13b1653a 100644
--- a/addons/website/static/src/img/blocks/block_image_gallery.png
+++ b/addons/website/static/src/img/blocks/block_image_gallery.png
diff --git a/addons/website/static/src/img/blocks/block_image_text.png b/addons/website/static/src/img/blocks/block_image_text.png
index 01bf9861066..ac4c9504781 100644
--- a/addons/website/static/src/img/blocks/block_image_text.png
+++ b/addons/website/static/src/img/blocks/block_image_text.png
diff --git a/addons/website/static/src/img/blocks/block_jumbotron.png b/addons/website/static/src/img/blocks/block_jumbotron.png
index 656f9591998..532de528e7d 100644
--- a/addons/website/static/src/img/blocks/block_jumbotron.png
+++ b/addons/website/static/src/img/blocks/block_jumbotron.png
diff --git a/addons/website/static/src/img/blocks/block_panel.png b/addons/website/static/src/img/blocks/block_panel.png
index c4d66975905..1551672003b 100644
--- a/addons/website/static/src/img/blocks/block_panel.png
+++ b/addons/website/static/src/img/blocks/block_panel.png
diff --git a/addons/website/static/src/img/blocks/block_parallax.png b/addons/website/static/src/img/blocks/block_parallax.png
index 693da297cef..82326ba60b3 100644
--- a/addons/website/static/src/img/blocks/block_parallax.png
+++ b/addons/website/static/src/img/blocks/block_parallax.png
diff --git a/addons/website/static/src/img/blocks/block_portfolio.png b/addons/website/static/src/img/blocks/block_portfolio.png
index 40102160f96..6c75c38afc8 100644
--- a/addons/website/static/src/img/blocks/block_portfolio.png
+++ b/addons/website/static/src/img/blocks/block_portfolio.png
diff --git a/addons/website/static/src/img/blocks/block_quote.png b/addons/website/static/src/img/blocks/block_quote.png
index 8c3d082219b..c2ba69f9c93 100644
--- a/addons/website/static/src/img/blocks/block_quote.png
+++ b/addons/website/static/src/img/blocks/block_quote.png
diff --git a/addons/website/static/src/img/blocks/block_quotes_slider.png b/addons/website/static/src/img/blocks/block_quotes_slider.png
index c52ec7ab17d..fce35ba87e1 100644
--- a/addons/website/static/src/img/blocks/block_quotes_slider.png
+++ b/addons/website/static/src/img/blocks/block_quotes_slider.png
diff --git a/addons/website/static/src/img/blocks/block_references.png b/addons/website/static/src/img/blocks/block_references.png
index c7164d36b7a..d56df83ea08 100644
--- a/addons/website/static/src/img/blocks/block_references.png
+++ b/addons/website/static/src/img/blocks/block_references.png
diff --git a/addons/website/static/src/img/blocks/block_separator.png b/addons/website/static/src/img/blocks/block_separator.png
index 293d83ee398..468d75656e0 100644
--- a/addons/website/static/src/img/blocks/block_separator.png
+++ b/addons/website/static/src/img/blocks/block_separator.png
diff --git a/addons/website/static/src/img/blocks/block_surprise.png b/addons/website/static/src/img/blocks/block_surprise.png
index e01382a5ab1..c7029bf953d 100644
--- a/addons/website/static/src/img/blocks/block_surprise.png
+++ b/addons/website/static/src/img/blocks/block_surprise.png
diff --git a/addons/website/static/src/img/blocks/block_text_block.png b/addons/website/static/src/img/blocks/block_text_block.png
index df2c96de997..b12b7d30575 100644
--- a/addons/website/static/src/img/blocks/block_text_block.png
+++ b/addons/website/static/src/img/blocks/block_text_block.png
diff --git a/addons/website/static/src/img/blocks/block_text_image.png b/addons/website/static/src/img/blocks/block_text_image.png
index 4e275fcc22a..12ec385ae51 100644
--- a/addons/website/static/src/img/blocks/block_text_image.png
+++ b/addons/website/static/src/img/blocks/block_text_image.png
diff --git a/addons/website/static/src/img/blocks/block_three_columns.png b/addons/website/static/src/img/blocks/block_three_columns.png
index 5cc49b3319e..bad01c11644 100644
--- a/addons/website/static/src/img/blocks/block_three_columns.png
+++ b/addons/website/static/src/img/blocks/block_three_columns.png
diff --git a/addons/website/static/src/img/blocks/block_title.png b/addons/website/static/src/img/blocks/block_title.png
index 2e28ea0a068..652c067594e 100644
--- a/addons/website/static/src/img/blocks/block_title.png
+++ b/addons/website/static/src/img/blocks/block_title.png
diff --git a/addons/website/static/src/img/blocks/block_well.png b/addons/website/static/src/img/blocks/block_well.png
index 716fff5e075..a3f85239937 100644
--- a/addons/website/static/src/img/blocks/block_well.png
+++ b/addons/website/static/src/img/blocks/block_well.png
diff --git a/addons/website/static/src/img/blocks/blocks-icons.png b/addons/website/static/src/img/blocks/blocks-icons.png
index 94c82f3f309..f0840c7cef3 100644
--- a/addons/website/static/src/img/blocks/blocks-icons.png
+++ b/addons/website/static/src/img/blocks/blocks-icons.png
diff --git a/addons/website/static/src/img/bootswatch_default_thumbnail.png b/addons/website/static/src/img/bootswatch_default_thumbnail.png
index e8eea0779de..486429a0885 100644
--- a/addons/website/static/src/img/bootswatch_default_thumbnail.png
+++ b/addons/website/static/src/img/bootswatch_default_thumbnail.png
diff --git a/addons/website/static/src/img/content_here.png b/addons/website/static/src/img/content_here.png
index d236e67a7d0..3f35d88d5ce 100644
--- a/addons/website/static/src/img/content_here.png
+++ b/addons/website/static/src/img/content_here.png
diff --git a/addons/website/static/src/img/drag_here.png b/addons/website/static/src/img/drag_here.png
index 0dfeb1bc5da..335c3a571bb 100644
--- a/addons/website/static/src/img/drag_here.png
+++ b/addons/website/static/src/img/drag_here.png
diff --git a/addons/website/static/src/img/edit_here.png b/addons/website/static/src/img/edit_here.png
index b53f56e2ac8..77beff11c7b 100644
--- a/addons/website/static/src/img/edit_here.png
+++ b/addons/website/static/src/img/edit_here.png
diff --git a/addons/website/static/src/img/library/gears.png b/addons/website/static/src/img/library/gears.png
index 1d3c7d85ca0..11ed152a31b 100644
--- a/addons/website/static/src/img/library/gears.png
+++ b/addons/website/static/src/img/library/gears.png
diff --git a/addons/website/static/src/img/library/imac.png b/addons/website/static/src/img/library/imac.png
index 304aefc841a..1c37a08e935 100644
--- a/addons/website/static/src/img/library/imac.png
+++ b/addons/website/static/src/img/library/imac.png
diff --git a/addons/website/static/src/img/library/ipad.png b/addons/website/static/src/img/library/ipad.png
index 21953c9011d..bacae2e6721 100644
--- a/addons/website/static/src/img/library/ipad.png
+++ b/addons/website/static/src/img/library/ipad.png
diff --git a/addons/website/static/src/img/library/vegetables.png b/addons/website/static/src/img/library/vegetables.png
index df2adf46d1c..0cd8e156282 100644
--- a/addons/website/static/src/img/library/vegetables.png
+++ b/addons/website/static/src/img/library/vegetables.png
diff --git a/addons/website/static/src/img/openerp_logo.png b/addons/website/static/src/img/openerp_logo.png
index 285a059cb06..8f64a5d24b3 100644
--- a/addons/website/static/src/img/openerp_logo.png
+++ b/addons/website/static/src/img/openerp_logo.png
diff --git a/addons/website/static/src/img/parallax/quote.png b/addons/website/static/src/img/parallax/quote.png
index 769cb6b5e0f..842d820eb50 100644
--- a/addons/website/static/src/img/parallax/quote.png
+++ b/addons/website/static/src/img/parallax/quote.png
diff --git a/addons/website/static/src/img/text_image.png b/addons/website/static/src/img/text_image.png
index ac02ef230c7..d6038f39a38 100644
--- a/addons/website/static/src/img/text_image.png
+++ b/addons/website/static/src/img/text_image.png
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';