diff --git a/web_translate_dialog/README.rst b/web_translate_dialog/README.rst index fc22f71a9..591fd52cb 100644 --- a/web_translate_dialog/README.rst +++ b/web_translate_dialog/README.rst @@ -80,6 +80,7 @@ Contributors * Serpent Consulting Services Pvt. Ltd. * Timon Tschanz * Akim Juillerat +* Forma Shah Maintainers ~~~~~~~~~~~ diff --git a/web_translate_dialog/__manifest__.py b/web_translate_dialog/__manifest__.py index 6d5ca9986..0982cb948 100644 --- a/web_translate_dialog/__manifest__.py +++ b/web_translate_dialog/__manifest__.py @@ -8,7 +8,7 @@ "version": "13.0.1.0.0", "category": "Web", "website": "https://github.com/OCA/web", - "author": "Camptocamp, " "Tecnativa, " "Odoo Community Association (OCA)", + "author": "Camptocamp, Tecnativa, Odoo Community Association (OCA)", "license": "AGPL-3", "application": False, "installable": True, diff --git a/web_translate_dialog/models/base.py b/web_translate_dialog/models/base.py index e10bd3f3d..6c45e3670 100644 --- a/web_translate_dialog/models/base.py +++ b/web_translate_dialog/models/base.py @@ -1,13 +1,12 @@ # Copyright 2019 Camptocamp SA # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) -from odoo import api, models +from odoo import models class BaseModel(models.BaseModel): _inherit = "base" - @api.multi def get_field_translations(self, field_names): """Get only the existing translations for specified field diff --git a/web_translate_dialog/readme/CONTRIBUTORS.rst b/web_translate_dialog/readme/CONTRIBUTORS.rst index fcd53c4e7..f054626ef 100644 --- a/web_translate_dialog/readme/CONTRIBUTORS.rst +++ b/web_translate_dialog/readme/CONTRIBUTORS.rst @@ -3,3 +3,4 @@ * Serpent Consulting Services Pvt. Ltd. * Timon Tschanz * Akim Juillerat +* Foram Shah 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 533dcc5f0..4cf9361fd 100644 --- a/web_translate_dialog/static/src/js/web_translate_dialog.js +++ b/web_translate_dialog/static/src/js/web_translate_dialog.js @@ -39,12 +39,9 @@ odoo.define("web_translate_dialog.translate_dialog", function(require) { this.single_field = single_field; this.languages = null; this.languages_loaded = $.Deferred(); - this.lang_data = new data.DataSetSearch( - this, - "res.lang", - parent.searchView.dataset.get_context(), - [["translatable", "=", "1"]] - ); + this.lang_data = new data.DataSetSearch(this, "res.lang", parent.context, [ + ["active", "=", "1"], + ]); this.lang_data.set_sort(["tr_sequence asc", "id asc"]); this.lang_data.read_slice(["code", "name"]).then(this.on_languages_loaded); }, @@ -206,7 +203,7 @@ odoo.define("web_translate_dialog.translate_dialog", function(require) { kwargs: { field_names: this.translatable_fields, }, - }).done(function(res) { + }).then(function(res) { if (res[self.res_id]) { _.each(res[self.res_id], function(translation, lang) { self.set_fields_values(lang, translation); @@ -234,7 +231,7 @@ odoo.define("web_translate_dialog.translate_dialog", function(require) { }); _.each(translations, function(text, code) { save_mutex.exec(function() { - var done = new $.Deferred(); // Holds the mutex + var done = new $.Deferred(); var context = new Context(session.user_context, {lang: code}); rpc.query({ diff --git a/web_translate_dialog/static/src/xml/base.xml b/web_translate_dialog/static/src/xml/base.xml index b8d7b9d2e..1e2797ab4 100644 --- a/web_translate_dialog/static/src/xml/base.xml +++ b/web_translate_dialog/static/src/xml/base.xml @@ -31,7 +31,7 @@ res.lang - +