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,
}; };
}); });

74
web_translate_dialog/static/src/xml/base.xml
View File

@ -4,43 +4,43 @@
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
<template> <template>
<t t-name="TranslateDialog"> <t t-name="TranslateDialog">
<div class="modal-body"> <div class="modal-body">
<table t-if="widget.translatable_field" <table t-if="widget.translatable_field"
class="oe_frame oe_forms oe_translation_form" class="oe_frame oe_forms oe_translation_form"
border="0" cellpadding="0" cellspacing="0" width="100%"> border="0" cellpadding="0" cellspacing="0" width="100%">
<tr> <tr>
<th t-foreach="widget.languages" align="left"> <th t-foreach="widget.languages" align="left">
<div class="separator horizontal"><t t-esc="name"/></div> <div class="separator horizontal"><t t-esc="name"/></div>
</th> </th>
</tr> </tr>
<t t-value="widget.translatable_field" t-set="field_name" /> <t t-value="widget.translatable_field" t-set="field_name" />
<t t-set="field" t-value="widget.view.searchView.fields[field_name]" /> <t t-set="field" t-value="widget.view.searchView.fields[field_name]" />
<tr t-att-data-field="field_name"> <tr t-att-data-field="field_name">
<td t-foreach="widget.languages" t-as="lg" class="oe_form_frame_cell"> <td t-foreach="widget.languages" t-as="lg" class="oe_form_frame_cell">
<input t-if="['char','url'].indexOf(field.type) !== -1" <input t-if="['char','url'].indexOf(field.type) !== -1"
type="text" t-attf-name="#{lg.code}-#{field_name}" type="text" t-attf-name="#{lg.code}-#{field_name}"
value="" data-value="" class="oe_translation_field"/> value="" data-value="" class="oe_translation_field"/>
<textarea t-elif="field.type == 'text'" <textarea t-elif="field.type == 'text'"
t-attf-name="#{lg.code}-#{field_name}" data-value="" t-attf-name="#{lg.code}-#{field_name}" data-value=""
class="oe_translation_field" /> class="oe_translation_field" />
<div t-elif="field.type == 'html'" class="oe_form_field_html"> <div t-elif="field.type == 'html'" class="oe_form_field_html">
<textarea class="oe_translation_field oe_form_field" <textarea class="oe_translation_field oe_form_field"
t-attf-name="#{lg.code}-#{field_name}" data-value=""/> t-attf-name="#{lg.code}-#{field_name}" data-value=""/>
</div> </div>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
</t> </t>
<t t-name="TranslateDialog.buttons"> <t t-name="TranslateDialog.buttons">
<button class="btn btn-sm oe_button btn-primary oe_form_translate_dialog_save_button"> <button class="btn btn-sm oe_button btn-primary oe_form_translate_dialog_save_button">
<span>Save</span> <span>Save</span>
</button> </button>
<button class="btn btn-sm oe_button btn-default oe_form_translate_dialog_cancel_button"> <button class="btn btn-sm oe_button btn-default oe_form_translate_dialog_cancel_button">
<span>Cancel</span> <span>Cancel</span>
</button> </button>
</t> </t>
</template> </template>