Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REVMI-195] Fix missing FBE banner dates in firefox (#20627)

Browse Source 
[REVMI-195] Fix missing FBE banner dates in firefox
This commit is contained in:
Matthew Piatetsky
2019-05-16 13:46:47 -04:00
committed by GitHub
parent 0f1c391134 85f0720c50
commit 3eadc332ab
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/djangoapps/courseware/tests/helpers.py
View File

@@ -371,13 +371,13 @@ def get_expiration_banner_text(user, course, language='en'):
data-datetime="{formatted_date}" data-language="{language}">{formatted_date_localized}</span>'
formatted_expiration_date = date_string.format(
language=language,
formatted_date=expiration_date.strftime(EXPIRATION_DATE_FORMAT_STR),
formatted_date=expiration_date.strftime("%Y-%m-%d"),
formatted_date_localized=strftime_localized(expiration_date, EXPIRATION_DATE_FORMAT_STR)
)
if upgrade_deadline:
formatted_upgrade_deadline = date_string.format(
language=language,
formatted_date=upgrade_deadline.strftime(EXPIRATION_DATE_FORMAT_STR),
formatted_date=upgrade_deadline.strftime("%Y-%m-%d"),
formatted_date_localized=strftime_localized(upgrade_deadline, EXPIRATION_DATE_FORMAT_STR)
)

6
openedx/features/course_duration_limits/access.py
View File

@@ -24,7 +24,7 @@ from web_fragments.fragment import Fragment
MIN_DURATION = timedelta(weeks=4)
MAX_DURATION = timedelta(weeks=18)
EXPIRATION_DATE_FORMAT_STR = u'%b. %-d, %Y'
EXPIRATION_DATE_FORMAT_STR = u'%b %-d, %Y'
class AuditExpiredError(AccessError):
@@ -170,13 +170,13 @@ def generate_course_expired_message(user, course):
date_string = get_date_string()
formatted_expiration_date = date_string.format(
language=language,
formatted_date=expiration_date.strftime(EXPIRATION_DATE_FORMAT_STR),
formatted_date=expiration_date.strftime("%Y-%m-%d"),
formatted_date_localized=strftime_localized(expiration_date, EXPIRATION_DATE_FORMAT_STR)
)
if using_upgrade_messaging:
formatted_upgrade_deadline = date_string.format(
language=language,
formatted_date=upgrade_deadline.strftime(EXPIRATION_DATE_FORMAT_STR),
formatted_date=upgrade_deadline.strftime("%Y-%m-%d"),
formatted_date_localized=strftime_localized(upgrade_deadline, EXPIRATION_DATE_FORMAT_STR)
)

2
openedx/features/course_duration_limits/tests/test_access.py
View File

@@ -53,7 +53,7 @@ class TestAccess(CacheIsolationTestCase):
course_upgrade_deadline = None
def format_date(date):
return strftime_localized(date, u'%b. %-d, %Y')
return strftime_localized(date, u'%b %-d, %Y')
enrollment = CourseEnrollmentFactory.create(
course__start=datetime(2018, 1, 1, tzinfo=UTC),

2
openedx/features/course_experience/tests/views/test_course_home.py
View File

@@ -581,7 +581,7 @@ class TestCourseHomePageAccess(CourseHomePageTestCase):
response = self.client.get(url)
expiration_date = strftime_localized(course.start + timedelta(weeks=4) + timedelta(days=1), u'%b. %-d, %Y')
expiration_date = strftime_localized(course.start + timedelta(weeks=4) + timedelta(days=1), u'%b %-d, %Y')
expected_params = QueryDict(mutable=True)
course_name = CourseOverview.get_from_id(course.id).display_name_with_default
expected_params['access_response_error'] = u'Access to {run} expired on {expiration_date}'.format(