pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] base: avoid duplicated translations after update

Browse Source 
This commits fixes the following scenario:

1. load the translations for any language
2. modify the source of a translated record (e.g. email template body)
3. click on 'load translations' button (flag)
4. execute the translation wizard for the same language (to refresh)
The translation of the modified record was duplicated.

This was due to the field src in the database being different than the msgid in
the po file. The src value is updated on the insert_missing call.

The matching on src for type='model' translations is only needed due to the
translations that are split (e.g. xml views or html content). For the other
translations, matching on the rec_id is enough.

Detects the xml_translate and html_translate fields to avoid matching on src for
these translations.

opw-691752
Closes #14310
This commit is contained in:
Martin Trigaux
2016-11-22 11:33:32 +01:00
parent 00bdac7280
commit c3756b7d9a
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/ir/ir_translation.py
+17 -5
View File
@@ -5,7 +5,7 @@ from collections import defaultdict
from difflib import get_close_matches
import logging
from openerp import api, tools
from openerp import api, tools, SUPERUSER_ID
import openerp.modules
from openerp.osv import fields, osv
from openerp.tools.translate import _
@@ -126,12 +126,21 @@ class ir_translation_import_cursor(object):
# referencing non-existent data.
cr.execute("DELETE FROM %s WHERE res_id IS NULL AND module IS NOT NULL" % self._table_name)
# detect the xml_translate fields, where the src must be the same
env = api.Environment(cr, SUPERUSER_ID, {})
src_relevant_fields = []
for model in env:
for field_name, field in env[model]._fields.items():
if hasattr(field, 'translate') and callable(field.translate):
src_relevant_fields.append("%s,%s" % (model, field_name))
find_expr = """
irt.lang = ti.lang
AND irt.type = ti.type
AND irt.name = ti.name
AND (
(ti.type = 'model' AND ti.res_id = irt.res_id AND irt.src = ti.src)
(ti.type = 'model' AND ti.res_id = irt.res_id AND ti.name IN %s AND irt.src = ti.src)
OR (ti.type = 'model' AND ti.res_id = irt.res_id AND ti.name NOT IN %s)
OR (ti.type = 'view' AND (irt.res_id IS NULL OR ti.res_id = irt.res_id) AND irt.src = ti.src)
OR (ti.type = 'field')
OR (ti.type = 'help')
@@ -147,20 +156,23 @@ class ir_translation_import_cursor(object):
state = 'translated'
FROM %s AS ti
WHERE %s AND ti.value IS NOT NULL AND ti.value != ''
""" % (self._parent_table, self._table_name, find_expr))
""" % (self._parent_table, self._table_name, find_expr),
(tuple(src_relevant_fields), tuple(src_relevant_fields)))
# Step 3: insert new translations
cr.execute("""INSERT INTO %s(name, lang, res_id, src, type, value, module, state, comments)
SELECT name, lang, res_id, src, type, value, module, state, comments
FROM %s AS ti
WHERE NOT EXISTS(SELECT 1 FROM ONLY %s AS irt WHERE %s);
""" % (self._parent_table, self._table_name, self._parent_table, find_expr))
""" % (self._parent_table, self._table_name, self._parent_table, find_expr),
(tuple(src_relevant_fields), tuple(src_relevant_fields)))
if self._debug:
cr.execute('SELECT COUNT(*) FROM ONLY %s' % self._parent_table)
c1 = cr.fetchone()[0]
cr.execute('SELECT COUNT(*) FROM ONLY %s AS irt, %s AS ti WHERE %s' % \
(self._parent_table, self._table_name, find_expr))
(self._parent_table, self._table_name, find_expr),
(tuple(src_relevant_fields), tuple(src_relevant_fields)))
c = cr.fetchone()[0]
_logger.debug("ir.translation.cursor: %d entries now in ir.translation, %d common entries with tmp", c1, c)