Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lms/djangoapps/courseware/context_processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
to the templates without having to append every view file.

"""

from django.utils.translation import get_language
from pytz import timezone

from edx_django_utils.cache import TieredCache
Expand Down Expand Up @@ -38,7 +38,7 @@ def user_timezone_locale_prefs(request):
if not cached_value:
user_prefs = {
'user_timezone': None,
'user_language': None,
'user_language': get_language(),
}
if hasattr(request, 'user') and request.user.is_authenticated:
try:
Expand Down
3 changes: 2 additions & 1 deletion lms/djangoapps/courseware/tests/test_context_processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

from pytz import timezone
from unittest.mock import Mock, patch # lint-amnesty, pylint: disable=wrong-import-order
from django.conf import settings
from django.contrib.auth.models import AnonymousUser

from lms.djangoapps.courseware.context_processor import (
Expand Down Expand Up @@ -32,7 +33,7 @@ def test_anonymous_user(self):
self.request.user = AnonymousUser()
context = user_timezone_locale_prefs(self.request)
assert context['user_timezone'] is None
assert context['user_language'] is None
assert context['user_language'] == settings.LANGUAGE_CODE

def test_no_timezone_preference(self):
set_user_preference(self.user, 'pref-lang', 'en')
Expand Down