[MERGE] forward port of branch saas-9 up to 4d337f7

2 files changed, 3 insertions, 3 deletions

diff --git a/addons/web_editor/static/src/js/rte.js b/addons/web_editor/static/src/js/rte.js
index bbd5e6616aa..8fc84008693 100644
--- a/addons/web_editor/static/src/js/rte.js
+++ b/addons/web_editor/static/src/js/rte.js
@@ -205,7 +205,7 @@ var history = new History();
 $.extend($.expr[':'],{
     o_editable: function (node,i,m) {
         while (node) {
-            if (node.className) {
+            if (node.className && _.isString(node.className)) {
                 if (node.className.indexOf('o_not_editable')!==-1 ) {
                     return false;
                 }
diff --git a/addons/web_editor/static/src/js/translator.js b/addons/web_editor/static/src/js/translator.js
index 3155277d1e3..ead8ea8271c 100644
--- a/addons/web_editor/static/src/js/translator.js
+++ b/addons/web_editor/static/src/js/translator.js
@@ -47,10 +47,10 @@ var RTE_Translate = rte.Class.extend({
 
             return ajax.jsonRpc('/web/dataset/call', 'call', {
                 model: 'ir.translation',
-                method: 'write',
+                method: 'save_html',
                 args: [
                     [+$el.data('oe-translation-id')],
-                    {'value': translation_content, 'state': 'translated'},
+                    translation_content,
                     context || base.get_context()
                 ],
             });