diff --git a/web_translate_dialog/models/base.py b/web_translate_dialog/models/base.py index d447b707e..adf0f9755 100644 --- a/web_translate_dialog/models/base.py +++ b/web_translate_dialog/models/base.py @@ -23,11 +23,10 @@ class BaseModel(models.BaseModel): for rec_id, values in res.items(): tr_read_res = self.env['ir.translation'].search_read([ ('name', '=', '%s,%s' % (self._name, field_name)), - ('res_id', '=', rec_id) + ('res_id', '=', rec_id), + ('lang', '!=', 'en_US') ]) for tr_res in tr_read_res: - if tr_res.get('lang') == 'en_US': - continue values[tr_res.get('lang')] = ( tr_res.get('id'), tr_res.get('value') ) diff --git a/web_translate_dialog/static/src/js/web_translate_dialog.js b/web_translate_dialog/static/src/js/web_translate_dialog.js index eaa534c97..5cada4754 100644 --- a/web_translate_dialog/static/src/js/web_translate_dialog.js +++ b/web_translate_dialog/static/src/js/web_translate_dialog.js @@ -20,7 +20,7 @@ var _t = core._t; var QWeb = core.qweb; var Mutex = concurrency.Mutex; -var translateDialog = Dialog.extend({ +var TranslateDialog = Dialog.extend({ template: "TranslateDialog", init: function(parent, options) { var title_string = _t("Translate field: /") @@ -134,8 +134,8 @@ var translateDialog = Dialog.extend({ this.$('.oe_translation_field').val('').removeClass('touched'); - var deff = $.Deferred(); - deferred.push(deff); + var def = $.Deferred(); + deferred.push(def); rpc.query({ model: this.view.modelName, method: 'get_field_translations', @@ -151,8 +151,8 @@ var translateDialog = Dialog.extend({ _.each(res[self.res_id], function(translation, lang) { self.set_fields_values(lang, translation[1]); }); - self.resize_textareas() - deff.resolve(); + self.resize_textareas(); + def.resolve(); } }); @@ -224,7 +224,7 @@ FormView.include({ BasicController.include({ open_translate_dialog: function(field, res_id) { - new translateDialog(this, {'field': field, 'res_id': res_id}).open(); + new TranslateDialog(this, {'field': field, 'res_id': res_id}).open(); }, _onTranslate: function(event) { @@ -235,7 +235,7 @@ BasicController.include({ }); return { - translateDialog: translateDialog, + TranslateDialog: TranslateDialog, }; }); diff --git a/web_translate_dialog/static/src/xml/base.xml b/web_translate_dialog/static/src/xml/base.xml index 02409f6af..16668e78b 100644 --- a/web_translate_dialog/static/src/xml/base.xml +++ b/web_translate_dialog/static/src/xml/base.xml @@ -4,43 +4,43 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->