Merge pull request #553 from edx/adam/i18n-bug-fixes

Adam/i18n bug fixes

conf/locale/config

 {
- "locales" : ["en", "zh_CN"],
+ "locales" : ["en"],
  "dummy-locale" : "fr"
 }

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)
 

lms/templates/contact.html

@@ -26,7 +26,7 @@
         contact_email=settings.CONTACT_EMAIL,
         faq_link_start='<a href="{url}">'.format(url=reverse('faq_edx')),
         faq_link_end='</a>',
-        fb_link_start='<a href="http://www.facebook.com/EdxOnline">'.
+        fb_link_start='<a href="http://www.facebook.com/EdxOnline">',
         fb_link_end='</a>'
       )}</p>
 
@@ -45,7 +45,7 @@
         )}</p>
 
       <h2>${_("Universities")}</h2>
-      <p>${_('If you are a university wishing to collaborate with or if you have questions about {platform_name}, please email {email}.'.format(email='<a href="mailto:university@edx.org">university@edx.org</a>', platform_name="edX")}</p>
+      <p>${_('If you are a university wishing to collaborate with or if you have questions about {platform_name}, please email {email}.').format(email='<a href="mailto:university@edx.org">university@edx.org</a>', platform_name="edX")}</p>
     </div>
   </section>
 </section>

lms/templates/help_modal.html

@@ -15,7 +15,7 @@
 <section id="help-modal" class="modal">
   <div class="inner-wrapper" id="help_wrapper">
     <header>
-      <h2>${_('{span_start}{platform_name}{span_end} Help').format(span_start='<span class="edx">', span_end='</span>').format(platform_name=settings.PLATFORM_NAME)}</h2>
+      <h2>${_('{span_start}{platform_name}{span_end} Help').format(span_start='<span class="edx">', span_end='</span>', platform_name=settings.PLATFORM_NAME)}</h2>
       <hr>
     </header>
 

lms/templates/name_changes.html

@@ -8,7 +8,7 @@ function name_confirm(id) {
           if(data.success){
             $("#div"+id).html(${_("Accepted")});
           } else {
-            alert(${_('Error'));
+            alert(${_('Error')});
 }          }
      });
 }
@@ -19,7 +19,7 @@ function name_deny(id) {
           if(data.success){
             $("#div"+id).html(${_("Rejected")});
           } else {
-            alert(${_('Error'));
+            alert(${_('Error')});
 }          }
      });
 }

lms/templates/test_center_register.html

@@ -476,7 +476,7 @@
 
     <div class="details details-contact">
       <h4>${_('Questions')}</h4>
-      <p>${_('If you have a specific question pertaining to your registration, you may {contact_link_start}contact edX at exam-help@edx.org{contact_link_end}.').format(contact_link_start='<a class="contact-link" href="{}"'.format(exam_help_href), contact_link_end='</a>')</p>
+      <p>${_('If you have a specific question pertaining to your registration, you may {contact_link_start}contact edX at exam-help@edx.org{contact_link_end}.').format(contact_link_start='<a class="contact-link" href="{}"'.format(exam_help_href), contact_link_end='</a>')}</p>
     </div>
   </aside>
 </section>