Xavier Morel
9ebbfdac73
Fixes a large number of cases where strings are translated then
formatted, instead of letting `_()` do the formatting internally,
which allows it to recover from incorrect translations (missing,
broken, or extra placeholders).
Also
- removes translation markers entirely when there's nothing to
translate e.g. `_("%s - %s")` is not useful
- fixes a few messes which lead to only partial translatability
(DRY is generally a bad idea when translations are involved, even
more so when you don't make the variable part translatable)
- fixes a few nearby issues noticed at the same time
- replaces a few `"%s"` by `%r`, which should automatically quote
strings relatively appropriately
- fixes translated strings which use `\` to escape a newline (in order
to fill-paragraph): `\` escapes only the newline, if the
continuation string is indented this results in a bunch of spaces
ending in the string to translate, which is pretty garbage for the
translator, using implicit concatenation works much better
Note: some of the updates revert f-string parameters to %, because
babel (2.9) apparently has trouble with f-strings and blows up trying
to extract them.
Not in scope:
Helping translators fix translatable strings e.g. any translation
string with more than one placeholder probably should use keyword
placeholders
- Provides more context / data to the translator to make sense of the
sentence.
- Allows reordering the translated terms, which can be necessary
depending on the sentence and language.
closes odoo/odoo#139314
Related: odoo/enterprise#49311
Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>
52 lines
2.4 KiB
Python
52 lines
2.4 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
import base64
|
|
import logging
|
|
import operator
|
|
from tempfile import TemporaryFile
|
|
from os.path import splitext
|
|
|
|
from odoo import api, fields, models, tools, sql_db, _
|
|
from odoo.exceptions import UserError
|
|
from odoo.tools.translate import TranslationImporter
|
|
|
|
_logger = logging.getLogger(__name__)
|
|
|
|
|
|
class BaseLanguageImport(models.TransientModel):
|
|
_name = "base.language.import"
|
|
_description = "Language Import"
|
|
|
|
name = fields.Char('Language Name', required=True)
|
|
code = fields.Char('ISO Code', size=6, required=True,
|
|
help="ISO Language and Country code, e.g. en_US")
|
|
data = fields.Binary('File', required=True, attachment=False)
|
|
filename = fields.Char('File Name', required=True)
|
|
overwrite = fields.Boolean('Overwrite Existing Terms',
|
|
default=True,
|
|
help="If you enable this option, existing translations (including custom ones) "
|
|
"will be overwritten and replaced by those in this file")
|
|
|
|
def import_lang(self):
|
|
Lang = self.env["res.lang"]
|
|
for overwrite, base_lang_imports in tools.groupby(self, operator.itemgetter('overwrite')):
|
|
translation_importer = TranslationImporter(self.env.cr)
|
|
for base_lang_import in base_lang_imports:
|
|
if not Lang._activate_lang(base_lang_import.code):
|
|
Lang._create_lang(base_lang_import.code, lang_name=base_lang_import.name)
|
|
try:
|
|
with TemporaryFile('wb+') as buf:
|
|
buf.write(base64.decodebytes(base_lang_import.data))
|
|
fileformat = splitext(base_lang_import.filename)[-1][1:].lower()
|
|
translation_importer.load(buf, fileformat, base_lang_import.code)
|
|
except Exception as e:
|
|
_logger.warning('Could not import the file due to a format mismatch or it being malformed.')
|
|
raise UserError(
|
|
_('File %r not imported due to format mismatch or a malformed file.'
|
|
' (Valid formats are .csv, .po)\n\nTechnical Details:\n%s',
|
|
base_lang_import.filename, tools.ustr(e))
|
|
)
|
|
translation_importer.save(overwrite=overwrite)
|
|
return True
|