diff --git a/conf/locale/config b/conf/locale/config index 3a0b04adbb..67252b1fa0 100644 --- a/conf/locale/config +++ b/conf/locale/config @@ -1,4 +1,4 @@ { - "locales" : ["en", "zh_CN"], + "locales" : ["en"], "dummy-locale" : "fr" } diff --git a/i18n/tests/test_generate.py b/i18n/tests/test_generate.py index b9a36ada33..f18dff0320 100644 --- a/i18n/tests/test_generate.py +++ b/i18n/tests/test_generate.py @@ -46,7 +46,7 @@ class TestGenerate(TestCase): path = os.path.join(CONFIGURATION.get_messages_dir(locale), mofile) exists = os.path.exists(path) self.assertTrue(exists, msg='Missing file in locale %s: %s' % (locale, mofile)) - self.assertTrue(datetime.fromtimestamp(os.path.getmtime(path)) >= self.start_time, + self.assertTrue(datetime.fromtimestamp(os.path.getmtime(path), UTC) >= self.start_time, msg='File not recently modified: %s' % path) self.assert_merge_headers(locale) diff --git a/lms/templates/contact.html b/lms/templates/contact.html index cb35aca359..c23e74c19a 100644 --- a/lms/templates/contact.html +++ b/lms/templates/contact.html @@ -26,7 +26,7 @@ contact_email=settings.CONTACT_EMAIL, faq_link_start=''.format(url=reverse('faq_edx')), faq_link_end='', - fb_link_start=''. + fb_link_start='', fb_link_end='' )}

@@ -45,7 +45,7 @@ )}

${_("Universities")}

-

${_('If you are a university wishing to collaborate with or if you have questions about {platform_name}, please email {email}.'.format(email='university@edx.org', platform_name="edX")}

+

${_('If you are a university wishing to collaborate with or if you have questions about {platform_name}, please email {email}.').format(email='university@edx.org', platform_name="edX")}

diff --git a/lms/templates/help_modal.html b/lms/templates/help_modal.html index abec5cd21d..6692d02d09 100644 --- a/lms/templates/help_modal.html +++ b/lms/templates/help_modal.html @@ -15,7 +15,7 @@