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

Revert "Revert "change banner date localization to use dateutilfactory""

Browse Source 
This reverts commit 08cb56664b.
This commit is contained in:
Matthew Piatetsky
2019-01-22 11:08:57 -05:00
parent dd1fdb3fa1
commit b37bc75bb4
4 changed files with 132 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,13 +172,13 @@ class LoginEnrollmentTestCase(TestCase):
self.user = self.activate_user(self.email)
self.login(self.email, self.password)
def assert_request_status_code(self, status_code, url, method="GET", **kwargs):
def assert_request_status_code(self, status_code, url, method="GET", **kwargs): # pylint: disable=unicode-format-string
make_request = getattr(self.client, method.lower())
response = make_request(url, **kwargs)
self.assertEqual(
response.status_code, status_code,
"{method} request to {url} returned status code {actual}, "
"expected status code {expected}".format(
u"{method} request to {url} returned status code {actual}, "
u"expected status code {expected}".format(
method=method, url=url,
actual=response.status_code, expected=status_code
)
@@ -355,7 +355,7 @@ def _create_mock_json_request(user, data, method='POST'):
return request
def get_expiration_banner_text(user, course, language='en-us'):
def get_expiration_banner_text(user, course, language='en'):
"""
Get text for banner that messages user course expiration date
for different tests that depend on it.
@@ -367,19 +367,21 @@ def get_expiration_banner_text(user, course, language='en-us'):
if upgrade_deadline is None or now() < upgrade_deadline:
upgrade_deadline = enrollment.course_upgrade_deadline
language_is_es = language and language.split('-')[0].lower() == 'es'
if language_is_es:
formatted_expiration_date = strftime_localized(expiration_date, '%-d de %b. de %Y').lower()
else:
formatted_expiration_date = strftime_localized(expiration_date, '%b. %-d, %Y')
date_string = u'<span class="localized-datetime" data-format="shortDate" \
data-datetime="{formatted_date}" data-language="{language}">{formatted_date_localized}</span>'
formatted_expiration_date = date_string.format(
language=language,
formatted_date=expiration_date.strftime(u'%b %-d, %Y'),
formatted_date_localized=strftime_localized(expiration_date, u'%b %-d, %Y')
)
if upgrade_deadline:
if language_is_es:
formatted_upgrade_deadline = strftime_localized(upgrade_deadline, '%-d de %b. de %Y').lower()
else:
formatted_upgrade_deadline = strftime_localized(upgrade_deadline, '%b. %-d, %Y')
formatted_upgrade_deadline = date_string.format(
language=language,
formatted_date=upgrade_deadline.strftime(u'%b %-d, %Y'),
formatted_date_localized=strftime_localized(upgrade_deadline, u'%b %-d, %Y')
)
bannerText = '<strong>Audit Access Expires {expiration_date}</strong><br>\
bannerText = u'<strong>Audit Access Expires {expiration_date}</strong><br>\
You lose all access to this course, including your progress, on {expiration_date}.\
<br>Upgrade by {upgrade_deadline} to get unlimited access to the course as long as it exists\
on the site. <a href="{upgrade_link}">Upgrade now<span class="sr-only"> to retain access past\
@@ -389,7 +391,7 @@ def get_expiration_banner_text(user, course, language='en-us'):
upgrade_deadline=formatted_upgrade_deadline
)
else:
bannerText = '<strong>Audit Access Expires {expiration_date}</strong><br>\
bannerText = u'<strong>Audit Access Expires {expiration_date}</strong><br>\
You lose all access to this course, including your progress, on {expiration_date}.\
'.format(
expiration_date=formatted_expiration_date