From c202286470b4c6e1c5e5ccc797da14b57027a428 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Mon, 18 Feb 2019 15:12:05 +0100 Subject: [PATCH] Fix #212 -- Different priorization of locale sources between backend and frontend --- src/pretix/base/middleware.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/pretix/base/middleware.py b/src/pretix/base/middleware.py index fb3a21be1..291944879 100644 --- a/src/pretix/base/middleware.py +++ b/src/pretix/base/middleware.py @@ -129,13 +129,22 @@ def get_language_from_request(request: HttpRequest) -> str: if _supported is None: _supported = OrderedDict(settings.LANGUAGES) - return ( - get_language_from_user_settings(request) - or get_language_from_session_or_cookie(request) - or get_language_from_browser(request) - or get_language_from_event(request) - or get_default_language() - ) + if request.path.startswith(get_script_prefix() + 'control'): + return ( + get_language_from_user_settings(request) + or get_language_from_session_or_cookie(request) + or get_language_from_browser(request) + or get_language_from_event(request) + or get_default_language() + ) + else: + return ( + get_language_from_session_or_cookie(request) + or get_language_from_user_settings(request) + or get_language_from_browser(request) + or get_language_from_event(request) + or get_default_language() + ) def _parse_csp(header):