Revert "Merge pull request #14078 from edx/yro_remove-datetimetext-functions"
This reverts commit8c0098812d, reversing changes made to5b6e2dd5ee.
This commit is contained in:
@@ -20,9 +20,7 @@
|
||||
<%static:require_module module_name="js/discovery/discovery_factory" class_name="DiscoveryFactory">
|
||||
DiscoveryFactory(
|
||||
${course_discovery_meanings | n, dump_js_escaped_json},
|
||||
getParameterByName('search_query'),
|
||||
"${user_language}",
|
||||
"${user_timezone}"
|
||||
getParameterByName('search_query')
|
||||
);
|
||||
</%static:require_module>
|
||||
</%block>
|
||||
|
||||
@@ -16,7 +16,6 @@ from openedx.core.djangolib.js_utils import (
|
||||
ProgramDetailsFactory({
|
||||
programData: ${program_data | n, dump_js_escaped_json},
|
||||
urls: ${urls | n, dump_js_escaped_json},
|
||||
userPreferences: ${user_preferences | n, dump_js_escaped_json},
|
||||
});
|
||||
</%static:require_module>
|
||||
</%block>
|
||||
|
||||
@@ -301,6 +301,26 @@ from openedx.core.lib.courses import course_image_url
|
||||
<span class="course-registration-title">${_('Registration for:')}</span>
|
||||
<span class="course-display-name">${ course.display_name | h }</span>
|
||||
</h3>
|
||||
<p class="course-meta-info" aria-describedby="course-title">
|
||||
<span class="course-dates-title">
|
||||
<%
|
||||
course_start_time = course.start_datetime_text()
|
||||
course_end_time = course.end_datetime_text()
|
||||
%>
|
||||
% if course_start_time or course_end_time:
|
||||
${_("Course Dates")}:
|
||||
%endif
|
||||
</span>
|
||||
<span class="course-display-dates">
|
||||
% if course_start_time:
|
||||
${course_start_time}
|
||||
%endif
|
||||
-
|
||||
% if course_end_time:
|
||||
${course_end_time}
|
||||
%endif
|
||||
</span>
|
||||
</p>
|
||||
<hr>
|
||||
<div class="three-col">
|
||||
% if item.status == "purchased":
|
||||
|
||||
@@ -34,6 +34,12 @@ from openedx.core.lib.courses import course_image_url
|
||||
<div class="course-title">
|
||||
<h1>
|
||||
${_("{course_name}").format(course_name=course.display_name) | h}
|
||||
<span class="course-dates">
|
||||
${_("{start_date} - {end_date}").format(
|
||||
start_date=course.start_datetime_text(),
|
||||
end_date=course.end_datetime_text()
|
||||
)}
|
||||
</span>
|
||||
</h1>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
@@ -34,6 +34,11 @@ from openedx.core.lib.courses import course_image_url
|
||||
<div class="course-title">
|
||||
<h1>
|
||||
${course.display_name | h}
|
||||
<span class="course-dates">
|
||||
${course.start_datetime_text()}
|
||||
-
|
||||
${course.end_datetime_text()}
|
||||
</span>
|
||||
</h1>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
@@ -74,6 +74,10 @@ from openedx.core.lib.courses import course_image_url
|
||||
<span class="course-registration-title">${_('Registration for:')}</span>
|
||||
<span class="course-display-name">${ course.display_name }</span>
|
||||
</h3>
|
||||
<p class="course-meta-info" aria-describedby="course-title">
|
||||
<span class="course-dates-title">${_('Course Dates:')}</span>
|
||||
<span class="course-display-dates">${ course.start_datetime_text() } - ${ course.end_datetime_text() }</span>
|
||||
</p>
|
||||
<hr>
|
||||
<div class="three-col">
|
||||
<div class="col-1">
|
||||
|
||||
@@ -13,14 +13,16 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col" ><%- gettext( "Course" ) %></th>
|
||||
<th scope="col" ></th>
|
||||
<th scope="col" ><%- gettext( "Status" ) %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
<tr>
|
||||
<td><%- courseName %></td>
|
||||
<td></td>
|
||||
<td>
|
||||
<%- _.sprintf( gettext( "Starts: %(start)s" ), { start: courseStartDate } ) %>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
|
||||
@@ -65,6 +65,7 @@ from lms.djangoapps.verify_student.views import PayAndVerifyView
|
||||
data-platform-name='${platform_name}'
|
||||
data-course-key='${course_key}'
|
||||
data-course-name='${course.display_name}'
|
||||
data-course-start-date='${course.start_datetime_text()}'
|
||||
data-courseware-url='${courseware_url}'
|
||||
data-course-mode-name='${course_mode.name}'
|
||||
data-course-mode-slug='${course_mode.slug}'
|
||||
@@ -123,3 +124,6 @@ from lms.djangoapps.verify_student.views import PayAndVerifyView
|
||||
</section>
|
||||
</div>
|
||||
</%block>
|
||||
<%static:require_module_async module_name="js/dateutil_factory" class_name="DateUtilFactory">
|
||||
DateUtilFactory.transform(iterationKey=".localized-datetime");
|
||||
</%static:require_module_async>
|
||||
|
||||
Reference in New Issue
Block a user