Put mailto and em tags outside i18n strings

Signup modal

Contact us form

courseware-error message

lms/templates/contact.html

@@ -21,21 +21,34 @@
       <p>${_("We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that&nbsp;class.")}</p>
 
       <h2>${_("General Inquiries and Feedback")}</h2>
-      <p>${_('If you have a general question about {platform_name} please email <a href="mailto:{contact_email}">{contact_email}</a>. To see if your question has already been answered, visit our {faq_link_start}FAQ page{faq_link_end}. You can also join the discussion on our {fb_link_start}facebook page{fb_link_end}. Though we may not have a chance to respond to every email, we take all feedback into consideration.').format(
-        platform_name=settings.PLATFORM_NAME,
-        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_end='</a>'
-      )}</p>
+      <p>
+	${_('If you have a general question about {platform_name} please email '
+	'{contact_email}. To see if your question has already been answered, '
+	'visit our {faq_link_start}FAQ page{faq_link_end}. You can also join the '
+	'discussion on our {fb_link_start}facebook page{fb_link_end}. Though we may '
+	'not have a chance to respond to every email, we take all feedback into consideration.').format(
+            platform_name=settings.PLATFORM_NAME,
+            contact_email='<a href="mailto:{0}">{0}</a>'.format(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_end='</a>'
+	)}
+      </p>
 
       <h2>${_("Technical Inquiries and Feedback")}</h2>
-      <p>${_('If you have suggestions/feedback about the overall {platform_name} platform, or are facing general technical issues with the platform (e.g., issues with email addresses and passwords), you can reach us at <a href="mailto:{tech_email}">{tech_email}</a>. For technical questions, please make sure you are using a current version of Firefox or Chrome, and include browser and version in your e-mail, as well as screenshots or other pertinent details. If you find a bug or other issues, you can reach us at the following: <a href="mailto:{bugs_email}">{bugs_email}</a>.').format(
-        tech_email=settings.TECH_SUPPORT_EMAIL,
-        bug_email=settings.BUGS_EMAIL,
-        platform_name=settings.PLATFORM_NAME
-      )}</p>
+      <p>
+	${_('If you have suggestions/feedback about the overall {platform_name} platform, '
+	'or are facing general technical issues with the platform (e.g., issues with email '
+	'addresses and passwords), you can reach us at {tech_email}. For technical questions, '
+	'please make sure you are using a current version of Firefox or Chrome, and include '
+	'browser and version in your e-mail, as well as screenshots or other pertinent details. '
+	'If you find a bug or other issues, you can reach us at the following: {bugs_email}.').format(
+            tech_email='<a href="mailto:{0}">{0}</a>'.format(settings.TECH_SUPPORT_EMAIL),
+            bug_email='<a href="mailto:{0}">{0}</a>'.format(settings.BUGS_EMAIL),
+            platform_name=settings.PLATFORM_NAME
+	)}
+      </p>
 
       <h2>${_("Media")}</h2>
       <p>${_('Please visit our {link_start}media/press page{link_end} for more information. For any media or press inquiries, please email {email}.').format(
@@ -45,7 +58,12 @@
         )}</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=settings.PLATFORM_NAME
+	)}
+      </p>
     </div>
   </section>
 </section>

lms/templates/courseware/courseware-error.html

@@ -13,7 +13,16 @@
 
 <section class="container">
   <section class="outside-app">
-    <h1>${_('There has been an error on the {span_start}{platform_name}{span_end} servers').format(platform_name=settings.PLATFORM_NAME, span_start='<span class="edx">', span_end='</span>')}</h1>
-    <p>${_("We're sorry, this module is temporarily unavailable. Our staff is working to fix it as soon as possible. Please email us at '<a href=\"mailto:{tech_support_email}\">{tech_support_email}</a>' to report any problems or downtime.").format(tech_support_email=settings.TECH_SUPPORT_EMAIL)}</p>
+    <h1>
+      ${_('There has been an error on the {platform_name} servers').format(
+          platform_name='<span class="edx">{}</span>'.format(settings.PLATFORM_NAME)
+      )}
+    </h1>
+    <p>
+      ${_("We're sorry, this module is temporarily unavailable. Our staff is working to fix "
+      "it as soon as possible. Please email us at {tech_support_email}' to report any problems or downtime.").format(
+      tech_support_email='<a href=\"mailto:{0}\">{0}</a>'.format(settings.TECH_SUPPORT_EMAIL)
+      )}
+    </p>
   </section>
 </section>

lms/templates/module-error.html

@@ -1,8 +1,18 @@
 <%! from django.utils.translation import ugettext as _ %>
 
 <section class="outside-app">
-  <h1>${_("There has been an error on the <em>{platform_name}</em> servers").format(platform_name=settings.PLATFORM_NAME)}</h1>
-  <p>${_("We're sorry, this module is temporarily unavailable. Our staff is working to fix it as soon as possible. Please email us at <a href=\"mailto:{tech_support_email}\">{tech_support_email}</a> to report any problems or downtime.").format(platform_name=settings.PLATFORM_NAME, tech_support_email=settings.TECH_SUPPORT_EMAIL)}</p>
+  <h1>
+    ${_("There has been an error on the {platform_name} servers").format(
+        platform_name="<em>{}</em>".format(settings.PLATFORM_NAME)
+    )}
+  </h1>
+  <p>
+    ${_("We're sorry, this module is temporarily unavailable. Our staff is working "
+    "to fix it as soon as possible. Please email us at {tech_support_email} to "
+    "report any problems or downtime.").format(
+        tech_support_email="<a href=\"mailto:{0}\">{0}</a>".format(settings.TECH_SUPPORT_EMAIL)
+    )}
+  </p>
 
 % if staff_access:
 <h1>${_("Details")}</h1>

lms/templates/signup_modal.html

@@ -20,7 +20,11 @@
 
     <div id="register">
       <header>
-        <h2>${_('Sign Up for {span_start}{platform_name}{span_end}').format(span_start='<span class="edx">', span_end='</span>', platform_name=settings.PLATFORM_NAME)}</h2>
+        <h2>
+	  ${_('Sign Up for {platform_name}').format(
+	      platform_name='<span class="edx">{}</span>'.format(settings.PLATFORM_NAME)
+	  )}
+	</h2>
         <hr>
       </header>
 
@@ -123,17 +127,17 @@
         <div class="input-group">
           <label data-field="terms_of_service" class="terms-of-service" for="signup_tos">
             <input id="signup_tos" name="terms_of_service" type="checkbox" value="true">
-            ${_('I agree to the {link_start}Terms of Service{link_end}*').format(
+            ${_('I agree to the {link_start}Terms of Service{link_end}').format(
               link_start='<a href="{url}" target="_blank">'.format(url=reverse('tos')),
-              link_end='</a>')}
+              link_end='</a>') '*'}
           </label>
 
           % if settings.REGISTRATION_EXTRA_FIELDS['honor_code'] != 'hidden':
           <label data-field="honor_code" class="honor-code" for="signup_honor">
             <input id="signup_honor" name="honor_code" type="checkbox" value="true">
-            ${_('I agree to the {link_start}Honor Code{link_end}*').format(
+            ${_('I agree to the {link_start}Honor Code{link_end}').format(
               link_start='<a href="{url}" target="_blank">'.format(url=reverse('honor')),
-              link_end='</a>')}
+              link_end='</a>') '*'}
           </label>
           % endif
         </div>

lms/templates/staff_problem_info.html

@@ -35,7 +35,7 @@ ${block_content}
       <label>${_("Comment")}</label>
       <input id="${element_id}_xqa_entry" type="text" placeholder="${_('comment')}">
       <label>${_("Tag")}</label>
-      <span style="color:black;vertical-align: -10pt">${_('Optional tag (eg "done" or "broken"):&nbsp; ')}      </span>
+      <span style="color:black;vertical-align: -10pt">${_('Optional tag (eg "done" or "broken"):') + '&nbsp; '}      </span>
       <input id="${element_id}_xqa_tag" type="text" placeholder="${_('tag')}" style="width:80px;display:inline">
       <div class="submit">
         <button name="submit" type="submit">${_('Add comment')}</button>

lms/templates/static_templates/server-down.html

@@ -2,6 +2,14 @@
 <%inherit file="../main.html" />
 
 <section class="outside-app">
-  <h1>${_("Currently the <em>{platform_name}</em> servers are down").format(platform_name=settings.PLATFORM_NAME)}</h1>
-  <p>${_("Our staff is currently working to get the site back up as soon as possible. Please email us at <a href=\"mailto:{tech_support_email}\">{tech_support_email}</a> to report any problems or downtime.").format(settings.TECH_SUPPORT_EMAIL)}</p>
+  <h1>
+    ${_("Currently the {platform_name} servers are down").format(
+        platform_name="<em>{}</em>".format(settings.PLATFORM_NAME)
+    )}
+  </h1>
+  <p>
+    ${_("Our staff is currently working to get the site back up as soon as possible. "
+    "Please email us at {tech_support_email} to report any problems or downtime.").format(
+        tech_support_email="<a href=\"mailto:{0}\">{0}</a>".format(settings.TECH_SUPPORT_EMAIL)
+    )}</p>
 </section>

lms/templates/static_templates/server-error.html

@@ -2,8 +2,8 @@
 <%inherit file="../main.html" />
 
 <section class="outside-app">
-  <h1>${_(u"There has been a 500 error on the <em>{platform_name}</em> servers").format(
-    platform_name=settings.PLATFORM_NAME
+  <h1>${_(u"There has been a 500 error on the {platform_name} servers").format(
+    platform_name="<em>{}</em>".format(platform_name=settings.PLATFORM_NAME)
   )}</h1>
   <p>${_(u'Please wait a few seconds and then reload the page. If the problem persists, please email us at {email}.').format(
         email=u'<a href="mailto:{email}">{email}</a>'.format(

lms/templates/static_templates/server-overloaded.html

@@ -2,6 +2,15 @@
 <%inherit file="../main.html" />
 
 <section class="outside-app">
-  <h1>${_("Currently the <em>{platform_name}</em> servers are overloaded").format(platform_name=settings.PLATFORM_NAME)}</h1>
-  <p>${_("Our staff is currently working to get the site back up as soon as possible. Please email us at <a href=\"mailto:{tech_support_email}\">{tech_support_email}</a> to report any problems or downtime.").format(tech_support_email=settings.TECH_SUPPORT_EMAIL)}</p>
+  <h1>
+    ${_("Currently the {platform_name} servers are overloaded").format(
+        platform_name="<em>{}</em>".format(platform_name=settings.PLATFORM_NAME)
+    )}
+  </h1>
+  <p>
+    ${_("Our staff is currently working to get the site back up as soon as possible. "
+    "Please email us at {tech_support_email} to report any problems or downtime.").format(
+        tech_support_email="<a href=\"mailto:{0}\">{0}</a>".format(tech_support_email=settings.TECH_SUPPORT_EMAIL)
+    )}
+  </p>
 </section>

lms/templates/verify_student/midcourse_reverify_dash.html

@@ -25,8 +25,7 @@
                       <h3 class="course-name">${item.course_name} (${item.course_number})</h3>
                       <p class="deadline">${_('Re-verify by {date}').format(date="<strong>" + item.date + "</strong>")}</p>
                     </div>
-                    <p class="reverify-status"><a class="btn action-primary action-reverify" href="${reverse('verify_student_midcourse_reverify', kwargs={'course_id': item.course_id})}">
-			${_("Re-verify for {course_number}").format(course_number=${item.course_number})}</a></p>
+		    <p class="reverify-status"><a class="btn action-primary action-reverify" href="${reverse('verify_student_midcourse_reverify', kwargs={'course_id': item.course_id})}">Re-verify for ${item.course_number}</a></p>
                   </li>
                 % endfor
                 </ul>
@@ -43,8 +42,7 @@
                       <h3 class="course-name">${item.course_name} (${item.course_number})</h3>
                       <p class="deadline">${_('Re-verify by {date}').format(date="<strong>" + item.date + "</strong>")}</p>
                     </div>
-                    <p class="reverify-status"><a class="btn action-primary action-reverify" href="${reverse('verify_student_midcourse_reverify', kwargs={'course_id': item.course_id})}">
-			${_("Re-verify for {course_number}").format(course_number=${item.course_number})}</a></p>
+		    <p class="reverify-status"><a class="btn action-primary action-reverify" href="${reverse('verify_student_midcourse_reverify', kwargs={'course_id': item.course_id})}">Re-verify for ${item.course_number}</a></p>
                   </li>
                 % endfor
                 </ul>
@@ -96,13 +94,13 @@
           % endif
 
           % if reverifications["must_reverify"]:
-            <p class="support">${_("Don't want to re-verify right now? ") + "{a_start}{text}{a_end}".format(
+            <p class="support">${_("Don't want to re-verify right now?") + u" {a_start}{text}{a_end}".format(
 	        text=_("Return to where you left off"),
                 a_start='<a href="{url}">'.format(url=referer),
                 a_end="</a>",
               )}</p>
           % else:
-          <p class="support">${"{a_start}{text}{a_end}".format(
+          <p class="support">${u"{a_start}{text}{a_end}".format(
 	        text=_("Return to where you left off"),
                 a_start='<a href="{url}">'.format(url=referer),
                 a_end="</a>",