summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorOdoo's Mergebot <xmo+roboto@odoo.com>2019-11-19 14:58:29 +0100
committerGitHub <noreply@github.com>2019-11-19 14:58:29 +0100
commitf591ec1ea992b624657c53edc2744f1663d09f28 (patch)
tree58f987c40de79837328605be86d43509b335d7ce /addons
parentab4507ed32626acfe88f205289210151ebd9c647 (diff)
parent95ed21795d1618c0144f50d5265cee6c21c332d4 (diff)
[IMP] *: translation methods cleaning
Extract some cleaning wanted in #30759 but not related to language packs - `amount_to_text` should work only on activated languages - deprecate `load_lang` and rely on `_create_lang` or `_activate_lang` - `trans_load_data` and `_load_module_terms` no longer silently activate languages - pass explicitly parameters instead of relying on context content - replace some `IrTranslation._load_module_terms(['base'], ['fr_FR'])` by `BaseModule._update_translations(['fr_FR'])` for higher level methods - create `TranslationExporter` class to clarify the `trans_export` method (and clean dead code) closes odoo/odoo#38859 Task-id: 2088290 Pad: https://pad.odoo.com/p/r.f6f789f8711d21314bd902972153ea9d Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
Diffstat (limited to 'addons')
-rw-r--r--addons/test_mail_full/tests/test_sms_composer.py4
-rw-r--r--addons/test_mail_full/tests/test_sms_template.py2
-rw-r--r--addons/website/tests/test_base_url.py3
-rw-r--r--addons/website/tests/test_lang_url.py4
-rw-r--r--addons/website/tests/test_qweb.py2
5 files changed, 7 insertions, 8 deletions
diff --git a/addons/test_mail_full/tests/test_sms_composer.py b/addons/test_mail_full/tests/test_sms_composer.py
index 060863e4f02..5e0f74fe1b5 100644
--- a/addons/test_mail_full/tests/test_sms_composer.py
+++ b/addons/test_mail_full/tests/test_sms_composer.py
@@ -368,7 +368,7 @@ class TestSMSComposerMass(test_mail_full_common.BaseFunctionalTest, sms_common.M
self.assertSMSOutgoing(record.customer_id, None, 'Dear %s this is an SMS.' % record.display_name)
def test_composer_mass_active_ids_w_template_and_lang(self):
- self.env.ref('base.lang_fr').write({'active': True})
+ self.env['res.lang']._activate_lang('fr_FR')
self.env['ir.translation'].create({
'type': 'model',
'name': 'sms.template,body',
@@ -425,7 +425,7 @@ class TestSMSComposerMass(test_mail_full_common.BaseFunctionalTest, sms_common.M
""" Test the context action from a SMS template (Add context action button)
and the usage with the sms composer """
# Create the lang info
- self.env.ref('base.lang_fr').write({'active': True})
+ self.env['res.lang']._activate_lang('fr_FR')
self.env['ir.translation'].create({
'type': 'model',
'name': 'sms.template,body',
diff --git a/addons/test_mail_full/tests/test_sms_template.py b/addons/test_mail_full/tests/test_sms_template.py
index a1c754511ab..ec5b7cf9f39 100644
--- a/addons/test_mail_full/tests/test_sms_template.py
+++ b/addons/test_mail_full/tests/test_sms_template.py
@@ -25,7 +25,7 @@ class TestSmsTemplate(test_mail_full_common.BaseFunctionalTest, sms_common.MockS
self.assertEqual(rendered_body[self.test_record.id], 'Dear %s this is an SMS.' % self.test_record.display_name)
def test_sms_template_lang(self):
- self.env.ref('base.lang_fr').write({'active': True})
+ self.env['res.lang']._activate_lang('fr_FR')
self.user_admin.write({'lang': 'en_US'})
self.env['ir.translation'].create({
'type': 'model',
diff --git a/addons/website/tests/test_base_url.py b/addons/website/tests/test_base_url.py
index 18d296f38e9..c14a6bc34e9 100644
--- a/addons/website/tests/test_base_url.py
+++ b/addons/website/tests/test_base_url.py
@@ -15,8 +15,7 @@ class TestUrlCommon(odoo.tests.HttpCase):
'domain': self.domain,
})
- lang_fr = self.env.ref('base.lang_fr')
- lang_fr.write({'active': True})
+ lang_fr = self.env['res.lang']._activate_lang('fr_FR')
self.website.language_ids = self.env.ref('base.lang_en') + lang_fr
self.website.default_lang_id = self.env.ref('base.lang_en')
diff --git a/addons/website/tests/test_lang_url.py b/addons/website/tests/test_lang_url.py
index 1c08b866fa4..8e0f5c78da9 100644
--- a/addons/website/tests/test_lang_url.py
+++ b/addons/website/tests/test_lang_url.py
@@ -13,8 +13,8 @@ class TestLangUrl(HttpCase):
# Simulate multi lang without loading translations
self.website = self.env.ref('website.default_website')
- lang_fr = self.env.ref('base.lang_fr')
- lang_fr.write({'active': True, 'url_code': 'fr'})
+ lang_fr = self.env['res.lang']._activate_lang('fr_FR')
+ lang_fr.write({'url_code': 'fr'})
self.website.language_ids = self.env.ref('base.lang_en') + lang_fr
self.website.default_lang_id = self.env.ref('base.lang_en')
diff --git a/addons/website/tests/test_qweb.py b/addons/website/tests/test_qweb.py
index 1c2c1dbe573..99f53078310 100644
--- a/addons/website/tests/test_qweb.py
+++ b/addons/website/tests/test_qweb.py
@@ -73,7 +73,7 @@ class TestQwebProcessAtt(TransactionCase):
def setUp(self):
super(TestQwebProcessAtt, self).setUp()
self.website = self.env.ref('website.default_website')
- self.env.ref('base.lang_fr').active = True
+ self.env['res.lang']._activate_lang('fr_FR')
self.website.language_ids = self.env.ref('base.lang_en') + self.env.ref('base.lang_fr')
self.website.default_lang_id = self.env.ref('base.lang_en')
self.website.cdn_activated = True