tryton-do/tryton
2
0 Fork 0
Code Issues Pull Requests 2 Actions 2 Packages Projects Releases Wiki Activity

Add module in ir_translation unique constraint

Browse Source 
Fix view and report translation to have one record per module
Add clause in ir_translation to fetch unempty translation
This commit is contained in:
Cédric Krier committed 2008-11-14 01:07:35 +01:00
1 parent fd56a1e18d
commit 031c569df7
2 files changed
+50 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

trytond/ir/translation.py
+32 -18
View File
@@ -55,7 +55,8 @@ class Translation(OSV, Cacheable):
super(Translation, self).__init__()
Cacheable.__init__(self)
self._sql_constraints += [
('translation_uniq', 'UNIQUE (name, res_id, lang, type, src)',
('translation_uniq',
'UNIQUE (name, res_id, lang, type, src, module)',
'Translation must be unique'),
]
self.max_len = 10240
@@ -139,6 +140,8 @@ class Translation(OSV, Cacheable):
'WHERE lang = %s ' \
'AND type = %s ' \
'AND name = %s ' \
'AND value != \'\' ' \
'AND value IS NOT NULL ' \
'AND fuzzy = false ' \
'AND res_id in (' + \
','.join([str(x) for x in to_fetch]) + ')',
@@ -218,6 +221,8 @@ class Translation(OSV, Cacheable):
'AND type = %s ' \
'AND name = %s ' \
'AND src = %s' \
'AND value != \'\' ' \
'AND value IS NOT NULL ' \
'AND fuzzy = false ',
(lang, ttype, str(name), source))
else:
@@ -226,6 +231,8 @@ class Translation(OSV, Cacheable):
'WHERE lang = %s ' \
'AND type = %s ' \
'AND name = %s' \
'AND value != \'\' ' \
'AND value IS NOT NULL ' \
'AND fuzzy = false ',
(lang, ttype, str(name)))
res = cursor.fetchone()
@@ -263,12 +270,16 @@ class Translation(OSV, Cacheable):
'AND type = %s ' \
'AND name = %s ' \
'AND src = %s ' \
'AND value != \'\' ' \
'AND value IS NOT NULL ' \
'AND fuzzy = false)'
value.extend((lang, ttype, str(name), source))
else:
clause += '(lang = %s ' \
'AND type = %s ' \
'AND name = %s ' \
'AND value != \'\' ' \
'AND value IS NOT NULL ' \
'AND fuzzy = false)'
value.extend((lang, ttype, str(name)))
if clause:
@@ -539,18 +550,17 @@ class ReportTranslationSet(Wizard):
reports = report_obj.browse(cursor, user, report_ids, context=context)
cursor.execute('SELECT id, name, src FROM ir_translation ' \
'WHERE lang = %s ' \
'AND type = %s ' \
'AND name IN ' \
'(' + ','.join(['%s' for x in reports]) + ')',
('en_US', 'odt') + tuple([x.report_name for x in reports]))
trans_reports = {}
for trans in cursor.dictfetchall():
trans_reports.setdefault(trans['name'], {})
trans_reports[trans['name']][trans['src']] = trans
for report in reports:
cursor.execute('SELECT id, name, src FROM ir_translation ' \
'WHERE lang = %s ' \
'AND type = %s ' \
'AND name = %s ' \
'AND module = %s',
('en_US', 'odt', report.report_name, report.module))
trans_reports = {}
for trans in cursor.dictfetchall():
trans_reports[trans['src']] = trans
try:
content = report.report_content
except:
@@ -586,10 +596,12 @@ class ReportTranslationSet(Wizard):
for string in {}.fromkeys(strings).keys():
done = False
if string in trans_reports.get(report.report_name, {}):
del trans_reports[report.report_name][string]
if string in trans_reports:
del trans_reports[string]
continue
for string_trans in trans_reports.get(report.report_name, {}):
for string_trans in trans_reports:
if string_trans in strings:
continue
seqmatch = SequenceMatcher(lambda x: x == ' ',
string, string_trans)
if seqmatch.ratio() == 1.0:
@@ -602,9 +614,11 @@ class ReportTranslationSet(Wizard):
'fuzzy = True ' \
'WHERE name = %s ' \
'AND type = %s ' \
'AND src = %s',
(string, report.report_name, 'odt', string_trans))
del trans_reports[report.report_name][string_trans]
'AND src = %s ' \
'AND module = %s',
(string, report.report_name, 'odt', string_trans,
report.module))
del trans_reports[string_trans]
done = True
break
if not done:
trytond/ir/ui/view.py
+18 -17
View File
@@ -50,17 +50,16 @@ class View(OSV):
def check_xml(self, cursor, user, ids):
"Check XML"
views = self.browse(cursor, user, ids)
cursor.execute('SELECT id, name, src FROM ir_translation ' \
'WHERE lang = %s ' \
'AND type = %s ' \
'AND name IN ' \
'(' + ','.join(['%s' for x in views]) + ')',
('en_US', 'view') + tuple([x.model for x in views]))
trans_views = {}
for trans in cursor.dictfetchall():
trans_views.setdefault(trans['name'], {})
trans_views[trans['name']][trans['src']] = trans
for view in views:
cursor.execute('SELECT id, name, src FROM ir_translation ' \
'WHERE lang = %s ' \
'AND type = %s ' \
'AND name = %s '\
'AND module = %s',
('en_US', 'view', view.model, view.module))
trans_views = {}
for trans in cursor.dictfetchall():
trans_views[trans['src']] = trans
xml = view.arch.strip()
tree = etree.fromstring(xml)
@@ -99,16 +98,16 @@ class View(OSV):
continue
for string in {}.fromkeys(strings).keys():
done = False
if string in trans_views.get(view.model, {}):
del trans_views[view.model][string]
if string in trans_views:
del trans_views[string]
continue
for string_trans in trans_views.get(view.model, {}):
for string_trans in trans_views:
if string_trans in strings:
continue
seqmatch = SequenceMatcher(lambda x: x == ' ',
string, string_trans)
if seqmatch.ratio() == 1.0:
del trans_views[view.model][string_trans]
del trans_views[string_trans]
done = True
break
if seqmatch.ratio() > 0.6:
@@ -117,9 +116,11 @@ class View(OSV):
'fuzzy = True ' \
'WHERE name = %s ' \
'AND type = %s ' \
'AND src = %s',
(string, view.model, 'view', string_trans))
del trans_views[view.model][string_trans]
'AND src = %s '\
'AND module = %s',
(string, view.model, 'view', string_trans,
view.module))
del trans_views[string_trans]
done = True
break
if not done: