From 9d7efa310a05683920a8312bdb52f6a30dd35c0b Mon Sep 17 00:00:00 2001 From: Egor fureunoir Gorbunov Date: Tue, 20 May 2025 21:06:20 +0300 Subject: [PATCH] Features: 1) None; Fixes: 1) Remove unused `GrapheneLocaleMiddleware` and `CustomLocaleCommonMiddleware` from middleware stack; 2) Remove unused `get_language_from_header` import and related translation logic; Extra: 1) Clean up settings and middleware files by removing redundant locale handling logic; 2) Minor formatting adjustments for consistency. --- evibes/middleware.py | 23 ----------------------- evibes/settings/base.py | 1 - evibes/settings/graphene.py | 2 -- 3 files changed, 26 deletions(-) diff --git a/evibes/middleware.py b/evibes/middleware.py index 0893cb7d..2f3ee5b1 100644 --- a/evibes/middleware.py +++ b/evibes/middleware.py @@ -8,13 +8,10 @@ from django.core.exceptions import DisallowedHost from django.http import HttpResponseForbidden from django.middleware.common import CommonMiddleware from django.shortcuts import redirect -from django.utils import translation from rest_framework_simplejwt.authentication import JWTAuthentication from rest_framework_simplejwt.exceptions import InvalidToken from sentry_sdk import capture_exception -from evibes.utils import get_language_from_header - logger = logging.getLogger(__name__) @@ -26,12 +23,6 @@ class CustomCommonMiddleware(CommonMiddleware): return redirect(f"https://api.{config.BASE_DOMAIN}") -class CustomLocaleCommonMiddleware(CommonMiddleware): - def process_request(self, request): - request.locale = get_language_from_header(request.headers.get("Accept-Language", "")) - translation.activate(request.locale) - - class GrapheneJWTAuthorizationMiddleware: def resolve(self, next, root, info, **args): context = info.context @@ -54,20 +45,6 @@ class GrapheneJWTAuthorizationMiddleware: return user -class GrapheneLocaleMiddleware: - def resolve(self, next, root, info, **args): - context = info.context - request = context - - accept_language = request.headers.get("Accept-Language", "") - selected_language = get_language_from_header(accept_language) - request.locale = selected_language - - translation.activate(request.locale) - - return next(root, info, **args) - - class BlockInvalidHostMiddleware: def __init__(self, get_response): self.get_response = get_response diff --git a/evibes/settings/base.py b/evibes/settings/base.py index 4217da4c..c44f289a 100644 --- a/evibes/settings/base.py +++ b/evibes/settings/base.py @@ -103,7 +103,6 @@ MIDDLEWARE = [ "django.contrib.sessions.middleware.SessionMiddleware", "corsheaders.middleware.CorsMiddleware", "evibes.middleware.CustomCommonMiddleware", - "evibes.middleware.CustomLocaleCommonMiddleware", "django.middleware.csrf.CsrfViewMiddleware", "django.contrib.auth.middleware.AuthenticationMiddleware", "django.contrib.messages.middleware.MessageMiddleware", diff --git a/evibes/settings/graphene.py b/evibes/settings/graphene.py index de15e1d9..376a410c 100644 --- a/evibes/settings/graphene.py +++ b/evibes/settings/graphene.py @@ -4,12 +4,10 @@ GRAPHENE = { "MIDDLEWARE": [ "evibes.middleware.GrapheneLoggingErrorsDebugMiddleware", "evibes.middleware.GrapheneJWTAuthorizationMiddleware", - "evibes.middleware.GrapheneLocaleMiddleware", ] if DEBUG # noqa: F405 else [ "evibes.middleware.GrapheneJWTAuthorizationMiddleware", - "evibes.middleware.GrapheneLocaleMiddleware", ], "CAMELCASE_ERRORS": True, }