Fix i18n'd strings to be easier for translators to understand

Signup modal

Just translate discussion sr text

Markdown editor help

Help modal and reverify dash

common/static/coffee/src/discussion/views/discussion_content_view.coffee

@@ -170,16 +170,17 @@ if Backbone?
       buttonTextFmt =
         if voted
           ngettext(
-            "%(voteNum)s%(startSrSpan)s vote (click to remove your vote)%(endSrSpan)s",
-            "%(voteNum)s%(startSrSpan)s votes (click to remove your vote)%(endSrSpan)s",
+            "vote (click to remove your vote)",
+            "votes (click to remove your vote)",
             voteNum
           )
         else
           ngettext(
-            "%(voteNum)s%(startSrSpan)s vote (click to vote)%(endSrSpan)s",
-            "%(voteNum)s%(startSrSpan)s votes (click to vote)%(endSrSpan)s",
+            "vote (click to vote)",
+            "votes (click to vote)",
             voteNum
           )
+      buttonTextFmt = "%(voteNum)s%(startSrSpan)s " + buttonTextFmt + "%(endSrSpan)s"
       buttonText = interpolate(
         buttonTextFmt,
         {voteNum: voteNum, startSrSpan: "<span class='sr'>", endSrSpan: "</span>"},

lms/static/js/Markdown.Editor.js

@@ -27,8 +27,8 @@
 
     // The text that appears on the upper part of the dialog box when
     // entering links.
-    var linkDialogText = gettext("<p><b>Insert Hyperlink</b></p><p>http://example.com/ \"optional title\"</p>");
-    var imageDialogText = gettext("<p><b>Insert Image (upload file or type url)</b></p><p>http://example.com/images/diagram.jpg \"optional title\"<br><br></p>");
+    var linkDialogText = "<p><b>" + gettext("Insert Hyperlink") + "</b></p><p>http://example.com/ " + gettext("\"optional title\"") + "</p>";
+    var imageDialogText = "<p><b>" + gettext("Insert Image (upload file or type url)") + "</b></p><p>http://example.com/images/diagram.jpg " + gettext("\"optional title\"") + "<br><br></p>";
 
     // The default text that appears in the dialog input box when entering
     // links.

lms/templates/enroll_students.html

@@ -26,6 +26,6 @@ ${ rejected_students }
 <p> ${ debug }
 
 
-<p> ${_("foo")}
-<p> ${_("bar")}
-<p> ${_("biff")}
+<p> "foo"
+<p> "bar"
+<p> "biff"

lms/templates/help_modal.html

@@ -27,7 +27,7 @@
     </button>
 
     <header>
-      <h2>${_('{span_start}{platform_name}{span_end} Help').format(span_start='<span class="edx">', span_end='</span>', platform_name=platform_name)}</h2>
+      <h2>${_('{platform_name} Help').format(platform_name='<span class="edx">{}</span>'.format(platform_name))}</h2>
       <hr>
     </header>
 

lms/templates/signup_modal.html

@@ -31,26 +31,26 @@
 
         <div class="input-group">
 	  % if has_extauth_info is UNDEFINED:
-          <label data-field="email" for="signup_email">${_('E-mail *')}</label>
+          <label data-field="email" for="signup_email">${_('E-mail')} '*'</label>
 	    <input id="signup_email" type="email" name="email" placeholder="${_('e.g. yourname@domain.com')}" required />
 
-          <label data-field="password" for="signup_password">${_('Password *')}</label>
+          <label data-field="password" for="signup_password">${_('Password')} '*'</label>
 	    <input id="signup_password" type="password" name="password" placeholder="&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;" required />
 
-	  <label data-field="username" for="signup_username">${_('Public Username *')}</label>
+	  <label data-field="username" for="signup_username">${_('Public Username')} '*'</label>
 	    <input id="signup_username" type="text" name="username" placeholder="${_('e.g. yourname (shown on forums)')}" required />
 
-          <label data-field="name" for="signup_fullname">${_('Full Name *')}</label>
+          <label data-field="name" for="signup_fullname">${_('Full Name')} '*'</label>
 	    <input id="signup_fullname" type="text" name="name" placeholder="${_('e.g. Your Name (for certificates)')}" required />
 	  % else:
 	  <p>${_('<i>Welcome</i> {name}').format(name=extauth_id)}</p><br/>
 	  <p><i>${_('Enter a public username:')}</i></p>
 
-          <label data-field="username" for="signup_username">${_('Public Username *')}</label>
+          <label data-field="username" for="signup_username">${_('Public Username')} '*'</label>
 	      <input id="signup_username" type="text" name="username" value="${extauth_username}" placeholder="${_('e.g. yourname (shown on forums)')}" required />
 
           % if ask_for_email:
-            <label data-field="email" for="signup_email">${_('E-mail *')}</label>
+            <label data-field="email" for="signup_email">${_('E-mail')} '*'</label>
             <input id="signup_email" type="email" name="email" placeholder="${_('e.g. yourname@domain.com')}" required />
           % endif
 

lms/templates/verify_student/midcourse_reverify_dash.html

@@ -25,7 +25,8 @@
                       <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 ${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 {course_number}").format(course_number=${item.course_number})}</a></p>
                   </li>
                 % endfor
                 </ul>
@@ -42,7 +43,8 @@
                       <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 ${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 {course_number}").format(course_number=${item.course_number})}</a></p>
                   </li>
                 % endfor
                 </ul>
@@ -94,12 +96,14 @@
           % endif
 
           % if reverifications["must_reverify"]:
-            <p class="support">${_("Don't want to re-verify right now? {a_start}Return to where you left off{a_end}").format(
+            <p class="support">${_("Don't want to re-verify right now? ") + "{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}Return to where you left off{a_end}").format(
+          <p class="support">${"{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>