0.5: Django 3.2 support, drop Django<1.11, Python<3.6, remove some compatibility...

[fnpdjango.git] / fnpdjango / middleware.py

diff --git a/fnpdjango/middleware.py b/fnpdjango/middleware.py
index 21de872..14ac28e 100644 (file)
--- a/fnpdjango/middleware.py
+++ b/fnpdjango/middleware.py
@@ -1,31 +1,13 @@
-from django.utils import translation
-from django.conf import settings
-from django.http import Http404
+from django.utils.deprecation import MiddlewareMixin
+from . import app_settings
 
 
-class SetRemoteAddrFromXRealIP(object):
+class SetRemoteAddrFromXRealIP(MiddlewareMixin):
     """Sets REMOTE_ADDR from the X-Real-IP header, as set by Nginx."""
     def process_request(self, request):
-        try:
-            request.META['REMOTE_ADDR'] = request.META['HTTP_X_REAL_IP']
-        except KeyError:
-            return None
-
-
-class URLLocaleMiddleware(object):
-    """Decides which translation to use, based on path only."""
-
-    def process_request(self, request):
-        language = translation.get_language_from_path(request.path_info)
-        if language == settings.LANGUAGE_CODE:
-            raise Http404
-        if language:
-            translation.activate(language)
-        request.LANGUAGE_CODE = translation.get_language()
-
-    def process_response(self, request, response):
-        language = translation.get_language()
-        translation.deactivate()
-        if 'Content-Language' not in response:
-            response['Content-Language'] = language
-        return response
+        if app_settings.REALIP:
+            try:
+                request.META['REMOTE_ADDR'] = request.META['HTTP_X_REAL_IP']
+            except KeyError:
+                pass
+        return None