Skip to content
Snippets Groups Projects
Unverified Commit f624b2c9 authored by Jeff LaJoie's avatar Jeff LaJoie Committed by GitHub
Browse files

Merge pull request #23361 from edx/jlajoie/local-time-for-dates-tab

Uses user local time for dates tab
parents f395e5f5 bbfb630a
No related branches found
Tags release-2020-03-10-17.21
No related merge requests found
......@@ -131,6 +131,7 @@ from xmodule.modulestore.exceptions import ItemNotFoundError, NoPathToItem
from xmodule.tabs import CourseTabList
from xmodule.x_module import STUDENT_VIEW
from ..context_processor import user_timezone_locale_prefs
from ..entrance_exams import user_can_skip_entrance_exam
from ..module_render import get_module, get_module_by_usage_id, get_module_for_descriptor
......@@ -1050,6 +1051,12 @@ def dates(request, course_id):
include_access=True, include_past_dates=True)
enrollment = get_enrollment(request.user.username, course_id)
learner_is_verified = False
# User locale settings
user_timezone_locale = user_timezone_locale_prefs(request)
user_timezone = user_timezone_locale['user_timezone']
user_language = user_timezone_locale['user_language']
if enrollment:
learner_is_verified = enrollment.get('mode') == 'verified'
......@@ -1058,6 +1065,8 @@ def dates(request, course_id):
'course_date_blocks': [block for block in course_date_blocks if block.title != 'current_datetime'],
'verified_upgrade_link': verified_upgrade_deadline_link(request.user, course=course),
'learner_is_verified': learner_is_verified,
'user_timezone': user_timezone,
'user_language': user_language,
}
return render_to_response('courseware/dates.html', context)
......
......@@ -2,6 +2,7 @@
<%inherit file="/main.html" />
<%namespace name='static' file='/static_content.html'/>
<%!
from django.utils.translation import ugettext as _
from lms.djangoapps.courseware.date_summary import CourseAssignmentDate, VerificationDeadlineDate, VerifiedUpgradeDeadlineDate
from openedx.core.djangolib.markup import HTML, Text
......@@ -36,7 +37,7 @@ from openedx.core.djangolib.markup import HTML, Text
<div class="timeline-date-content">
% if block.date:
<div class="timeline-date">
${block.date.strftime(block.date_format)}
<div class="course-date localized_datetime" aria-hidden="true" data-format="shortDate" data-datetime="${block.date}" data-language="${user_language}" data-timezone="${user_timezone}"></div>
</div>
% if active:
<div class="pill due">${_('Due Today')}</div>
......@@ -71,3 +72,7 @@ from openedx.core.djangolib.markup import HTML, Text
</div>
</div>
</main>
<%static:require_module_async module_name="js/dateutil_factory" class_name="DateUtilFactory">
DateUtilFactory.transform(iterationKey=".localized_datetime");
</%static:require_module_async>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment