From ba9ac3fd558f39f3afa1a57547160fbe66fcf43b Mon Sep 17 00:00:00 2001 From: Jakkrich Changgon Date: Tue, 26 Mar 2019 17:01:53 +0700 Subject: [PATCH 01/16] =?UTF-8?q?=E0=B9=80=E0=B8=A1=E0=B8=B7=E0=B9=88?= =?UTF-8?q?=E0=B8=AD=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9F=E0=B8=B4?= =?UTF-8?q?=E0=B8=A7=20name=20=E0=B8=96=E0=B9=89=E0=B8=B2=20=E0=B8=95?= =?UTF-8?q?=E0=B8=A3=E0=B8=A7=E0=B8=88=E0=B8=AD=E0=B8=B1=E0=B8=81=E0=B8=82?= =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=A0=E0=B8=B2=E0=B8=A9=E0=B8=B2=E0=B9=84?= =?UTF-8?q?=E0=B8=97=E0=B8=A2=20=E0=B8=97=E0=B8=B1=E0=B9=89=E0=B8=87?= =?UTF-8?q?=E0=B8=AA=E0=B8=AD=E0=B8=87=E0=B8=A0=E0=B8=B2=E0=B8=A9=E0=B8=B2?= =?UTF-8?q?=20=E0=B8=96=E0=B9=89=E0=B8=B2=E0=B9=80=E0=B8=9B=E0=B9=87?= =?UTF-8?q?=E0=B8=99=E0=B8=AD=E0=B8=B1=E0=B8=81=E0=B8=82=E0=B8=A3=E0=B8=B0?= =?UTF-8?q?=E0=B9=84=E0=B8=97=E0=B8=A2=E0=B8=97=E0=B8=B1=E0=B9=89=E0=B8=87?= =?UTF-8?q?=E0=B8=AB=E0=B8=A1=E0=B8=94=20=E0=B8=94=E0=B8=B3=E0=B9=80?= =?UTF-8?q?=E0=B8=99=E0=B8=B4=E0=B8=99=E0=B8=81=E0=B8=B2=E0=B8=A3=20copy?= =?UTF-8?q?=20=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5?= =?UTF-8?q?=E0=B8=97=E0=B8=B1=E0=B8=9A=E0=B8=A0=E0=B8=B2=E0=B8=A9=E0=B8=B2?= =?UTF-8?q?=E0=B8=AD=E0=B8=B1=E0=B8=87=E0=B8=81=E0=B8=A4=E0=B8=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_translate_dialog/models/__init__.py | 2 +- web_translate_dialog/models/res_partner.py | 42 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 web_translate_dialog/models/res_partner.py diff --git a/web_translate_dialog/models/__init__.py b/web_translate_dialog/models/__init__.py index fdd41ab..4e589bc 100755 --- a/web_translate_dialog/models/__init__.py +++ b/web_translate_dialog/models/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- from . import translation - +from . import res_partner # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/web_translate_dialog/models/res_partner.py b/web_translate_dialog/models/res_partner.py new file mode 100644 index 0000000..a688643 --- /dev/null +++ b/web_translate_dialog/models/res_partner.py @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- +from openerp import models, fields, api +import re + +class ResPartner(models.Model): + _inherit = 'res.partner' + + @api.multi + def write(self, vals): + res = super(ResPartner, self).write(vals) + + trans = self.env['ir.translation'] + for l in self: + if 'name' in vals: + name = "res.partner,name" + trans_search = trans.search([('lang','=','th_TH'), + ('name','=',name), + ('type','=','model'), + ('res_id', '=', l.id), + ('state','=','to_translate')], limit=1) + if trans_search: + trans_src = trans_search.src.replace(" ", "") + trans_value = trans_search.value.replace(" ", "") + pattern = re.compile(r"[a-zA-Z]") + char_name = re.findall(pattern, vals['name'].replace(" ", "")) + char_src = re.findall(pattern, trans_src) + char_value = re.findall(pattern, trans_value) + + update_src = False + if not char_src and not char_value and not char_name: + update_src = True + trans_search.write({ + 'value': vals['name'], + 'src': vals['name'] + }) + + lang = self._context.get('lang', False) + if lang == 'en_US' and not update_src: + trans_search.write({ + 'src': vals['name'] + }) + return res \ No newline at end of file From fc5269c3f4f811204012d57a0e96237e8fa4b16b Mon Sep 17 00:00:00 2001 From: Jakkrich Changgon Date: Wed, 27 Mar 2019 11:40:21 +0700 Subject: [PATCH 02/16] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B8=81=E0=B8=A3=E0=B8=93=E0=B8=B5=E0=B8=9E=E0=B8=B4=E0=B8=A1?= =?UTF-8?q?=20thai=20=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=A0=E0=B8=B2?= =?UTF-8?q?=E0=B8=A9=E0=B8=B2=20eng=20=E0=B9=83=E0=B8=AB=E0=B9=89=20update?= =?UTF-8?q?=20value=20=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B9=81=E0=B8=9B?= =?UTF-8?q?=E0=B8=A5=E0=B8=A0=E0=B8=B2=E0=B8=A9=E0=B8=B2=E0=B9=84=E0=B8=97?= =?UTF-8?q?=E0=B8=A2=E0=B8=94=E0=B9=89=E0=B8=A7=E0=B8=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_translate_dialog/models/res_partner.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/web_translate_dialog/models/res_partner.py b/web_translate_dialog/models/res_partner.py index a688643..8c913a7 100644 --- a/web_translate_dialog/models/res_partner.py +++ b/web_translate_dialog/models/res_partner.py @@ -19,6 +19,7 @@ def write(self, vals): ('res_id', '=', l.id), ('state','=','to_translate')], limit=1) if trans_search: + lang = self._context.get('lang', False) trans_src = trans_search.src.replace(" ", "") trans_value = trans_search.value.replace(" ", "") pattern = re.compile(r"[a-zA-Z]") @@ -26,17 +27,21 @@ def write(self, vals): char_src = re.findall(pattern, trans_src) char_value = re.findall(pattern, trans_value) - update_src = False + # Case Thai All if not char_src and not char_value and not char_name: - update_src = True trans_search.write({ 'value': vals['name'], 'src': vals['name'] }) - - lang = self._context.get('lang', False) - if lang == 'en_US' and not update_src: - trans_search.write({ - 'src': vals['name'] - }) + else: + # Case en_US update 'src' away + if lang == 'en_US': + trans_search.write({ + 'src': vals['name'] + }) + # name thai and value(old) thai >> update new value + if not char_name and not char_value: + trans_search.write({ + 'value': vals['name'] + }) return res \ No newline at end of file From dae0d3ff82ba4e4795d518676a938136910a598c Mon Sep 17 00:00:00 2001 From: Jakkrich Changgon Date: Wed, 27 Mar 2019 16:34:33 +0700 Subject: [PATCH 03/16] =?UTF-8?q?=E0=B9=80=E0=B8=AD=E0=B8=B2=20domain=20st?= =?UTF-8?q?ate=20=E0=B8=97=E0=B8=B5=E0=B9=88=20=20ir.translation=20?= =?UTF-8?q?=E0=B8=AD=E0=B8=AD=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_translate_dialog/models/res_partner.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web_translate_dialog/models/res_partner.py b/web_translate_dialog/models/res_partner.py index 8c913a7..03aac0a 100644 --- a/web_translate_dialog/models/res_partner.py +++ b/web_translate_dialog/models/res_partner.py @@ -16,8 +16,7 @@ def write(self, vals): trans_search = trans.search([('lang','=','th_TH'), ('name','=',name), ('type','=','model'), - ('res_id', '=', l.id), - ('state','=','to_translate')], limit=1) + ('res_id', '=', l.id)], limit=1) if trans_search: lang = self._context.get('lang', False) trans_src = trans_search.src.replace(" ", "") From 30fa5e8610acd2e88d26b7c6e86b4ddb3b540d0f Mon Sep 17 00:00:00 2001 From: Jakkrich Changgon Date: Thu, 28 Mar 2019 11:17:42 +0700 Subject: [PATCH 04/16] =?UTF-8?q?=E0=B8=A2=E0=B8=81=E0=B9=80=E0=B8=A5?= =?UTF-8?q?=E0=B8=B4=E0=B8=81=E0=B8=81=E0=B8=B2=E0=B8=A3=20update=20?= =?UTF-8?q?=E0=B8=A0=E0=B8=B2=E0=B8=A9=E0=B8=B2=E0=B8=97=E0=B8=B5=E0=B9=88?= =?UTF-8?q?=20current=20field?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_translate_dialog/models/res_partner.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web_translate_dialog/models/res_partner.py b/web_translate_dialog/models/res_partner.py index 03aac0a..8ead845 100644 --- a/web_translate_dialog/models/res_partner.py +++ b/web_translate_dialog/models/res_partner.py @@ -8,10 +8,14 @@ class ResPartner(models.Model): @api.multi def write(self, vals): res = super(ResPartner, self).write(vals) + if self._context.get('transpass', False): + return res trans = self.env['ir.translation'] for l in self: if 'name' in vals: + # l.with_context(transpass=True, lang="en_US").write({'name':vals['name']}) + name = "res.partner,name" trans_search = trans.search([('lang','=','th_TH'), ('name','=',name), From 5a25432aeaf0b9e0eab329ee2f23c049e4ae85fc Mon Sep 17 00:00:00 2001 From: Jakkrich Changgon Date: Thu, 28 Mar 2019 15:36:02 +0700 Subject: [PATCH 05/16] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B8=84=E0=B9=88=E0=B8=B2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=81?= =?UTF-8?q?=E0=B8=A3=E0=B8=AD=E0=B8=81=E0=B8=A0=E0=B8=B2=E0=B8=A9=E0=B8=B2?= =?UTF-8?q?=E0=B8=97=E0=B8=B5=E0=B9=88=20wizard=20=E0=B9=83=E0=B8=AB?= =?UTF-8?q?=E0=B9=89=E0=B8=AA=E0=B8=AD=E0=B8=94=E0=B8=84=E0=B8=A5=E0=B9=89?= =?UTF-8?q?=E0=B8=AD=E0=B8=87=E0=B8=81=E0=B8=B1=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_translate_dialog/models/translation.py | 20 ++++++++++++++++++++ web_translate_dialog/static/src/css/base.css | 15 +++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/web_translate_dialog/models/translation.py b/web_translate_dialog/models/translation.py index 61ac373..d620562 100755 --- a/web_translate_dialog/models/translation.py +++ b/web_translate_dialog/models/translation.py @@ -1,6 +1,8 @@ # -*- coding: utf-8 -*- from openerp.models import BaseModel from openerp import api, models, _ +import re + @api.v7 def copy_translations(self, cr, uid, old_id, new_id, context=None): @@ -29,11 +31,29 @@ def set_translation(self, model, res_id, field_list, ('name','=',name), ('type','=','model'), ('res_id', '=', res_id)]) + + trans_src = trans_search.src.replace(" ", "") + trans_value = trans_search.value.replace(" ", "") + pattern = re.compile(r"[a-zA-Z]") + char_name = re.findall(pattern, data[field_name].replace(" ", "")) + char_src = re.findall(pattern, trans_src) + char_value = re.findall(pattern, trans_value) + if trans_search and lang_code == context['lang']: trans_search.with_context(context).\ write({'value': data[field_name]}) elif trans_search and lang_code != context['lang']: trans_search.with_context(context).\ write({'source': data[field_name]}) + + + if context['lang'] == 'th_TH' and not char_name: + trans_search.with_context(context).\ + write({'value': data[field_name]}) + if context['lang'] == 'th_TH' and not char_name and not char_src: + trans_search.with_context(context).\ + write({'source': data[field_name]}) + + return True # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/web_translate_dialog/static/src/css/base.css b/web_translate_dialog/static/src/css/base.css index 8f88484..76ceed2 100755 --- a/web_translate_dialog/static/src/css/base.css +++ b/web_translate_dialog/static/src/css/base.css @@ -1,6 +1,21 @@ +.openerp .oe_form_field_translatable > input, +.openerp .oe_form .oe_form_required .oe_translation_field > input { + # pointer-events:none !important; + # background: #E5E5E5 !important; +} + .openerp .oe_translation_field { width: 95%; } + .openerp .oe_translation_field.touched { border: 1px solid green !important; } + +.openerp .oe_form .oe_input_icon{ + margin: 3px 0 0 3px !important; +} + +.openerp .oe_form .oe_form_field_char input{ + width: calc(100% - 24px) !important; +} \ No newline at end of file From 541483b0bf0cbb9fe17ad19b258161a154501c93 Mon Sep 17 00:00:00 2001 From: Jakkrich Changgon Date: Thu, 28 Mar 2019 15:45:27 +0700 Subject: [PATCH 06/16] =?UTF-8?q?update=20src=20=E0=B8=9E=E0=B8=A3?= =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=81=E0=B8=B1=E0=B8=9A=20source?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_translate_dialog/models/res_partner.py | 6 ++++-- web_translate_dialog/models/translation.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web_translate_dialog/models/res_partner.py b/web_translate_dialog/models/res_partner.py index 8ead845..7025945 100644 --- a/web_translate_dialog/models/res_partner.py +++ b/web_translate_dialog/models/res_partner.py @@ -34,13 +34,15 @@ def write(self, vals): if not char_src and not char_value and not char_name: trans_search.write({ 'value': vals['name'], - 'src': vals['name'] + 'src': vals['name'], + 'source': vals['name'] }) else: # Case en_US update 'src' away if lang == 'en_US': trans_search.write({ - 'src': vals['name'] + 'src': vals['name'], + 'source': vals['name'] }) # name thai and value(old) thai >> update new value if not char_name and not char_value: diff --git a/web_translate_dialog/models/translation.py b/web_translate_dialog/models/translation.py index d620562..81209f6 100755 --- a/web_translate_dialog/models/translation.py +++ b/web_translate_dialog/models/translation.py @@ -44,7 +44,7 @@ def set_translation(self, model, res_id, field_list, write({'value': data[field_name]}) elif trans_search and lang_code != context['lang']: trans_search.with_context(context).\ - write({'source': data[field_name]}) + write({'src': data[field_name], 'source': data[field_name]}) if context['lang'] == 'th_TH' and not char_name: @@ -52,7 +52,7 @@ def set_translation(self, model, res_id, field_list, write({'value': data[field_name]}) if context['lang'] == 'th_TH' and not char_name and not char_src: trans_search.with_context(context).\ - write({'source': data[field_name]}) + write({'src': data[field_name], 'source': data[field_name]}) return True From 8447dc411b586dbcc026f412ad00210e0949abf6 Mon Sep 17 00:00:00 2001 From: Jakkrich Changgon Date: Thu, 28 Mar 2019 15:49:28 +0700 Subject: [PATCH 07/16] =?UTF-8?q?=E0=B8=A2=E0=B8=81=E0=B9=80=E0=B8=A5?= =?UTF-8?q?=E0=B8=B4=E0=B8=81=20update=20src=20=E0=B8=9E=E0=B8=A3=E0=B9=89?= =?UTF-8?q?=E0=B8=AD=E0=B8=A1=E0=B8=81=E0=B8=B1=E0=B8=9A=20source=20?= =?UTF-8?q?=E0=B8=97=E0=B8=B5=E0=B9=88=20res.partner?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_translate_dialog/models/res_partner.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/web_translate_dialog/models/res_partner.py b/web_translate_dialog/models/res_partner.py index 7025945..69b4fa1 100644 --- a/web_translate_dialog/models/res_partner.py +++ b/web_translate_dialog/models/res_partner.py @@ -35,14 +35,12 @@ def write(self, vals): trans_search.write({ 'value': vals['name'], 'src': vals['name'], - 'source': vals['name'] }) else: # Case en_US update 'src' away if lang == 'en_US': trans_search.write({ 'src': vals['name'], - 'source': vals['name'] }) # name thai and value(old) thai >> update new value if not char_name and not char_value: From bf5f0e9b4decf859a79ee7a811c14c4df0ae70ae Mon Sep 17 00:00:00 2001 From: Jakkrich Changgon Date: Thu, 28 Mar 2019 15:55:25 +0700 Subject: [PATCH 08/16] fix lang update to src --- web_translate_dialog/models/translation.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web_translate_dialog/models/translation.py b/web_translate_dialog/models/translation.py index 81209f6..52095ff 100755 --- a/web_translate_dialog/models/translation.py +++ b/web_translate_dialog/models/translation.py @@ -47,11 +47,11 @@ def set_translation(self, model, res_id, field_list, write({'src': data[field_name], 'source': data[field_name]}) - if context['lang'] == 'th_TH' and not char_name: + if trans_search and context['lang'] == 'th_TH' and not char_name: trans_search.with_context(context).\ write({'value': data[field_name]}) - if context['lang'] == 'th_TH' and not char_name and not char_src: - trans_search.with_context(context).\ + if trans_search and context['lang'] == 'th_TH' and not char_name and not char_src: + trans_search.with_context(lang="en_US").\ write({'src': data[field_name], 'source': data[field_name]}) From 820da094ae0d562d767844651f63525707244e64 Mon Sep 17 00:00:00 2001 From: Jakkrich Changgon Date: Thu, 28 Mar 2019 16:04:27 +0700 Subject: [PATCH 09/16] fix lang update to src --- web_translate_dialog/models/translation.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/web_translate_dialog/models/translation.py b/web_translate_dialog/models/translation.py index 52095ff..8b4a8df 100755 --- a/web_translate_dialog/models/translation.py +++ b/web_translate_dialog/models/translation.py @@ -32,13 +32,6 @@ def set_translation(self, model, res_id, field_list, ('type','=','model'), ('res_id', '=', res_id)]) - trans_src = trans_search.src.replace(" ", "") - trans_value = trans_search.value.replace(" ", "") - pattern = re.compile(r"[a-zA-Z]") - char_name = re.findall(pattern, data[field_name].replace(" ", "")) - char_src = re.findall(pattern, trans_src) - char_value = re.findall(pattern, trans_value) - if trans_search and lang_code == context['lang']: trans_search.with_context(context).\ write({'value': data[field_name]}) @@ -46,9 +39,19 @@ def set_translation(self, model, res_id, field_list, trans_search.with_context(context).\ write({'src': data[field_name], 'source': data[field_name]}) + trans_search = trans.search([('lang','=','th_TH'), + ('name','=',name), + ('type','=','model'), + ('res_id', '=', res_id)]) + trans_src = trans_search.src.replace(" ", "") + trans_value = trans_search.value.replace(" ", "") + pattern = re.compile(r"[a-zA-Z]") + char_name = re.findall(pattern, data[field_name].replace(" ", "")) + char_src = re.findall(pattern, trans_src) + char_value = re.findall(pattern, trans_value) if trans_search and context['lang'] == 'th_TH' and not char_name: - trans_search.with_context(context).\ + trans_search.with_context(lang="th_TH").\ write({'value': data[field_name]}) if trans_search and context['lang'] == 'th_TH' and not char_name and not char_src: trans_search.with_context(lang="en_US").\ From 81923d19826e5bf073217796c2a4cea94c9e262a Mon Sep 17 00:00:00 2001 From: Jakkrich Changgon Date: Thu, 28 Mar 2019 16:11:13 +0700 Subject: [PATCH 10/16] fix lang call back source field --- web_translate_dialog/models/translation.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web_translate_dialog/models/translation.py b/web_translate_dialog/models/translation.py index 8b4a8df..3016b7e 100755 --- a/web_translate_dialog/models/translation.py +++ b/web_translate_dialog/models/translation.py @@ -56,7 +56,8 @@ def set_translation(self, model, res_id, field_list, if trans_search and context['lang'] == 'th_TH' and not char_name and not char_src: trans_search.with_context(lang="en_US").\ write({'src': data[field_name], 'source': data[field_name]}) - + s = self.env[model].search(['id','=',res_id]) + s.write({field_name: data[field_name]}) return True # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From de751f76bf1910b860c697d321f37bc482b1ece4 Mon Sep 17 00:00:00 2001 From: Jakkrich Changgon Date: Thu, 28 Mar 2019 16:40:35 +0700 Subject: [PATCH 11/16] fix lang call back source field --- web_translate_dialog/models/translation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_translate_dialog/models/translation.py b/web_translate_dialog/models/translation.py index 3016b7e..04b938b 100755 --- a/web_translate_dialog/models/translation.py +++ b/web_translate_dialog/models/translation.py @@ -39,7 +39,7 @@ def set_translation(self, model, res_id, field_list, trans_search.with_context(context).\ write({'src': data[field_name], 'source': data[field_name]}) - trans_search = trans.search([('lang','=','th_TH'), + trans_search = self.search([('lang','=','th_TH'), ('name','=',name), ('type','=','model'), ('res_id', '=', res_id)]) From d3cc95a21c24e58487b44a8fe049518b1ba3f504 Mon Sep 17 00:00:00 2001 From: Jakkrich Changgon Date: Thu, 28 Mar 2019 16:43:36 +0700 Subject: [PATCH 12/16] fix lang call back source field --- web_translate_dialog/models/res_partner.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web_translate_dialog/models/res_partner.py b/web_translate_dialog/models/res_partner.py index 69b4fa1..684af65 100644 --- a/web_translate_dialog/models/res_partner.py +++ b/web_translate_dialog/models/res_partner.py @@ -14,8 +14,6 @@ def write(self, vals): trans = self.env['ir.translation'] for l in self: if 'name' in vals: - # l.with_context(transpass=True, lang="en_US").write({'name':vals['name']}) - name = "res.partner,name" trans_search = trans.search([('lang','=','th_TH'), ('name','=',name), @@ -32,6 +30,7 @@ def write(self, vals): # Case Thai All if not char_src and not char_value and not char_name: + l.with_context(transpass=True, lang="en_US").write({'name':vals['name']}) trans_search.write({ 'value': vals['name'], 'src': vals['name'], From 4b18cb5d847a475f45ba6eae09b4391af2707342 Mon Sep 17 00:00:00 2001 From: Jakkrich Changgon Date: Fri, 29 Mar 2019 10:24:38 +0700 Subject: [PATCH 13/16] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=84=E0=B9=89=E0=B8=B2=E0=B9=84?= =?UTF-8?q?=E0=B8=A1=E0=B9=88=E0=B9=80=E0=B8=AB=E0=B8=A1=E0=B8=B7=E0=B8=AD?= =?UTF-8?q?=E0=B8=99=E0=B8=81=E0=B8=B1=E0=B8=99=20=E0=B9=83=E0=B8=99?= =?UTF-8?q?=E0=B8=AA=E0=B8=AD=E0=B8=87=E0=B8=A0=E0=B8=B2=E0=B8=A9=E0=B8=B2?= =?UTF-8?q?=20=E0=B9=84=E0=B8=97=E0=B8=A2=20=E0=B9=81=E0=B8=A5=E0=B8=B0=20?= =?UTF-8?q?=E0=B8=AD=E0=B8=B1=E0=B8=87=E0=B8=81=E0=B8=A4=E0=B8=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_translate_dialog/models/translation.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/web_translate_dialog/models/translation.py b/web_translate_dialog/models/translation.py index 04b938b..79c0843 100755 --- a/web_translate_dialog/models/translation.py +++ b/web_translate_dialog/models/translation.py @@ -56,8 +56,6 @@ def set_translation(self, model, res_id, field_list, if trans_search and context['lang'] == 'th_TH' and not char_name and not char_src: trans_search.with_context(lang="en_US").\ write({'src': data[field_name], 'source': data[field_name]}) - s = self.env[model].search(['id','=',res_id]) - s.write({field_name: data[field_name]}) return True # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 601bb9f0d7728566fbe495f2a7d4bd7f03665a37 Mon Sep 17 00:00:00 2001 From: Jakkrich Changgon Date: Fri, 29 Mar 2019 11:28:00 +0700 Subject: [PATCH 14/16] =?UTF-8?q?=E0=B8=81=E0=B8=A3=E0=B8=93=E0=B8=B5?= =?UTF-8?q?=E0=B8=A0=E0=B8=B2=E0=B8=A9=E0=B8=B2=E0=B9=80=E0=B8=9B=E0=B9=87?= =?UTF-8?q?=E0=B8=99=20en=20=E0=B8=97=E0=B8=B1=E0=B9=89=E0=B8=87=E0=B8=AB?= =?UTF-8?q?=E0=B8=A1=E0=B8=94=20=E0=B8=96=E0=B9=89=E0=B8=B2=E0=B8=A1?= =?UTF-8?q?=E0=B8=B5=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=81=E0=B9=89?= =?UTF-8?q?=E0=B9=84=E0=B8=82=E0=B8=95=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B9=81?= =?UTF-8?q?=E0=B8=81=E0=B9=89=E0=B8=95=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B8=AB?= =?UTF-8?q?=E0=B8=A1=E0=B8=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_translate_dialog/models/translation.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/web_translate_dialog/models/translation.py b/web_translate_dialog/models/translation.py index 79c0843..1f6eeae 100755 --- a/web_translate_dialog/models/translation.py +++ b/web_translate_dialog/models/translation.py @@ -52,10 +52,22 @@ def set_translation(self, model, res_id, field_list, if trans_search and context['lang'] == 'th_TH' and not char_name: trans_search.with_context(lang="th_TH").\ - write({'value': data[field_name]}) + write({ + 'value': data[field_name] + }) if trans_search and context['lang'] == 'th_TH' and not char_name and not char_src: trans_search.with_context(lang="en_US").\ - write({'src': data[field_name], 'source': data[field_name]}) + write({ + 'src': data[field_name], + 'source': data[field_name] + }) + if trans_search and context['lang'] == 'en_US' and char_name and char_src and char_value: + trans_search.with_context(lang="en_US").\ + write({ + 'src': data[field_name], + 'source': data[field_name], + 'value': data[field_name] + }) return True # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 758c74aff208951564809074b1bf12f95b0db921 Mon Sep 17 00:00:00 2001 From: Jakkrich Changgon Date: Fri, 29 Mar 2019 11:39:48 +0700 Subject: [PATCH 15/16] =?UTF-8?q?=E0=B8=81=E0=B8=A3=E0=B8=93=E0=B8=B5?= =?UTF-8?q?=E0=B8=A0=E0=B8=B2=E0=B8=A9=E0=B8=B2=E0=B9=80=E0=B8=9B=E0=B9=87?= =?UTF-8?q?=E0=B8=99=20en=20=E0=B8=97=E0=B8=B1=E0=B9=89=E0=B8=87=E0=B8=AB?= =?UTF-8?q?=E0=B8=A1=E0=B8=94=20=E0=B8=96=E0=B9=89=E0=B8=B2=E0=B8=A1?= =?UTF-8?q?=E0=B8=B5=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=81=E0=B9=89?= =?UTF-8?q?=E0=B9=84=E0=B8=82=E0=B8=95=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B9=81?= =?UTF-8?q?=E0=B8=81=E0=B9=89=E0=B8=95=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B8=AB?= =?UTF-8?q?=E0=B8=A1=E0=B8=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_translate_dialog/models/res_partner.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/web_translate_dialog/models/res_partner.py b/web_translate_dialog/models/res_partner.py index 684af65..4b021a3 100644 --- a/web_translate_dialog/models/res_partner.py +++ b/web_translate_dialog/models/res_partner.py @@ -42,8 +42,15 @@ def write(self, vals): 'src': vals['name'], }) # name thai and value(old) thai >> update new value - if not char_name and not char_value: + if (not char_name and not char_value) or (char_name and char_value and char_src): trans_search.write({ 'value': vals['name'] }) + elif lang == 'th_TH': + if char_name and char_value and char_src: + trans_search.write({ + 'src': vals['name'], + 'source': vals['name'], + 'value': vals['name'], + }) return res \ No newline at end of file From 35f6ca57c5ce52fe154db93de6c7c0fc14d49620 Mon Sep 17 00:00:00 2001 From: Jakkrich Changgon Date: Fri, 29 Mar 2019 11:41:43 +0700 Subject: [PATCH 16/16] =?UTF-8?q?=E0=B8=81=E0=B8=A3=E0=B8=93=E0=B8=B5?= =?UTF-8?q?=E0=B8=A0=E0=B8=B2=E0=B8=A9=E0=B8=B2=E0=B9=80=E0=B8=9B=E0=B9=87?= =?UTF-8?q?=E0=B8=99=20en=20=E0=B8=97=E0=B8=B1=E0=B9=89=E0=B8=87=E0=B8=AB?= =?UTF-8?q?=E0=B8=A1=E0=B8=94=20=E0=B8=96=E0=B9=89=E0=B8=B2=E0=B8=A1?= =?UTF-8?q?=E0=B8=B5=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=81=E0=B9=89?= =?UTF-8?q?=E0=B9=84=E0=B8=82=E0=B8=95=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B9=81?= =?UTF-8?q?=E0=B8=81=E0=B9=89=E0=B8=95=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B8=AB?= =?UTF-8?q?=E0=B8=A1=E0=B8=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_translate_dialog/models/translation.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web_translate_dialog/models/translation.py b/web_translate_dialog/models/translation.py index 1f6eeae..a76176f 100755 --- a/web_translate_dialog/models/translation.py +++ b/web_translate_dialog/models/translation.py @@ -61,6 +61,13 @@ def set_translation(self, model, res_id, field_list, 'src': data[field_name], 'source': data[field_name] }) + if trans_search and context['lang'] == 'th_TH' and char_name and char_src and char_value: + trans_search.with_context(lang="en_US").\ + write({ + 'src': data[field_name], + 'source': data[field_name], + 'value': data[field_name] + }) if trans_search and context['lang'] == 'en_US' and char_name and char_src and char_value: trans_search.with_context(lang="en_US").\ write({