matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't try to set locale preferences for new users or existing users that have not set any preferences.

Browse Source
This commit is contained in:
Roberto Rosario
2015-07-06 00:22:09 -04:00
parent 3c486e14a1
commit dcf3a77c66
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mayan/apps/common/handlers.py
View File

@@ -9,14 +9,17 @@ from .models import UserLocaleProfile
def user_locale_profile_session_config(sender, request, user, **kwargs):
user_locale_profile, created = UserLocaleProfile.objects.get_or_create(user=user)
timezone.activate(user_locale_profile.timezone)
translation.activate(user_locale_profile.language)
if not created and user_locale_profile.timezone and user_locale_profile.language:
# Don't try to set locale preferences for new users or existing users
# that have not set any preferences
timezone.activate(user_locale_profile.timezone)
translation.activate(user_locale_profile.language)
if hasattr(request, 'session'):
request.session[translation.LANGUAGE_SESSION_KEY] = user_locale_profile.language
request.session['django_timezone'] = user_locale_profile.timezone
else:
request.set_cookie(settings.LANGUAGE_COOKIE_NAME, user_locale_profile.language)
if hasattr(request, 'session'):
request.session[translation.LANGUAGE_SESSION_KEY] = user_locale_profile.language
request.session['django_timezone'] = user_locale_profile.timezone
else:
request.set_cookie(settings.LANGUAGE_COOKIE_NAME, user_locale_profile.language)
def user_locale_profile_create(sender, instance, created, **kwargs):