Reinstate dj1.6 fallback which coincidentially also covers dj4 :-)

Martin J. Laubach · Martin J. Laubach · commit fe147ec0fcf7 · 2022-05-10T14:59:27.000+02:00
diff --git a/feincms/extensions/translations.py b/feincms/extensions/translations.py
@@ -35,10 +35,12 @@
 logger = logging.getLogger(__name__)
 
 LANGUAGE_COOKIE_NAME: str = django_settings.LANGUAGE_COOKIE_NAME
-try:
+if hasattr(translation, "LANGUAGE_SESSION_KEY"):
     LANGUAGE_SESSION_KEY = translation.LANGUAGE_SESSION_KEY
-except AttributeError:  # stopgap measure for django >= 4, need to revisit this later
-    LANGUAGE_SESSION_KEY = '_language'
+else:
+    # stopgap measure for django >= 4, need to revisit this later
+    LANGUAGE_SESSION_KEY = LANGUAGE_COOKIE_NAME
+
 PRIMARY_LANGUAGE: str = django_settings.LANGUAGES[0][0]
 
 # ------------------------------------------------------------------------
diff --git a/tests/testapp/tests/test_extensions.py b/tests/testapp/tests/test_extensions.py
@@ -74,7 +74,6 @@ def testPage(self):
         # TODO:  add request tests
         # with translation.override('de'):
 
-    @skipIf(VERSION >= (4, 0), "Language no longer saved to session in django 4+")
     def test_user_has_language_set_with_session(self):
         factory = RequestFactory()
         request = factory.get(self.page_en.get_navigation_url())
@@ -89,7 +88,6 @@ def test_user_has_language_set_with_cookie(self):
 
         self.assertEqual(user_has_language_set(request), True)
 
-    @skipIf(VERSION >= (4, 0), "Language no longer saved to session in django 4+")
     def test_translation_set_language_to_session(self):
         factory = RequestFactory()
         request = factory.get(self.page_de.get_navigation_url())
@@ -99,14 +97,14 @@ def test_translation_set_language_to_session(self):
         self.assertEqual(request.LANGUAGE_CODE, "de")
         self.assertEqual(request.session[self.language_session_key], "de")
 
-    @skipIf(VERSION >= (4, 0), "Language no longer saved to session in django 4+")
     def test_translation_set_language_to_session_primary(self):
         factory = RequestFactory()
         request = factory.get(self.page_en.get_navigation_url())
         setattr(request, "session", dict())
         translation_set_language(request, "en")
 
         self.assertEqual(request.LANGUAGE_CODE, "en")
+        # We avoid setting the translation language to the primary language, so should not be set
         self.assertEqual(request.session.get(self.language_session_key, 'unset'), "unset")
 
     def test_translation_set_language_to_cookie(self):
