CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix #212 -- Different priorization of locale sources between backend and frontend

Browse Source
This commit is contained in:
Raphael Michel
2019-02-18 15:12:05 +01:00
parent 0c1738b9bb
commit c202286470
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/pretix/base/middleware.py
View File

@@ -129,6 +129,7 @@ def get_language_from_request(request: HttpRequest) -> str:
if _supported is None: if _supported is None:
_supported = OrderedDict(settings.LANGUAGES) _supported = OrderedDict(settings.LANGUAGES)
if request.path.startswith(get_script_prefix() + 'control'):
return ( return (
get_language_from_user_settings(request) get_language_from_user_settings(request)
or get_language_from_session_or_cookie(request) or get_language_from_session_or_cookie(request)
@@ -136,6 +137,14 @@ def get_language_from_request(request: HttpRequest) -> str:
or get_language_from_event(request) or get_language_from_event(request)
or get_default_language() 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): def _parse_csp(header):