Skip to content

fix: fix issues with LANGUAGE_CODE for legacy UI [BB-4823] [OSPR-6196] #29180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmyatt merged 1 commit into from
Nov 9, 2021
Merged

fix: fix issues with LANGUAGE_CODE for legacy UI [BB-4823] [OSPR-6196] #29180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions lms/djangoapps/courseware/context_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

from edx_django_utils.cache import TieredCache
from lms.djangoapps.courseware.models import LastSeenCoursewareTimezone
from openedx.core.djangoapps.site_configuration.helpers import get_value
from openedx.core.djangoapps.user_api.errors import UserAPIInternalError, UserNotFound
from openedx.core.djangoapps.user_api.preferences.api import get_user_preference, get_user_preferences
from openedx.core.lib.cache_utils import get_cache
Expand All @@ -26,6 +27,8 @@ def user_timezone_locale_prefs(request):
"""
Checks if request has an authenticated user.
If so, sends set (or none if unset) time_zone and language prefs.
If site-wide language is set, that language is used over the language set
in user preferences.

This interacts with the DateUtils to either display preferred or attempt to determine
system/browser set time_zones and languages
Expand All @@ -47,6 +50,9 @@ def user_timezone_locale_prefs(request):
key: user_preferences.get(pref_name, None)
for key, pref_name in RETRIEVABLE_PREFERENCES.items()
}
site_wide_language = get_value('LANGUAGE_CODE', None)
if site_wide_language:
user_prefs['user_language'] = site_wide_language

cached_value.update(user_prefs)
return cached_value
Expand Down
9 changes: 8 additions & 1 deletion lms/djangoapps/courseware/tests/test_context_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"""

from pytz import timezone
from unittest.mock import Mock
from unittest.mock import Mock, patch
from django.contrib.auth.models import AnonymousUser

from lms.djangoapps.courseware.context_processor import (
Expand Down Expand Up @@ -48,6 +48,13 @@ def test_no_language_preference(self):
assert context['user_timezone'] is not None
assert context['user_timezone'] == 'Asia/Tokyo'

@patch("lms.djangoapps.courseware.context_processor.get_value")
def test_site_wide_language_set(self, mock_get_value):
mock_get_value.return_value = 'ar'
set_user_preference(self.user, 'pref-lang', 'en')
context = user_timezone_locale_prefs(self.request)
assert context['user_language'] == 'ar'

def test_get_user_timezone_or_last_seen_timezone_or_utc(self):
# We default to UTC
course = CourseFactory()
Expand Down