Skip to content

fix: course discovery dates localization after user logout #29773

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
github-actions merged 1 commit into from
Feb 9, 2022
Merged

fix: course discovery dates localization after user logout #29773

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
4 changes: 2 additions & 2 deletions lms/djangoapps/bulk_user_retirement/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def test_retirement_for_multiple_users(self):
"usernames": f'{self.user3.username},{self.user4.username}'
})
assert response.status_code == 200
assert response.data == expected_response
assert sorted(response.data['successful_user_retirements']) == sorted(expected_response['successful_user_retirements']) # pylint: disable=line-too-long

@dyudyunov dyudyunov Jan 17, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was already fixed in the master: d061f64


retirement_status_1 = UserRetirementStatus.objects.get(user__username=self.user3.username)
assert retirement_status_1.current_state == self.pending_state
Expand All @@ -107,7 +107,7 @@ def test_retirement_for_multiple_users_with_some_nonexisting_users(self):
)
})
assert response.status_code == 200
assert response.data == expected_response
assert sorted(response.data['successful_user_retirements']) == sorted(expected_response['successful_user_retirements']) # pylint: disable=line-too-long

retirement_status_1 = UserRetirementStatus.objects.get(user__username=self.user3.username)
assert retirement_status_1.current_state == self.pending_state
Expand Down
4 changes: 2 additions & 2 deletions lms/djangoapps/courseware/context_processor.py
View file
Open in desktop
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 @@ -35,7 +35,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
View file
Open in desktop
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
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