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

[FIX] tools: ensure 0 res_id are handled

Browse Source 
if an POEntry has an occurrence with a 0 res_id
    >>> entry.occurrences.append(("selection:report.paper,format", 0))
    >>> str(entry)
    #: selection:report.paperformat,format
    ...

Use the string '0' to bypass this
This commit is contained in:
Martin Trigaux
2019-06-05 09:44:11 +00:00
parent 376f7983b0
commit 55dd375c84
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
odoo/tools/translate.py
+6 -5
View File
@@ -571,7 +571,7 @@ class PoFileReader:
'src': source,
'value': translation,
'comments': comments,
'res_id': line_number,
'res_id': int(line_number),
'module': module,
}
continue
@@ -586,7 +586,7 @@ class PoFileReader:
'src': source,
'value': translation,
'comments': comments,
'res_id': line_number,
'res_id': int(line_number),
'module': module,
}
continue
@@ -600,7 +600,7 @@ class PoFileReader:
'src': source,
'value': translation,
'comments': comments,
'res_id': line_number,
'res_id': int(line_number),
'module': module,
}
continue
@@ -697,9 +697,10 @@ class PoFileWriter:
for typy, name, res_id in tnrs:
if typy == 'code':
code = True
if isinstance(res_id, int):
if isinstance(res_id, int) or res_id.isdigit():
# second term of occurrence must be a digit
entry.occurrences.append((u"%s:%s" % (typy, name), res_id))
# occurrence line at 0 are discarded when rendered to string
entry.occurrences.append((u"%s:%s" % (typy, name), str(res_id)))
else:
entry.occurrences.append((u"%s:%s:%s" % (typy, name, res_id), ''))
if code: