replace edx with variable substitution

fixes template errors

keep tos untranslated

formatting fixes

lms/templates/admin_dashboard.html

@@ -8,7 +8,7 @@
   <section class="basic_stats">
 
     <div class="edx_summary">
-      <h2>${_("edX-wide Summary")}</h2>
+      <h2>${_("{platform_name}-wide Summary").format(platform_name=settings.PLATFORM_NAME)}</h2>
       <table style="margin-left:auto;margin-right:auto;width:50%">
       % for key in results["scalars"]:
         <tr>

lms/templates/combinedopenended/openended/open_ended.html

@@ -10,7 +10,7 @@
   <div class="message-wrapper"></div>
   <div class="grader-status">
     % if state == 'initial':
-      <span class="unanswered" style="display:inline-block;" id="status_${id}">${_(Unanswered)}</span>
+      <span class="unanswered" style="display:inline-block;" id="status_${id}">${_("Unanswered")}</span>
     % elif state == 'assessing':
       <span class="grading" id="status_${id}">${_("Submitted for grading.")}
       % if eta_message is not None:

lms/templates/contact.html

@@ -21,8 +21,9 @@
       <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 edX please email {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(
-        email='<a href="mailto:info@edx.org">info@edx.org</a>',
+      <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">'.
@@ -30,9 +31,10 @@
       )}</p>
 
       <h2>${_("Technical Inquiries and Feedback")}</h2>
-      <p>${_('If you have suggestions/feedback about the overall edX 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: {bug_email}.').format(
-        tech_email='<a href="mailto:technical@edx.org">technical@edx.org</a>',
-        bug_email='<a href="mailto:bugs@edx.org">bugs@edx.org</a>'
+      <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>
 
       <h2>${_("Media")}</h2>
@@ -43,7 +45,7 @@
         )}</p>
 
       <h2>${_("Universities")}</h2>
-      <p>${_('If you are a university wishing to Collaborate or with questions about edX, please email {email}.'.format(email='<a href="mailto:university@edx.org">university@edx.org</a>')}</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/courseware/course_about.html

@@ -66,7 +66,7 @@
   <script src="${static.url('js/course_info.js')}"></script>
 </%block>
 
-<%block name="title"><title>${_("About {course_number}").format(course_number=course.number)}</title></%block>
+<%block name="title"><title>${_("About {course.number}").format(course=course)}</title></%block>
 
 <section class="course-info">
   <header class="course-profile">
@@ -87,13 +87,13 @@
 	              %if show_courseware_link:
                     <a href="${course_target}">
                 %endif
-                <span class="register disabled">${_("You are registered for this course {course_number}").format(course_number=course.number)}</span>
+                <span class="register disabled">${_("You are registered for this course {course.number}").format(course=course)}</span>
                 %if show_courseware_link:
                     <strong>${_("View Courseware")}</strong>
                     </a>
                 %endif
         %else:
-            <a href="#" class="register">${_("Register for {course_number}").format(course_number=course.number)}</a>
+            <a href="#" class="register">${_("Register for {course.number}").format(course=course)}</a>
             <div id="register_error"></div>
         %endif
         </div>

lms/templates/courseware/courses.html

@@ -17,7 +17,7 @@
           % endif
         </div>
         % if self.stanford_theme_enabled():
-          <h2>${_("Explore free courses from Stanford University.")}</h2>
+          <h2>${_("Explore free courses from {university_name}.").format(university_name="Stanford University")}</h2>
         % else:
           <h2>${_("Explore free courses from leading universities.")}</h2>
         % endif

lms/templates/courseware/courseware-error.html

@@ -2,8 +2,8 @@
 <%inherit file="/main.html" />
 <%namespace name='static' file='../static_content.html'/>
 <%block name="bodyclass">courseware</%block>
-## "edX" should *not* be translated
-<%block name="title"><title>${_("Courseware")} - edX</title></%block>
+## Translators: "edX" should *not* be translated
+<%block name="title"><title>${_("Courseware")} - ${settings.PLATFORM_NAME}</title></%block>
 
 <%block name="headextra">
   <%static:css group='course'/>
@@ -13,7 +13,7 @@
 
 <section class="container">
   <section class="outside-app">
-    <h1>${_('There has been an error on the {span_start}edX{span_end} servers').format(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 {email} to report any problems or downtime.").format(email='<a href="mailto:technical@edx.org">technical@edx.org</a>')}</p>
+    <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>
   </section>
 </section>

lms/templates/courseware/info.html

@@ -7,7 +7,7 @@
   <%static:css group='course'/>
 </%block>
 
-<%block name="title"><title>${course.number} ${_("Course Info")}</title></%block>
+<%block name="title"><title>${_("{course.number} Course Info").format(course=course)}</title></%block>
 
 <%include file="/courseware/course_navigation.html" args="active_page='info'" />
 <%!

lms/templates/courseware/instructor_dashboard.html

@@ -227,12 +227,12 @@ function goto( mode)
 
     <H2>${_("Student-specific grade inspection and adjustment")}</h2>
     <p>
-      ${_("Specify the edX email address or username of a student here:")}
+      ${_("Specify the {platform_name} email address or username of a student here:").format(platform_name=settings.PLATFORM_NAME)}
       <input type="text" name="unique_student_identifier">
     </p>
     <p>
       ${_("Click this, and a link to student's progress page will appear below:")}
-      <input type="submit" name="action" value="${_(\"Get link to student's progress page\")}">
+      <input type="submit" name="action" value="${_("Get link to student's progress page")}">
     </p>
     <p>
       ${_("Specify a particular problem in the course here by its url:")}
@@ -247,9 +247,9 @@ function goto( mode)
     </p>
     <p>
       ${_("Then select an action:")}
-      <input type="submit" name="action" value="${_(\"Reset student's attempts\")}">
+      <input type="submit" name="action" value="${_("Reset student's attempts")}">
       %if settings.MITX_FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS'):
-      <input type="submit" name="action" value="${_(\"Rescore student's problem submission\")}">
+      <input type="submit" name="action" value="${_("Rescore student's problem submission")}">
       %endif
     </p>
 

lms/templates/courseware/syllabus.html

@@ -6,7 +6,7 @@
   <%static:css group='course'/>
 </%block>
 
-<%block name="title"><title>${_("{course_number} Course Info").format(course_number=course.number)}</title></%block>
+<%block name="title"><title>${_("{course.number} Course Info").format(course=course)}</title></%block>
 
 <%include file="/courseware/course_navigation.html" args="active_page='syllabus'" />
 <%!
@@ -16,7 +16,7 @@
 <section class="container">
   <div class="syllabus_wrapper">
     <div class="syllabus">
-        <h1> ${_("Syllabus ")}</h1>
+        <h1>${_("Syllabus")}</h1>
         % if user.is_authenticated():
         ${get_course_syllabus_section(course, 'syllabus')}
         % else:

lms/templates/courseware/welcome-back.html

 <%! from django.utils.translation import ugettext as _ %>
 <h2>${chapter_module.display_name_with_default}</h2>
 
-<p>${_("You were most recently in {section_link}.  If you're done with that, choose another section on the left.").format(
-    section_link='<a href="{url}">{section_name}</a>'.format(
-        url=prev_section_url
-        section_name=prev_section.display_name_with_default,
-    )
-   )}</p>
+<p>${_("You were most recently in {section_link}.  If you\'re done with that, choose another section on the left.").format(
+	    section_link='<a href="{url}">{section_name}</a>'.format(
+	        url=prev_section_url,
+	        section_name=prev_section.display_name_with_default,
+	    )
+    )}</p>

lms/templates/dashboard.html

@@ -50,15 +50,11 @@
                {"new_email" : new_email, "password" : new_password},
                function(data) {
                  if (data.success) {
-<<<<<<< HEAD
-                   $("#change_email_title").html("${_('Please verify your new email')}"));
-                   $("#change_email_form").html("<p>${_('You'll receive a confirmation in your in-box. Please click the link in the email to confirm the email change.')}</p>");
-=======
                    $("#change_email_title").html("Please verify your new email");
                    $("#change_email_form").html("<p>You'll receive a confirmation in your " +
                                                 "in-box. Please click the link in the " +
                                                 "email to confirm the email change.</p>");
->>>>>>> a187bc7... fix registration
+                   $("#change_email_form").html("<p>${_('You\'ll receive a confirmation in your in-box. Please click the link in the email to confirm the email change.')}</p>");
                  } else {
                    $("#change_email_error").html(data.error).stop().css("display", "block");
                  }
@@ -144,11 +140,11 @@
 
           % if course.id in show_courseware_links_for:
             <a href="${course_target}" class="cover">
-              <img src="${course_image_url(course)}" alt="${_("{course_number} {course_name} Cover Image").format(course_number=course.number, course_name=course.display_name_with_default)}" />
+              <img src="${course_image_url(course)}" alt="${_('{course_number} {course_name} Cover Image').format(course_number='${course.number}', course_name='${course.display_name_with_default}')}" />
             </a>
           % else:
             <div class="cover">
-              <img src="${course_image_url(course)}" alt="${_("{course_number} {course_name} Cover Image").format(course_number=course.number, course_name=course.display_name_with_default)}" />
+              <img src="${course_image_url(course)}" alt="${_('{course_number} {course_name} Cover Image').format(course_number='${course.number}', course_name='${course.display_name_with_default}')}" />
             </div>
           % endif
 
@@ -205,7 +201,7 @@
                     <strong>${_("Your registration for the Pearson exam has been rejected. Please {link_start}see your registration status details{link_end}.").format(
                       link_start='<a href="{url}" id="exam_register_link">'.format(url=testcenter_register_target),
                       link_end='</a>')}</strong>
-                    ${_("Otherwise {link_start}contact edX at {email}{link_end} for further help.').format(
+                    ${_("Otherwise {link_start}contact edX at {email}{link_end} for further help.").format(
                       link_start='<a class="contact-link" href="mailto:{email}?subject=Pearson VUE Exam - {about} {number}">'.format(email="exam-help@edx.org", about=get_course_about_section(course, 'university'), number=course.number),
                       link_end='</a>',
                       email="exam-help@edx.org",
@@ -405,7 +401,7 @@
     <div id="change_name_body">
       <form id="change_name_form">
         <div id="change_name_error" class="modal-form-error"> </div>
-        <p>${_("To uphold the credibility of {platform} certificates, all name changes will be logged and recorded.".format(platform=settings.PLATFORM_NAME)}</p>
+        <p>${_("To uphold the credibility of {platform} certificates, all name changes will be logged and recorded.").format(platform=settings.PLATFORM_NAME)}</p>
         <br/>
         <fieldset>
           <div class="input-group">

lms/templates/discussion/_single_thread.html

@@ -8,7 +8,7 @@
   
     <header>
     %if thread['group_id']:
-      <div class="group-visibility-label">${_("This post visible only to group %s.") % cohort_dictionary[thread['group_id']]} </div>
+      <div class="group-visibility-label">${_("This post visible only to group {group}.").format(group=cohort_dictionary[thread['group_id']])} </div>
     %endif
       
         <a href="#" class="vote-btn discussion-vote discussion-vote-up"><span class="plus-icon">+</span> <span class='votes-count-number'>${thread['votes']['up_count']}</span></a>

lms/templates/footer.html

@@ -39,7 +39,7 @@
       <div class="colophon-about">
         <img src="${MITX_ROOT_URL}/static/images/header-logo.png" />
 
-        <p>${_("EdX is a non-profit created by founding partners Harvard and MIT whose mission is to bring the best of higher education to students of all ages anywhere in the world, wherever there is Internet access. EdX's free online MOOCs are interactive and subjects include computer science, public health, and artificial intelligence.")}</p>
+        <p>${_("{platform_name} is a non-profit created by founding partners {Harvard} and {MIT} whose mission is to bring the best of higher education to students of all ages anywhere in the world, wherever there is Internet access. {platform_name}'s free online MOOCs are interactive and subjects include computer science, public health, and artificial intelligence.").format(platform_name="EdX", Harvard="Harvard", MIT="MIT")}</p>
       </div>
     </div>
 
@@ -74,7 +74,7 @@
         </ul>
       </nav>
 
-      <p class="copyright">${_("&copy; 2013 edX, some rights reserved.")}</p>
+      <p class="copyright">${_("&copy; 2013 {platform_name}, some rights reserved.").format(platform_name=settings.PLATFORM_NAME)}</p>
 
       <nav class="nav-legal">
         <ul>

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}edX{span_end} Help').format(span_start='<span class="edx">', span_end='</span>')}</h2>
+      <h2>${_('{span_start}{platform_name}{span_end} Help').format(span_start='<span class="edx">', span_end='</span>').format(platform_name=settings.PLATFORM_NAME)}</h2>
       <hr>
     </header>
 
@@ -31,9 +31,9 @@ discussion_link = get_discussion_link(course) if course else None
     </p>
 % endif
 
-    <p>${_('Have <strong>general questions about edX</strong>? You can find lots of helpful information in the edX {link_start}FAQ{link_end}.').format(link_start='<a href="/help" target="_blank">', link_end='</a>')}</p>
+    <p>${_('Have <strong>general questions about {platform_name}</strong>? You can find lots of helpful information in the {platform_name} {link_start}FAQ{link_end}.').format(link_start='<a href="/help" target="_blank">', link_end='</a>').format(platform_name=settings.PLATFORM_NAME)}</p>
 
-    <p>${_('Have a <strong>question about something specific</strong>? You can contact the edX general support team directly:')}</p>
+    <p>${_('Have a <strong>question about something specific</strong>? You can contact the {platform_name} general support team directly:').format(platform_name=settings.PLATFORM_NAME)}</p>
     <hr>
 
     <div class="help-buttons">

lms/templates/index.html

@@ -11,7 +11,7 @@
       <div class="title">
         <hgroup>
           % if self.stanford_theme_enabled():
-            <h1>${_("Free courses from <strong>Stanford</strong>")}</h1>
+            <h1>${_("Free courses from <strong>{university_name}</strong>").format(university_name="Stanford")}</h1>
           % else:
             <h1>${_("The Future of Online Education")}</h1>
           % endif
@@ -27,7 +27,7 @@
 
             <div class="secondary-actions">
               <div class="social-sharing">
-                <div class="sharing-message">${_("Stay up to date with all edX has to offer!")}</div>
+                <div class="sharing-message">${_("Stay up to date with all {platform_name} has to offer!").format(platform_name=settings.PLATFORM_NAME)}</div>
                 <a href="https://twitter.com/edXOnline" class="share">
                   <img src="${static.url('images/social/twitter-sharing.png')}">
                 </a>
@@ -56,7 +56,7 @@
     <section class="highlighted-courses">
       ## Disable university partner logos and sites for non-edX sites
       % if not self.theme_enabled():
-        <h2>${_('Explore free courses from {span_start}edX{span_end} universities').format(span_start='<span class="edx">', span_end='</span>')}</h2>
+        <h2>${_('Explore free courses from {span_start}{platform_name}{span_end} universities').format(platform_name="edX", span_start='<span class="edx">', span_end='</span>')}</h2>
 
         <section class="university-partners university-partners2x6">
           <ol class="partners">
@@ -191,7 +191,7 @@
 </section>
 
 <%block name="js_extra">
-   <script type="text/javascript"">
+   <script type="text/javascript">
       $(window).load(function() {
          if(getParameterByName('next')) {
               $('#login').trigger("click");

lms/templates/login.html

@@ -155,7 +155,7 @@
     % if settings.MITX_FEATURES.get('AUTH_USE_OPENID'):
     <!-- <div class="cta cta-login-options-openid">
       <h3>${_("Login via OpenID")}</h3>
-      <p>${_('You can now start learning with edX by logging in with your <a rel="external" href="http://openid.net/">OpenID account</a>.')}</p>
+      <p>${_('You can now start learning with {platform_name} by logging in with your <a rel="external" href="http://openid.net/">OpenID account</a>.').format(platform_name=settings.PLATFORM_NAME)}</p>
       <a class="action action-login-openid" href="#">${_("Login via OpenID")}</a>
     </div> -->
     % endif

lms/templates/module-error.html

 <%! from django.utils.translation import ugettext as _ %>
 
 <section class="outside-app">
-  <h1>${_("There has been an error on the <em>edX</em> servers")}</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 {email} to report any problems or downtime.").format(email='<a href="mailto:technical@edx.org">technical@edx.org</a>')}</p>
+  <h1>${_("There has been an error on the <em>{platform_name}</em> servers")}</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>
 
 % if staff_access:
 <h1>${_("Details")}</h1>

lms/templates/name_changes.html

@@ -6,10 +6,10 @@ function name_confirm(id) {
   postJSON('/accept_name_change',{"id":id},
             function(data){
           if(data.success){
-            $("#div"+id).html(gettext("Accepted"));
+            $("#div"+id).html(${_("Accepted")});
           } else {
-            alert(gettext('Error'));
-          }
+            alert(${_('Error'));
+}          }
      });
 }
 
@@ -17,10 +17,10 @@ function name_deny(id) {
   postJSON('/reject_name_change',{"id":id},
             function(data){
           if(data.success){
-            $("#div"+id).html(gettext("Rejected"));
+            $("#div"+id).html(${_("Rejected")});
           } else {
-            alert(gettext('Error'));
-          }
+            alert(${_('Error'));
+}          }
      });
 }
 </script>
@@ -36,7 +36,7 @@ function name_deny(id) {
     <td>${s['new_name']|h}</td>
     <td>${s['email']|h}</td>
     <td>${s['rationale']|h}</td>
-    <td><span id="div${s['cid']}"><span onclick="name_confirm(${s['cid']});">${_("[Confirm]")}</span>
+    <td><span id="div${s['cid']}"><span onclick="name_confirm(${s['cid']});">[${_("Confirm")}]</span>
     <span onclick="name_deny(${s['cid']});">${_("[Reject]")}</span></span></td></tr>
   % endfor
   </table>

lms/templates/navigation.html

@@ -44,7 +44,7 @@ site_status_msg = get_site_status_msg(course_id)
   <h1 class="logo">
     <a href="${marketing_link('ROOT')}">
       <%block name="navigation_logo">
-        <img src="${static.url(branding.get_logo_url(request.META.get('HTTP_HOST')))}" alt="${_('edX home')}" />
+        <img src="${static.url(branding.get_logo_url(request.META.get('HTTP_HOST')))}" alt="${_('{settings.PLATFORM_NAME} home')}" />
       </%block>
     </a>
   </h1>
@@ -70,7 +70,7 @@ site_status_msg = get_site_status_msg(course_id)
         </a>
       </li>
       <li class="primary">
-        <a href="#" class="dropdown"><span class="sr">${_("More options dropdown")}</span> &#9662</a>
+        <a href="#" class="dropdown"><span class="sr">${_("More options dropdown")}</span> &#9662;</a>
         <ul class="dropdown-menu">
           <%block name="navigation_dropdown_menu_links" >
             <li><a href="${marketing_link('FAQ')}">${_("Help")}</a></li>

lms/templates/open_ended_problems/open_ended_problems.html

@@ -26,15 +26,15 @@
         %else:
         <table class="problem-list">
             <tr>
-              <th>${_("Problem Name")}</th>
-              <th>${_("Status")}</th>
-              <th>${_("Grader Type")}</th>
-              <th>${_("ETA")}</th>
+                <th>${_("Problem Name")}</th>
+                <th>${_("Status")}</th>
+                <th>${_("Grader Type")}</th>
+                <th>${_("ETA")}</th>
             </tr>
             %for problem in problem_list:
             <tr>
                 <td>
-                  <a href="${problem['actual_url']}">${problem['problem_name']}</a>
+                    <a href="${problem['actual_url']}">${problem['problem_name']}</a>
                 </td>
                 <td>
                     ${problem['state']}

lms/templates/peer_grading/peer_grading.html

@@ -14,12 +14,12 @@
             <div class="problem-list-container">
                 <table class="problem-list">
                     <tr>
-                      <th>${_("Problem Name")}</th>
-                      <th>${_("Due date")}</th>
-                      <th>${_("Graded")}</th>
-                      <th>${_("Available")}</th>
-                      <th>${_("Required")}</th>
-                      <th>${_("Progress")}</th>
+                        <th>${_("Problem Name")}</th>
+                        <th>${_("Due date")}</th>
+                        <th>${_("Graded")}</th>
+                        <th>${_("Available")}</th>
+                        <th>${_("Required")}</th>
+                        <th>${_("Progress")}</th>
                     </tr>
                 %for problem in problem_list:
                 <tr data-graded="${problem['num_graded']}" data-required="${problem['num_required']}">
@@ -34,7 +34,7 @@
                         % if problem['due']:
                             ${problem['due']}
                         % else:
-                        ${_("No due date")}
+                            ${_("No due date")}
                         % endif
                     </td>
                     <td>

lms/templates/peer_grading/peer_grading_problem.html

@@ -70,22 +70,22 @@
     <!-- Interstitial Page: Shown between calibration and grading steps -->
     <section class="interstitial-page">
         <h1>${_("Ready to grade!")}</h1>
-        <p>${_(" You have finished learning to grade, which means that you are now ready to start grading.")}</p>
+        <p>${_("You have finished learning to grade, which means that you are now ready to start grading.")}</p>
         <input type="button" class="interstitial-page-button" value="${_("Start Grading!")}" name="interstitial-page-button" />
     </section>
 
     <!-- Calibration Interstitial Page: Shown before calibration -->
     <section class="calibration-interstitial-page">
         <h1>${_("Learning to grade")}</h1>
-        <p>${_(" You have not yet finished learning to grade this problem.")}</p>
-        <p>${_(" You will now be shown a series of instructor-scored essays, and will be asked to score them yourself.")}</p>
-        <p>${_(" Once you can score the essays similarly to an instructor, you will be ready to grade your peers.")}</p>
+        <p>${_("You have not yet finished learning to grade this problem.")}</p>
+        <p>${_("You will now be shown a series of instructor-scored essays, and will be asked to score them yourself.")}</p>
+        <p>${_("Once you can score the essays similarly to an instructor, you will be ready to grade your peers.")}</p>
         <input type="button" class="calibration-interstitial-page-button" value="${_("Start learning to grade")}" name="calibration-interstitial-page-button" />
     </section>
 
     <!-- Flag submission confirmation dialog -->
     <section class="flag-submission-confirmation">
-        <h4>${_(" Are you sure that you want to flag this submission?")}</h4>
+        <h4>${_("Are you sure that you want to flag this submission?")}</h4>
         <p>
         ${_("You are about to flag a submission. You should only flag a submission that contains explicit or offensive content. If the submission is not addressed to the question or is incorrect, you should give it a score of zero and accompanying feedback instead of flagging it.")}
         </p>

lms/templates/register.html

@@ -96,7 +96,7 @@
       <!-- status messages -->
       <div role="alert" class="status message">
         <h3 class="message-title">${_("We're sorry, {platform_name} enrollment is not available in your region").format(platform_name=settings.PLATFORM_NAME)}</h3>
-        <p class="message-copy">${_("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.")}</p>
+        <p class="message-copy">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</p>
       </div>
 
       <div role="alert" class="status message submission-error" tabindex="-1">

lms/templates/registration/activation_complete.html

@@ -16,15 +16,15 @@
 
     <p>
       %if not already_active:
-      ${_("Thanks for activating your account.")}
+        ${_("Thanks for activating your account.")}
       %else:
-      ${_("This account has already been activated.")}
+        ${_("This account has already been activated.")}
       %endif
 
       %if user_logged_in:
-      ${_("Visit your {link_start}dashboard{link_end} to see your courses.").format(link_start='<a href="{url}">'.format(url=reverse('dashboard')), link_end='</a>')}
+        ${_("Visit your {link_start}dashboard{link_end} to see your courses.").format(link_start='<a href="{url}">'.format(url=reverse('dashboard')), link_end='</a>')}
       %else:
-      ${_("You can now {link_start}log in{link_end}.").format(link_start='<a href="{url}">'.format(url=reverse('signin_user')), link_end='</a>')}
+        ${_("You can now {link_start}log in{link_end}.").format(link_start='<a href="{url}">'.format(url=reverse('signin_user')), link_end='</a>')}
       %endif
     </p>
   </section>

lms/templates/registration/password_reset_confirm.html

@@ -5,7 +5,7 @@
 <html>
 <head>
 
-  <title>${_("Reset Your edX Password")}</title>
+  <title>${_("Reset Your {platform_name} Password").format(platform_name=settings.PLATFORM_NAME)}</title>
 
   {% compressed_css 'application' %}
 
@@ -53,7 +53,7 @@
   <section class="passwordreset container">
     <section class="introduction">
       <header>
-        <h1>${_("Reset Your edX Password")}</h1>
+        <h1>${_("Reset Your {platform_name} Password").format(platform_name=settings.PLATFORM_NAME)}</h1>
       </header>
     </section>
 
@@ -66,8 +66,7 @@
       <form role="form" id="passwordreset-form" method="post" data-remote="true" action="">{% csrf_token %}
         <!-- status messages -->
         <div role="alert" class="status message">
-          <h3 class="message-title">${_("We're sorry, edX enrollment is not available in your region")}</h3>
-          <p class="message-copy">${_("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.")}</p>
+          <h3 class="message-title">${_("We're sorry, {platform_name} enrollment is not available in your region").format(platform_name=settings.PLATFORM_NAME)}</h3>
         </div>
 
         <div role="alert" class="status message submission-error">

lms/templates/registration/registration_complete.html

 {% extends "registration/base.html" %}
+{% load i18n %}
 
-{% block title %}Registration complete{% endblock %}
+{% block title %}{% trans "Registration complete" %}{% endblock %}
 
 {% block content %}
-<h1>Check your email</h1>
-<p>An activation link has been sent to the email address you supplied, along with instructions for activating your account.</p>
-{% endblock %}
+<h1>{% trans Check your email %}</h1>
+<p>{% trans "An activation link has been sent to the email address you supplied, along with instructions for activating your account."%}</p>
+{% endblock %}
\ No newline at end of file

lms/templates/signup_modal.html

@@ -11,7 +11,7 @@
   <div class="inner-wrapper">
     <div id="register">
       <header>
-        <h2>${_('Sign Up for {span_start}edX{span_end}').format(span_start='<span class="edx">', span_end='</span>')}</h2>
+        <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>
         <hr>
       </header>
 
@@ -95,7 +95,7 @@
           <label data-field="mailing_address" for="signup_mailing_address">${_("Mailing address")}</label>
 	    <textarea id="signup_mailing_address" name="mailing_address"></textarea>
 
-          <label data-field="goals" for="signup_goals">${_("Goals in signing up for edX")}</label>
+          <label data-field="goals" for="signup_goals">${_("Goals in signing up for {platform_name}").format(platform_name=settings.PLATFORM_NAME)}</label>
 	    <textarea name="goals" id="signup_goals"></textarea>
 
         </div>

lms/templates/staff_problem_info.html

@@ -26,7 +26,7 @@ ${module_content}
 <section id="${element_id}_xqa-modal" class="modal xqa-modal" style="width:80%; left:20%; height:80%; overflow:auto" >
   <div class="inner-wrapper">
     <header>
-      <h2>${_("edX Content Quality Assessment")}</h2>
+      <h2>${_("{platform_name} Content Quality Assessment").format(platform_name=settings.PLATFORM_NAME)}</h2>
     </header>
 
     <form id="${element_id}_xqa_form" class="xqa_form">
@@ -60,7 +60,7 @@ location = ${location | h}
   %endfor
 </table>
 <table>
-  <tr><th>${_('edX Fields')}</th></tr>
+  <tr><th>${_('{platform_name} Fields').format(platform_name=settings.PLATFORM_NAME)}</th></tr>
   %for name, field in lms_fields:
   <tr><td>${name}</td><td><pre style="display:inline-block; margin: 0;">${field | h}</pre></td></tr>
   %endfor

lms/templates/static_templates/about.html

@@ -4,7 +4,7 @@
 
 <%inherit file="../main.html" />
 
-<%block name="title"><title>${_("About edX")}</title></%block>
+<%block name="title"><title>${_("About {edX}").format(edX="edX")}</title></%block>
 
 <section class="container about">
   <nav>
@@ -19,7 +19,7 @@
     ##   <div class="logo">
     ##     <img src="${static.url('images/edx-logo-large-bw.png')}">
     ##   </div>
-    ##   <h2 class="mission-quote">&ldquo;${_('The mission of <span class="edx">edX</span> is to enhance human fulfillment worldwide through online ## learning, transforming education in quality, efficiency and scale through technology and research, for the benefit of campus-based ## students and the worldwide community of online learners.')}&rdquo;</h2>
+    ##   <h2 class="mission-quote">&ldquo;${_('The mission of <span class="edx">{edX}</span> is to enhance human fulfillment worldwide through online ## learning, transforming education in quality, efficiency and scale through technology and research, for the benefit of campus-based ## students and the worldwide community of online learners.').format(edX="edX")}&rdquo;</h2>
     ## </div>
 
     <section class="message left">
@@ -27,8 +27,8 @@
         <img src="${static.url('images/about_1.jpg')}">
       </div>
       <article>
-      <h2>${_('About {span_start}edX{span_end}').format(span_start='<span class="edx">', span_end='</span>')}</h2>
-        <p>${_("EdX is a not-for-profit enterprise of its founding partners Harvard University and the Massachusetts Institute of Technology that features learning designed specifically for interactive study via the web. Based on a long history of collaboration and their shared educational missions, the founders are creating a new online-learning experience with online courses that reflect their disciplinary breadth.  Along with offering online courses, the institutions will use edX to research how students learn and how technology can transform learning&ndash;both on-campus and worldwide. Anant Agarwal, former Director of MIT's Computer Science and Artificial Intelligence Laboratory, serves as the first president of edX. EdX's goals combine the desire to reach out to students of all ages, means, and nations, and to deliver these teachings from a faculty who reflect the diversity of its audience. EdX is based in Cambridge, Massachusetts and is governed by MIT and Harvard.")}</p>
+      <h2>${_('About {span_start}{edX}{span_end}'.format(span_start='<span class="edx">', span_end='</span>', edX="edX"))}</h2>
+        <p>${_("{EdX} is a not-for-profit enterprise of its founding partners {harvard_university} and the {massachusetts_institute_of_technology} that features learning designed specifically for interactive study via the web. Based on a long history of collaboration and their shared educational missions, the founders are creating a new online-learning experience with online courses that reflect their disciplinary breadth.  Along with offering online courses, the institutions will use {edX} to research how students learn and how technology can transform learning&ndash;both on-campus and worldwide. Anant Agarwal, former Director of {MIT}'s Computer Science and Artificial Intelligence Laboratory, serves as the first president of {edX}. {EdX}'s goals combine the desire to reach out to students of all ages, means, and nations, and to deliver these teachings from a faculty who reflect the diversity of its audience. {EdX} is based in Cambridge, Massachusetts and is governed by {MIT} and {Harvard}.").format(edX="edX", EdX="EdX", harvard_university="Harvard University", Harvard="Harvard", MIT="MIT", massachusetts_institute_of_technology="Massachusetts Institute of Technology")}</p>
       </article>
       <hr class="fade-right-hr-divider">
     </section>
@@ -38,9 +38,9 @@
         <img src="${static.url('images/university/harvard/about-harvard.jpg')}">
       </div>
       <article>
-        <h2>${_("Harvard University")}</h2>
-        <p>${_("Harvard University is devoted to excellence in teaching, learning, and research, and to developing leaders in many disciplines who make a difference globally. Harvard faculty are engaged with teaching and research to push the boundaries of human knowledge.  The University has twelve degree-granting Schools in addition to the Radcliffe Institute for Advanced Study.")}</p>
-        <p>${_("Established in 1636, Harvard is the oldest institution of higher education in the United States. The University, which is based in Cambridge and Boston, Massachusetts, has an enrollment of over 20,000 degree candidates, including undergraduate, graduate, and professional students. Harvard has more than 360,000 alumni around the world.")}</p>
+        <h2>${_("{harvard_university}").format(harvard_university="Harvard University")}</h2>
+        <p>${_("{harvard_university} is devoted to excellence in teaching, learning, and research, and to developing leaders in many disciplines who make a difference globally. {Harvard} faculty are engaged with teaching and research to push the boundaries of human knowledge.  The University has twelve degree-granting Schools in addition to the {radcliffe_institute_for_advanced_study}.").format(harvard_university="Harvard University", Harvard="Harvard", radcliffe_institute_for_advanced_study="Radcliffe Institute for Advanced Study")}</p>
+        <p>${_("Established in 1636, {Harvard} is the oldest institution of higher education in the United States. The University, which is based in Cambridge and Boston, Massachusetts, has an enrollment of over 20,000 degree candidates, including undergraduate, graduate, and professional students. {Harvard} has more than 360,000 alumni around the world.").format(Harvard="Harvard")}</p>
       </article>
       <hr class="fade-left-hr-divider">
     </section>
@@ -50,9 +50,9 @@
         <img src="${static.url('images/university/mit/about-mit.jpg')}">
       </div>
       <article>
-        <h2>${_("Massachusetts Institute of Technology")}</h2>
-        <p>${_("The Massachusetts Institute of Technology &mdash; a coeducational, privately endowed research university founded in 1861 &mdash; is dedicated to advancing knowledge and educating students in science, technology, and other areas of scholarship that will best serve the nation and the world in the 21st century. The Institute has close to 1,000 faculty and 10,000 undergraduate and graduate students. It is organized into five Schools: Architecture and Urban Planning; Engineering; Humanities, Arts, and Social Sciences; Sloan School of Management; and Science.")}</p>
-        <p>${_("MIT's commitment to innovation has led to a host of scientific breakthroughs and technological advances. Achievements of the Institute's faculty and graduates have included the first chemical synthesis of penicillin and vitamin A, the development of inertial guidance systems, modern technologies for artificial limbs, and the magnetic core memory that made possible the development of digital computers. 78 alumni, faculty, researchers and staff have won Nobel Prizes.")}</p>
+        <h2>${_("{massachusetts_institute_of_technology}").format(massachusetts_institute_of_technology="Massachusetts Institute of Technology")}</h2>
+        <p>${_("The {massachusetts_institute_of_technology} &mdash; a coeducational, privately endowed research university founded in 1861 &mdash; is dedicated to advancing knowledge and educating students in science, technology, and other areas of scholarship that will best serve the nation and the world in the 21st century. The Institute has close to 1,000 faculty and 10,000 undergraduate and graduate students. It is organized into five Schools: Architecture and Urban Planning; Engineering; Humanities, Arts, and Social Sciences; {Sloan} School of Management; and Science.").format(massachusetts_institute_of_technology="Massachusetts Institute of Technology", Sloan="Sloan")}</p>
+        <p>${_("{MIT}'s commitment to innovation has led to a host of scientific breakthroughs and technological advances. Achievements of the Institute's faculty and graduates have included the first chemical synthesis of penicillin and vitamin A, the development of inertial guidance systems, modern technologies for artificial limbs, and the magnetic core memory that made possible the development of digital computers. 78 alumni, faculty, researchers and staff have won Nobel Prizes.")}</p>
         <p>${_("Current areas of research and education include neuroscience and the study of the brain and mind, bioengineering, cancer, energy, the environment and sustainable development, information sciences and technology, new media, financial technology, and entrepreneurship.")}</p>
       </article>
     </section>

lms/templates/static_templates/contact.html

@@ -4,7 +4,7 @@
 
 <%inherit file="../main.html" />
 
-<%block name="title"><title>${_("Contact edX")}</title></%block>
+<%block name="title"><title>${_("Contact {platform_name}").format(platform_name=settings.PLATFORM_NAME)}</title></%block>
 
 <section class="container about">
   <nav>
@@ -23,18 +23,20 @@
       <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 edX please email {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(
-        email='<a href="mailto:info@edx.org">info@edx.org</a>',
-        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 {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,
+          email='<a href="mailto:{contact_email}">{contact_email}</a>'.format(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>
 
       <h2>${_("Technical Inquiries and Feedback")}</h2>
-      <p>${_('If you have suggestions/feedback about the overall edX 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: {bug_email}.').format(
-        tech_email='<a href="mailto:technical@edx.org">technical@edx.org</a>',
-        bug_email='<a href="mailto:bugs@edx.org">bugs@edx.org</a>'
+      <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: {bug_email}.').format(
+        platform_name=settings.PLATFORM_NAME,
+        tech_email='<a href="mailto:{tech_support_email}">{tech_support_email}</a>'.format(tech_support_email=settings.TECH_SUPPORT_EMAIL),
+        bug_email='<a href="mailto:{bugs_email}">{bugs_email}</a>'.format(bugs_email=settings.BUGS_EMAIL)
       )}</p>
 
       <h2>${_("Media")}</h2>
@@ -45,11 +47,15 @@
         )}</p>
 
       <h2>${_("Universities")}</h2>
-      <p>${_('If you are a university wishing to Collaborate or with questions about edX, please email {email}.'.format(email='<a href="mailto:{email}">{email}</a>'.format(email="university@edx.org"))}</p>
+      <p>${_('If you are a university wishing to collaborate or you have questions about {platform_name}, please email {email}.'.format(
+          platform_name="edX",
+          email='<a href="mailto:{email}">{email}</a>'.format(
+            email="university@edx.org"
+          )
+        ))}</p>
 
       <h2>${_("Accessibility")}</h2>
-      <p>${_('EdX strives to create an innovative online-learning platform that promotes accessibility for everyone, including students with disabilities. We are dedicated to improving the accessibility of the platform and welcome your comments or questions at {email}.'.format(email='<a href="mailto:{email}">{email}</a>'.format(email="accessibility@edx.org"))}</p>
-
+      <p>${_('{platform_name} strives to create an innovative online-learning platform that promotes accessibility for everyone, including students with disabilities. We are dedicated to improving the accessibility of the platform and welcome your comments or questions at {email}.'.format(platform_name="EdX", email='<a href="mailto:{email}">{email}</a>'.format(email="accessibility@edx.org")))}</p>
     </div>
   </section>
 </section>

lms/templates/static_templates/copyright.html

@@ -12,14 +12,14 @@
 
   <div class="inner-wrapper">
     <h2>${_("Videos and Exercises")}</h2>
-    <p>${_(" Copyright &copy; 2012 MIT. All rights reserved. In order to further MIT's goal of making education accessible and affordable to the world, MIT is planning to make <i>MITx</i> course content available under open source licenses.")}</p>
+    <p>${_(" Copyright &copy; 2012 {MIT}. All rights reserved. In order to further {MIT}'s goal of making education accessible and affordable to the world, {MIT} is planning to make <i>{MITx}</i> course content available under open source licenses.").format(MIT="MIT", MITx="MITx")}</p>
 
     <h2>${_("Textbook")}</h2>
-    <p>${_(" Copyright &copy; 2005 Elsevier Inc. All Rights Reserved. Used with permission. While our goal is to build courses with as much free and open content as possible, we apologize that we do not have the ability to do so entirely. ")}</p>
+    <p>${_(" Copyright &copy; 2005 {elsevier}. All Rights Reserved. Used with permission. While our goal is to build courses with as much free and open content as possible, we apologize that we do not have the ability to do so entirely. ").format(elsevier="Elsevier Inc")}</p>
 
     <h2>${_("Student-generated content")}</h2>
     <p>${_("Copyright &copy; 2012. All Rights Reserved. Due to privacy concerns, we do not know what portion of these will be released under open licenses.")}</p>
 
-    <p>${_("MIT and <i>MITx</i> are trademarks of the Massachusetts Institute of Technology, and may not be used without permission.")}</p>
+    <p>${_("{MIT} and <i>{MITx}</i> are trademarks of the {MIT_long}, and may not be used without permission.").format(MIT="MIT", MITx="MITx", MIT_long="Massachusetts Institute of Technology")}</p>
   </div>
 </section>

lms/templates/static_templates/honor.html

@@ -13,22 +13,22 @@
 
   <div class="inner-wrapper">
     <h2>${_("Collaboration Policy")}</h2>
-    <p>${_("By enrolling in a course on edX, you are joining a special worldwide community of learners. The aspiration of edX is to provide anyone in the world who has the motivation and ability to engage coursework from the Massachusetts Institute of Technology, Harvard University and the University of California, Berkeley the opportunity to attain the best MIT, Harvard and UC Berkeley-based educational experience that internet technology enables. You are part of the community who will help edX achieve this goal.")}</p>
-    <p>${_("EdX depends upon your motivation to learn the material and to do so with honesty. In order to participate in edX, you must agree to the Honor Code below and any additional terms specific to a class. This Honor Code, and any additional terms, will be posted on each class website.")}</p>
+    <p>${_("By enrolling in a course on {edX}, you are joining a special worldwide community of learners. The aspiration of {edX} is to provide anyone in the world who has the motivation and ability to engage coursework from the {MIT_long}, {Harvard_long} and the {Berkeley_long} the opportunity to attain the best {MIT}, {Harvard} and {Berkeley}-based educational experience that internet technology enables. You are part of the community who will help {edX} achieve this goal.").format(edX="edX", MIT_long="Massachusetts Institute of Technology", Harvard_long="Harvard University", Berkeley_long="University of California, Berkeley", MIT="MIT", Harvard="Harvard", Berkeley="UC Berkeley")}</p>
+    <p>${_("{EdX} depends upon your motivation to learn the material and to do so with honesty. In order to participate in {edX}, you must agree to the Honor Code below and any additional terms specific to a class. This Honor Code, and any additional terms, will be posted on each class website.").format(edX="edX", EdX="EdX")}</p>
 
-    <h2>${_("edX Honor Code Pledge")}</h2>
-    <p>${_("By enrolling in an edX course, I agree that I will:")}</p>
+    <h2>${_("{edX} Honor Code Pledge").format(edX="edX")}</h2>
+    <p>${_("By enrolling in an {edX} course, I agree that I will:").format(edX="edX")}</p>
     <ul>
       <li>${_("Complete all mid-terms and final exams with my own work and only my own work. I will not submit the work of any other person.")}</li>
       <li>${_("Maintain only one user account and not let anyone else use my username and/or password.")}</li>
       <li>${_("Not engage in any activity that would dishonestly improve my results, or improve or hurt the results of others.")}</li>
       <li>${_("Not post answers to problems that are being used to assess student performance.")}</li>
     </ul>
-    <p>${_("Unless otherwise indicated by the instructor of an edX course, learners on edX are encouraged to:")}</p>
+    <p>${_("Unless otherwise indicated by the instructor of an {edX} course, learners on {edX} are encouraged to:").format(edX="edX")}</p>
     <ul>
       <li>${_("Collaborate with others on the lecture videos, exercises, homework and labs.")}</li>
       <li>${_("Discuss with others general concepts and materials in each course.")}</li>
-      <li>${_("Present ideas and written work to fellow edX learners or others for comment or criticism.")}</li>
+      <li>${_("Present ideas and written work to fellow {edX} learners or others for comment or criticism.").format(edX="edX")}</li>
     </ul>
   </div>
 </section>

lms/templates/static_templates/media-kit.html

@@ -2,27 +2,27 @@
 <%namespace name='static' file='../static_content.html'/>
 <%inherit file="../main.html" />
 
-<%block name="title"><title>${_("edX Media Kit")}</title></%block>
+<%block name="title"><title>${_("{edX} Media Kit").format(edX="edX")}</title></%block>
 
 <section class="mediakit">
-  <h1>${_("edX Media Kit")}</h1>
+  <h1>${_("{edX} Media Kit").format(edX="edX")}</h1>
 
   <hr />
 
   <div class="wrapper wrapper-mediakit">
     <section class="introduction">
       <header>
-        <h2>${_("Welcome to the <span class=\"org-name\">edX</span> Media Kit")}</h2>
+        <h2>${_("Welcome to the <span class=\"org-name\">{edX}</span> Media Kit").format(edX="edX")}</h2>
       </header>
 
       <article>
-        <p>${_("Need images for a news story?  Feel free to download high-resolution versions of the photos below by clicking on the thumbnail.  Please credit edX in your use.")}</p>
-        <p>${_("We\'ve included visual guidelines on how to use the edX logo within the download zip which also includes Adobe Illustrator and eps versions of the logo. ")}</p>
-        <p>${_("For more information about edX, please contact <strong>Dan O&apos;Connell Associate Director of Communications</strong> via <a href=\"mailto:oconnell@edx.org?subject=edX Information Request (from Media Kit)\">oconnell@edx.org</a>.")}</p>
+        <p>${_("Need images for a news story?  Feel free to download high-resolution versions of the photos below by clicking on the thumbnail.  Please credit {edX} in your use.").format(edX="edX")}</p>
+        <p>${_("We\'ve included visual guidelines on how to use the {edX} logo within the download zip which also includes Adobe Illustrator and eps versions of the logo. ").format(edX="edX")}</p>
+        <p>${_("For more information about {edX}, please contact <strong>{dan_oconnell}, Associate Director of Communications</strong> via <a href=\"mailto:oconnell@edx.org?subject=edX Information Request (from Media Kit)\">oconnell@edx.org</a>.").format(dan_oconnell="Dan O'Connell", edX="edX")}</p>
       </article>
 
       <aside>
-        <h3>${_("The <span class=\"org-name\">edX</span> Logo")}</h3>
+        <h3>${_("The <span class=\"org-name\">{edX}</span> Logo").format(edX="edX")}</h3>
         <figure class="logo">
           <a rel="asset" class="action action-download" href="${static.url('files/edx-identity.zip')}">
             <img src="${static.url('images/edx.png')}" />
@@ -36,7 +36,7 @@
 
     <section class="library">
       <header>
-        <h2>${_("The <span class=\"org-name\">edX</span> Media Library")}</h2>
+        <h2>${_("The <span class=\"org-name\">{edX}</span> Media Library").format(edX="edX")}</h2>
       </header>
 
       <article>
@@ -45,7 +45,7 @@
             <figure>
               <a rel="asset" class="action action-download" href="${static.url('images/press-kit/anant-agarwal_high-res.jpg')}">
                 <img src="${static.url('images/press-kit/anant-agarwal_x200.jpg')}"/>
-                <figcaption>${_("Ananat Agarwal, President of edX, in his office in Cambridge, MA. The computer screen behind him shows a portion of a video lecture from 6.002x, Circuits &amp; Electronics, the MITx course taught by Agarwal.")}</figcaption>
+                <figcaption>${_("{anant}, President of {edX}, in his office in Cambridge, MA. The computer screen behind him shows a portion of a video lecture from 6.002x, Circuits &amp; Electronics, the MITx course taught by Agarwal.").format(edX="edX", anant="Anant Agarwal")}</figcaption>
                 <span class="note">${_("Download (High Resolution Photo)")}</span>
               </a>
             </figure>
@@ -54,7 +54,7 @@
             <figure>
               <a rel="asset" class="action action-download" href="${static.url('images/press-kit/anant-tablet_high-res.jpg')}">
                 <img src="${static.url('images/press-kit/anant-tablet_x200.jpg')}"/>
-                <figcaption>${_("Anant Agarwal creating a tablet-based lecture for 6.002x, Circuits & Electronics.")}</figcaption>
+                <figcaption>${_("{anant} creating a tablet-based lecture for 6.002x, Circuits & Electronics.").format(anant="Anant Agarwal")}</figcaption>
                 <span class="note">${_("Download (High Resolution Photo)")}</span>
               </a>
             </figure>
@@ -63,7 +63,7 @@
             <figure>
               <a rel="asset" class="action action-download" href="${static.url('images/press-kit/piotr-mitros_high-res.jpg')}">
                 <img src="${static.url('images/press-kit/piotr-mitros_x200.jpg')}"/>
-                <figcaption>${_("Piotr Mitros, Chief Scientist at edX, uses a Rostrum camera to create an overhead camera-based lecture. During this process, voice and video are recorded for an interactive tutorial.")}</figcaption>
+                <figcaption>${_("{piotr}, Chief Scientist at {edX}, uses a Rostrum camera to create an overhead camera-based lecture. During this process, voice and video are recorded for an interactive tutorial.").format(edX="edX", piotr="Piotr Mitros")}</figcaption>
                 <span class="note">${_("Download (High Resolution Photo)")}</span>
               </a>
             </figure>
@@ -72,7 +72,7 @@
             <figure>
               <a rel="asset" class="action action-download" href="${static.url('images/press-kit/edx-video-editing_high-res.jpg')}">
                 <img src="${static.url('images/press-kit/edx-video-editing_x200.jpg')}"/>
-                <figcaption>${_("One of edX\'s video editors edits a lecture in a video suite.")}</figcaption>
+                <figcaption>${_("One of {edX}\'s video editors edits a lecture in a video suite.").format(edX="edX")}</figcaption>
                 <span class="note">${_("Download (High Resolution Photo)")}</span>
               </a>
             </figure>

lms/templates/static_templates/press.html

@@ -4,7 +4,7 @@
 
 <%inherit file="../main.html" />
 
-<%block name="title"><title>${_("edX in the Press")}</title></%block>
+<%block name="title"><title>${_("{edX} in the Press").format(edX="edX")}</title></%block>
 
 <section class="container about">
   <nav>

lms/templates/static_templates/server-down.html

@@ -2,6 +2,6 @@
 <%inherit file="../main.html" />
 
 <section class="outside-app">
-  <h1>${_("Currently the <em>%s</em> servers are down") % 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:%s\">$s</a> to report any problems or downtime.") % {settings.TECH_SUPPORT_EMAIL, settings.TECH_SUPPORT_EMAIL}}</p>
+  <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>
 </section>

lms/templates/static_templates/server-error.html

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

lms/templates/static_templates/server-overloaded.html

@@ -2,6 +2,6 @@
 <%inherit file="../main.html" />
 
 <section class="outside-app">
-  <h1>${_("Currently the <em>%s</em> servers are overloaded") % 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:\%s\">%s</a> to report any problems or downtime.") % {settings.TECH_SUPPORT_EMAIL, settings.TECH_SUPPORT_EMAIL}}</p>
+  <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>
 </section>

lms/templates/test_center_register.html

@@ -405,7 +405,7 @@
           <h4 class="title">${_('Accommodations Request')}</h4>
           <p class="details">${_('Your requested accommodations have been reviewed and processed. You are allowed no accommodations.')}</p>
 
-          <p class="action">${_('Please {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 class="action">${_('Please {contact_link_start}contact {edX} at ${exam_help}{contact_link_end}.').format(contact_link_start='<a class="contact-link" href="{}">'.format(exam_help_href), contact_link_end='</a>', edX="edX", exam_help="exam-help@edx.org")}</p>
         </li>
         % endif
 

lms/templates/wiki/includes/cheatsheet.html

 <%! from django.utils.translation import ugettext as _ %>
 <div class="modal hide fade" id="cheatsheetModal">
-	<a href="#" class="close-btn">${_("×")}</a>
+	<a href="#" class="close-btn">×</a>
 	<div id="cheatsheet-body" class="modal-body">
 		<div class="left-column">
 			<section>
@@ -15,7 +15,7 @@
                                 <pre>${_("[Article Name](wiki:ArticleName)")}</pre>
 			</section>
 			<section>
-				<h3>${_("edX Additions:")}</h3>
+				<h3>${_("{edX} Additions:").format(edX="edX")}</h3>
 				<pre>
 circuit-schematic:</pre>
 				<pre>
@@ -28,8 +28,8 @@ $LaTeX Math Expression$</pre>
 				<h3>${_("Useful examples:")}</h3>
 				<pre>
 ${_("http://wikipedia.org\
-[Wikipedia](http://wikipedia.org)\
-[edX Wiki](wiki:/edx/)")}</pre>
+[{Wikipedia}](http://wikipedia.org)\
+[{edX} Wiki](wiki:/edx/)").format(edX="edX", Wikipedia="Wikipedia")}</pre>
 				<pre>
 ${_("Huge Header")}
 ===========</pre>

lms/templates/wiki/plugins/attachments/index.html

-<%! from django.utils.translation import ugettext as _ %>
 {% extends "wiki/article.html" %}
 {% load wiki_tags i18n humanize %}
 {% load url from future %}
@@ -21,7 +20,7 @@
 
   <div class="modal upload-modal hide fade" id="upload-modal">
     <div class="modal-inner-wrapper">
-      <h4>${_("Upload File")}</h4>
+      <h4>{% trans "Upload File" %}</h4>
       <form method="POST" class="form-vertical" id="attachment_form" enctype="multipart/form-data">        
         {% wiki_form form %}
         <button type="submit" name="save" value="1" class="btn btn-primary">
@@ -33,7 +32,7 @@
 
   <div class="modal search-file-modal hide fade" id="search-file-modal">
     <div class="modal-inner-wrapper">
-      <h4>${_("Search files and articles")}</h4>
+      <h4>{% trans "Search files and articles" %}</h4>
       <p>{% trans "You can reuse files from other articles. These files are subject to updates on other articles which may or may not be a good thing." %}</p>
       <form method="GET" action="{% url 'wiki:attachments_search' path=urlpath.path article_id=article.id %}" class="form-search">
         {{ search_form.query }}
@@ -128,7 +127,7 @@
           </div>
         </li>
       {% empty %}
-      <p style="margin-bottom: 20px;"><em>{% trans "There are no attachments for this article." %}</em></p>
+        <p style="margin-bottom: 20px;"><em>{% trans "There are no attachments for this article." %}</em></p>
       {% endfor %}
     </ul>
   </div>