Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

address comments

pull/1801/head
Timon Tschanz 2019-09-30 10:30:59 +02:00 committed by fshah
parent 61e3767b2d
commit b21e9687ce
3 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web_translate_dialog/models/base.py
View File

@ -23,11 +23,10 @@ class BaseModel(models.BaseModel):
for rec_id, values in res.items(): for rec_id, values in res.items():
tr_read_res = self.env['ir.translation'].search_read([ tr_read_res = self.env['ir.translation'].search_read([
('name', '=', '%s,%s' % (self._name, field_name)), ('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: for tr_res in tr_read_res:
if tr_res.get('lang') == 'en_US':
continue
values[tr_res.get('lang')] = ( values[tr_res.get('lang')] = (
tr_res.get('id'), tr_res.get('value') tr_res.get('id'), tr_res.get('value')
) )

14
web_translate_dialog/static/src/js/web_translate_dialog.js
View File

@ -20,7 +20,7 @@ var _t = core._t;
var QWeb = core.qweb; var QWeb = core.qweb;
var Mutex = concurrency.Mutex; var Mutex = concurrency.Mutex;
var translateDialog = Dialog.extend({ var TranslateDialog = Dialog.extend({
template: "TranslateDialog", template: "TranslateDialog",
init: function(parent, options) { init: function(parent, options) {
var title_string = _t("Translate field: /") var title_string = _t("Translate field: /")
@ -134,8 +134,8 @@ var translateDialog = Dialog.extend({
this.$('.oe_translation_field').val('').removeClass('touched'); this.$('.oe_translation_field').val('').removeClass('touched');
var deff = $.Deferred(); var def = $.Deferred();
deferred.push(deff); deferred.push(def);
rpc.query({ rpc.query({
model: this.view.modelName, model: this.view.modelName,
method: 'get_field_translations', method: 'get_field_translations',
@ -151,8 +151,8 @@ var translateDialog = Dialog.extend({
_.each(res[self.res_id], function(translation, lang) { _.each(res[self.res_id], function(translation, lang) {
self.set_fields_values(lang, translation[1]); self.set_fields_values(lang, translation[1]);
}); });
self.resize_textareas() self.resize_textareas();
deff.resolve(); def.resolve();
} }
}); });
@ -224,7 +224,7 @@ FormView.include({
BasicController.include({ BasicController.include({
open_translate_dialog: function(field, res_id) { 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) { _onTranslate: function(event) {
@ -235,7 +235,7 @@ BasicController.include({
}); });
return { return {
translateDialog: translateDialog, TranslateDialog: TranslateDialog,
}; };
}); });