Add de-ls language

Makefile

@@ -26,3 +26,4 @@ commitdependencies: dependencies
 
 messagesde:
 	python manage.py makemessages -l de --ignore public --ignore froide-env --ignore node_modules --ignore htmlcov --ignore src --add-location file
+	python manage.py makemessages -l de_LS --ignore public --ignore froide-env --ignore node_modules --ignore htmlcov --ignore src --add-location file

fragdenstaat_de/settings/base.py

@@ -29,6 +29,7 @@ class FragDenStaatBase(German, Base):
 
     LANGUAGES = (
         ("de", _("German")),
+        ("de-ls", _("German (Easy Language)")),
         ("en", _("English")),
     )
 
@@ -248,6 +249,13 @@ def three_days_ago_but_not_sundays(date):
                 "redirect_on_fallback": True,
                 "fallbacks": ["de"],
             },
+            {
+                "public": True,
+                "code": "de-ls",
+                "hide_untranslated": True,
+                "name": _("German (Easy Language)"),
+                "redirect_on_fallback": True,
+            },
         ],
     }
 
@@ -557,7 +565,7 @@ def GEOIP_PATH(self):
         "cms.middleware.user.CurrentUserMiddleware",
         "cms.middleware.page.CurrentPageMiddleware",
         "cms.middleware.toolbar.ToolbarMiddleware",
-        "fragdenstaat_de.theme.cms_utils.HostLanguageCookieMiddleware",
+        "fragdenstaat_de.theme.cms_utils.LanguageUtilsMiddleware",
     ]
 
     CACHES = {

fragdenstaat_de/theme/cms_utils.py

@@ -1,11 +1,30 @@
 from django.conf import settings
+from django.shortcuts import redirect
 
 from cms.middleware.language import LanguageCookieMiddleware
 
 
-class HostLanguageCookieMiddleware(LanguageCookieMiddleware):
+class LanguageUtilsMiddleware(LanguageCookieMiddleware):
     def __call__(self, request):
-        """Don't set django_language cookie on non-primary domain"""
-        if request.META.get("HTTP_HOST") != settings.ALLOWED_HOSTS[0]:
+        """
+        Don't set django_language cookie on non-primary domain
+        Also redirect non-CMS pages to default language if the request is for a sub-language.
+        Needs to be placed after:
+          - django.middleware.locale.LocaleMiddleware
+          - cms.middleware.page.CurrentPageMiddleware
+        """
+        if (
+            not settings.DEBUG
+            and request.META.get("HTTP_HOST") != settings.ALLOWED_HOSTS[0]
+        ):
             return self.get_response(request)
+        if (
+            request.method == "GET"
+            and request.LANGUAGE_CODE != settings.LANGUAGE_CODE
+            and request.LANGUAGE_CODE.startswith(settings.LANGUAGE_CODE)
+            and not request.current_page
+        ):
+            path = request.get_full_path().removeprefix(f"/{request.LANGUAGE_CODE}")
+            return redirect(path, permanent=True)
+
         return super().__call__(request)