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