X-Git-Url: https://git.mdrn.pl/fnpdjango.git/blobdiff_plain/3db2da0f3aecda70b20c05bcde42e30353dceb05..refs/heads/master:/fnpdjango/middleware.py diff --git a/fnpdjango/middleware.py b/fnpdjango/middleware.py index fcf4c36..14ac28e 100644 --- a/fnpdjango/middleware.py +++ b/fnpdjango/middleware.py @@ -1,10 +1,8 @@ -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): if app_settings.REALIP: @@ -13,22 +11,3 @@ class SetRemoteAddrFromXRealIP(object): except KeyError: pass 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