From ac1ac2d93d297d8544c81916f7fdce57e9c1b4d6 Mon Sep 17 00:00:00 2001
From: Adam Palay <adam@edx.org>
Date: Thu, 1 Aug 2013 13:23:37 -0400
Subject: [PATCH 1/2] i18n template fixes

syntax fix
---
 lms/templates/contact.html              | 4 ++--
 lms/templates/help_modal.html           | 2 +-
 lms/templates/name_changes.html         | 4 ++--
 lms/templates/test_center_register.html | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

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='<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>
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 @@
 <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>
 
diff --git a/lms/templates/name_changes.html b/lms/templates/name_changes.html
index d6f109a69e..58ea7db9be 100644
--- a/lms/templates/name_changes.html
+++ b/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')});
 }          }
      });
 }
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index 8dae603832..df6845e577 100644
--- a/lms/templates/test_center_register.html
+++ b/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>

From 3be155bd88b3efc50104e7fb83468cd42c28aede Mon Sep 17 00:00:00 2001
From: Adam Palay <adam@edx.org>
Date: Thu, 1 Aug 2013 13:42:39 -0400
Subject: [PATCH 2/2] fix tests, remove zh_CN from config until we have support

---
 conf/locale/config          | 2 +-
 i18n/tests/test_generate.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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)