From 85f0720c50487e8f790f6b72c7c6fbc3ad4c29ba Mon Sep 17 00:00:00 2001
From: Matthew Piatetsky <mpiatetsky@edx.org>
Date: Wed, 15 May 2019 12:57:22 -0400
Subject: [PATCH] fix broken FBE banner dates in firefox

---
 lms/djangoapps/courseware/tests/helpers.py                  | 4 ++--
 openedx/features/course_duration_limits/access.py           | 6 +++---
 .../features/course_duration_limits/tests/test_access.py    | 2 +-
 .../course_experience/tests/views/test_course_home.py       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lms/djangoapps/courseware/tests/helpers.py b/lms/djangoapps/courseware/tests/helpers.py
index e2b2a1c165..8cde4a7761 100644
--- a/lms/djangoapps/courseware/tests/helpers.py
+++ b/lms/djangoapps/courseware/tests/helpers.py
@@ -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)
         )
 
diff --git a/openedx/features/course_duration_limits/access.py b/openedx/features/course_duration_limits/access.py
index 3b002eac14..b33d5d3c75 100644
--- a/openedx/features/course_duration_limits/access.py
+++ b/openedx/features/course_duration_limits/access.py
@@ -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)
             )
 
diff --git a/openedx/features/course_duration_limits/tests/test_access.py b/openedx/features/course_duration_limits/tests/test_access.py
index c882fae6a1..bb16792afd 100644
--- a/openedx/features/course_duration_limits/tests/test_access.py
+++ b/openedx/features/course_duration_limits/tests/test_access.py
@@ -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),
diff --git a/openedx/features/course_experience/tests/views/test_course_home.py b/openedx/features/course_experience/tests/views/test_course_home.py
index 09c18f2dcc..3e0a0a92a4 100644
--- a/openedx/features/course_experience/tests/views/test_course_home.py
+++ b/openedx/features/course_experience/tests/views/test_course_home.py
@@ -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(