Merge pull request #4138 from GeotrekCE/fix_consistency

Fix tests with tanslation problems
GeotrekCE · May 30, 2024 · f1c4158 · f1c4158
2 parents 9b0d118 + 8a87b7c
commit f1c4158
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/geotrek/api/management/commands/sync_mobile.py b/geotrek/api/management/commands/sync_mobile.py
@@ -474,12 +474,11 @@ def sync(self):
                 )
                 current_value = current_value + step_value
 
-            translation.activate(lang)
-            self.sync_settings_json(lang)
-            if 'geotrek.flatpages' in settings.INSTALLED_APPS:
-                self.sync_flatpage(lang)
-            self.sync_trekking(lang)
-            translation.deactivate()
+            with translation.override(lang):
+                self.sync_settings_json(lang)
+                if 'geotrek.flatpages' in settings.INSTALLED_APPS:
+                    self.sync_flatpage(lang)
+                self.sync_trekking(lang)
 
     def check_dst_root_is_empty(self):
         if not os.path.exists(self.dst_root):

diff --git a/geotrek/common/management/commands/unset_structure.py b/geotrek/common/management/commands/unset_structure.py
@@ -1,9 +1,7 @@
 from collections import defaultdict
 
 from django.apps import apps
-from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
-from django.utils import translation
 from django.db.models import ManyToManyField
 
 
@@ -77,7 +75,6 @@ def handle_related_model(self, RelatedModel, subitems):
         related_objs.delete()
 
     def handle(self, *args, **options):
-        translation.activate(settings.LANGUAGE_CODE)
         self.options = options
         self.get_all_items()
 

diff --git a/geotrek/flatpages/migrations/0011_migrate_flatpage_data.py b/geotrek/flatpages/migrations/0011_migrate_flatpage_data.py
@@ -134,9 +134,9 @@ class FlatPageTO(TranslationOptions):
         for src, dst in menu_fields.items():
             if src in flatpage_translated_fields:
                 for lang in settings.MODELTRANSLATION_LANGUAGES:
-                    translation.activate(lang)
-                    loc_dst = build_localized_fieldname(dst, lang)
-                    menu_kwargs[loc_dst] = getattr(page, src)
+                    with translation.override(lang):
+                        loc_dst = build_localized_fieldname(dst, lang)
+                        menu_kwargs[loc_dst] = getattr(page, src)
             else:
                 menu_kwargs[dst] = getattr(page, src)
 

diff --git a/geotrek/trekking/tests/test_translation.py b/geotrek/trekking/tests/test_translation.py
@@ -81,14 +81,10 @@ def test_admin_set_trad(self):
         # Test language translation for DifficultyLevel.difficulty works
         # Given the language set, it returns the appropriate version (fr, it, en)
 
-        orig_language = translation.get_language_from_request(response._request)
-
         difficulty_trad = self.get_dummy_data_trad()
         intervention_difficulty = iss[0]
 
         for language in ('fr', 'it', 'en'):
-            translation.activate(language)
-            translated_difficulty = difficulty_trad['difficulty_%s' % language]
-            self.assertEqual(intervention_difficulty.difficulty, translated_difficulty)
-
-        translation.activate(orig_language)
+            with translation.override(language):
+                translated_difficulty = difficulty_trad['difficulty_%s' % language]
+                self.assertEqual(intervention_difficulty.difficulty, translated_difficulty)