CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-03 14:54:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wider usage of the settings framework (#17)

Browse Source
This commit is contained in:
Raphael Michel
2015-04-01 11:54:56 +02:00
parent 42b4189703
commit cd0e1cb520
9 changed files with 198 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ class LocaleMiddleware(BaseLocaleMiddleware):
if request.user.is_authenticated():
tzname = request.user.timezone
if hasattr(request, 'event'):
tzname = request.event.timezone
tzname = request.event.settings.timezone
if tzname:
try:
timezone.activate(pytz.timezone(tzname))
@@ -72,7 +72,7 @@ def get_language_from_session_or_cookie(request) -> str:
def get_language_from_event(request) -> str:
if hasattr(request, 'event'):
lang_code = request.event.locale
lang_code = request.event.settings.locale
try:
return get_supported_language_variant(lang_code)
except LookupError: