Merge pull request #2077 from edx/ned/misc-msg-fixes

Miscellaneous fixes to strings found during i18n work.

cms/templates/export.html

@@ -94,7 +94,6 @@ require(["domReady!", "gettext", "js/views/feedback_prompt"], function(doc, gett
         <h2 class="title">${_("About Exporting Courses")}</h2>
         <div class="copy">
           ## Translators: ".tar.gz" is a file extension, and should not be translated
-
           <p>${_("You can export courses and edit them outside of Studio. The exported file is a .tar.gz file (that is, a .tar file compressed with GNU Zip) that contains the course structure and content. You can also re-import courses that you've exported.").format(em_start='<strong>', em_end="</strong>")}</p>
         </div>
       </div>

cms/templates/import.html

@@ -126,20 +126,16 @@
     <aside class="content-supplementary" role="complimentary">
       <div class="bit">
         <h3 class="title-3">${_("Why import a course?")}</h3>
-        ## Translators: ".tar.gz" is a file extension, and files with that extension are called "gzipped tar files": these terms should not be translated
         <p>${_("You may want to run a new version of an existing course, or replace an existing course altogether. Or, you may have developed a course outside Studio.")}</p>
       </div>
 
       <div class="bit">
         <h3 class="title-3">${_("What content is imported?")}</h3>
-        ## Translators: ".tar.gz" is a file extension, and files with that extension are called "gzipped tar files": these terms should not be translated
         <p>${_("Only the course content and structure (including sections, subsections, and units) are imported. Other data, including student data, grading information, discussion forum data, course settings, and course team information, remains the same as it was in the existing course.")}</p>
       </div>
 
       <div class="bit">
-        ## Translators: ".tar.gz" is a file extension, and should not be translated
         <h3 class="title-3">${_("Warning: Importing while a course is running")}</h3>
-
         <p>${_("If you perform an import while your course is running, and you change the URL names (or url_name nodes) of any Problem components, the student data associated with those Problem components may be lost. This data includes students' problem scores.")}</p>
       </div>
     </aside>

cms/templates/registration/reg_complete.html

 <%! from django.utils.translation import ugettext as _ %>
 <h1>Check your email</h1>
-<p>${_("An activation link has been sent to {emaiL}, along with instructions for activating your account.").format(email=email)}</p>
+<p>${_("An activation link has been sent to {email}, along with instructions for activating your account.").format(email=email)}</p>

common/lib/xmodule/xmodule/js/src/annotatable/display.coffee

@@ -160,7 +160,10 @@ class @Annotatable
         @hideTips visible
 
     toggleAnnotationButtonText: (hide) ->
-        buttonText = (if hide then 'Show' else 'Hide')+' Annotations'
+        if hide
+            buttonText = gettext('Show Annotations')
+        else
+            buttonText = gettext('Hide Annotations')
         @$(@toggleAnnotationsSelector).text(buttonText)
 
     toggleInstructions: () ->
@@ -169,7 +172,10 @@ class @Annotatable
       @toggleInstructionsText hide
 
     toggleInstructionsButton: (hide) ->
-        txt = (if hide then 'Expand' else 'Collapse')+' Instructions'
+        if hide
+            txt = gettext('Expand Instructions')
+        else
+            txt = gettext('Collapse Instructions')
         cls = (if hide then ['expanded', 'collapsed'] else ['collapsed','expanded'])
         @$(@toggleInstructionsSelector).text(txt).removeClass(cls[0]).addClass(cls[1])
 
@@ -221,13 +227,14 @@ class @Annotatable
     makeTipTitle: (el) ->
         (api) =>
             title = $(el).data('comment-title')
-            (if title then title else 'Commentary')
+            (if title then title else gettext('Commentary'))
 
     createComment: (text) ->
         $("<div class=\"annotatable-comment\">#{text}</div>")
 
     createReplyLink: (problem_id) ->
-        $("<a class=\"annotatable-reply\" href=\"javascript:void(0);\" data-problem-id=\"#{problem_id}\">Reply to Annotation</a>")
+        linktxt = gettext('Reply to Annotation')
+        $("<a class=\"annotatable-reply\" href=\"javascript:void(0);\" data-problem-id=\"#{problem_id}\">#{linktxt}</a>")
 
     findVisibleTips: () ->
         visible = []

common/lib/xmodule/xmodule/js/src/capa/display.coffee

@@ -318,14 +318,16 @@ class @Problem
           @el.find('.problem > div').each (index, element) =>
             MathJax.Hub.Queue ["Typeset", MathJax.Hub, element]
 
-        @$('.show-label').text 'Hide Answer(s)'
+        `// Translators: the word Answer here refers to the answer to a problem the student must solve.`
+        @$('.show-label').text gettext('Hide Answer(s)')
         @el.addClass 'showed'
         @updateProgress response
     else
       @$('[id^=answer_], [id^=solution_]').text ''
       @$('[correct_answer]').attr correct_answer: null
       @el.removeClass 'showed'
-      @$('.show-label').text 'Show Answer(s)'
+      `// Translators: the word Answer here refers to the answer to a problem the student must solve.`
+      @$('.show-label').text gettext('Show Answer(s)')
 
       @el.find(".capa_inputtype").each (index, inputtype) =>
         display = @inputtypeDisplays[$(inputtype).attr('id')]
@@ -403,6 +405,7 @@ class @Problem
     formulaequationinput: (element) ->
       $(element).find('input').on 'input', ->
         $p = $(element).find('p.status')
+        `// Translators: the word Answer here is about answering a problem the student must solve.`
         $p.text gettext("unanswered")
         $p.parent().removeClass().addClass "unanswered"
 
@@ -431,7 +434,8 @@ class @Problem
     textline: (element) ->
       $(element).find('input').on 'input', ->
         $p = $(element).find('p.status')
-        $p.text "unanswered"
+        `// Translators: the word Answer here is about answering a problem the student must solve.`
+        $p.text gettext("unanswered")
         $p.parent().removeClass().addClass "unanswered"
 
   inputtypeSetupMethods:

lms/djangoapps/shoppingcart/processors/CyberSource.py

@@ -217,14 +217,14 @@ def get_processor_decline_html(params):
     """Have to parse through the error codes to return a helpful message"""
     payment_support_email = settings.PAYMENT_SUPPORT_EMAIL
 
-    msg = _(dedent(
+    msg = dedent(_(
             """
             <p class="error_msg">
             Sorry! Our payment processor did not accept your payment.
-            The decision in they returned was <span class="decision">{decision}</span>,
+            The decision they returned was <span class="decision">{decision}</span>,
             and the reason was <span class="reason">{reason_code}:{reason_msg}</span>.
             You were not charged. Please try a different form of payment.
-            Contact us with payment-specific questions at {email}.
+            Contact us with payment-related questions at {email}.
             </p>
             """))
 
@@ -240,7 +240,7 @@ def get_processor_exception_html(exception):
 
     payment_support_email = settings.PAYMENT_SUPPORT_EMAIL
     if isinstance(exception, CCProcessorDataException):
-        msg = _(dedent(
+        msg = dedent(_(
                 """
                 <p class="error_msg">
                 Sorry! Our payment processor sent us back a payment confirmation that had inconsistent data!
@@ -251,7 +251,7 @@ def get_processor_exception_html(exception):
                 """.format(msg=exception.message, email=payment_support_email)))
         return msg
     elif isinstance(exception, CCProcessorWrongAmountException):
-        msg = _(dedent(
+        msg = dedent(_(
                 """
                 <p class="error_msg">
                 Sorry! Due to an error your purchase was charged for a different amount than the order total!
@@ -261,7 +261,7 @@ def get_processor_exception_html(exception):
                 """.format(msg=exception.message, email=payment_support_email)))
         return msg
     elif isinstance(exception, CCProcessorSignatureException):
-        msg = _(dedent(
+        msg = dedent(_(
                 """
                 <p class="error_msg">
                 Sorry! Our payment processor sent us back a corrupted message regarding your charge, so we are
@@ -307,32 +307,32 @@ REASONCODE_MAP.update(
         '100': _('Successful transaction.'),
         '101': _('The request is missing one or more required fields.'),
         '102': _('One or more fields in the request contains invalid data.'),
-        '104': _(dedent(
+        '104': dedent(_(
             """
             The merchantReferenceCode sent with this authorization request matches the
             merchantReferenceCode of another authorization request that you sent in the last 15 minutes.
             Possible fix: retry the payment after 15 minutes.
             """)),
         '150': _('Error: General system failure. Possible fix: retry the payment after a few minutes.'),
-        '151': _(dedent(
+        '151': dedent(_(
             """
             Error: The request was received but there was a server timeout.
             This error does not include timeouts between the client and the server.
             Possible fix: retry the payment after some time.
             """)),
-        '152': _(dedent(
+        '152': dedent(_(
             """
             Error: The request was received, but a service did not finish running in time
             Possible fix: retry the payment after some time.
             """)),
         '201': _('The issuing bank has questions about the request. Possible fix: retry with another form of payment'),
-        '202': _(dedent(
+        '202': dedent(_(
             """
             Expired card. You might also receive this if the expiration date you
             provided does not match the date the issuing bank has on file.
             Possible fix: retry with another form of payment
             """)),
-        '203': _(dedent(
+        '203': dedent(_(
             """
             General decline of the card. No other information provided by the issuing bank.
             Possible fix: retry with another form of payment
@@ -341,7 +341,7 @@ REASONCODE_MAP.update(
         # 205 was Stolen or lost card.  Might as well not show this message to the person using such a card.
         '205': _('Unknown reason'),
         '207': _('Issuing bank unavailable. Possible fix: retry again after a few minutes'),
-        '208': _(dedent(
+        '208': dedent(_(
             """
             Inactive card or card not authorized for card-not-present transactions.
             Possible fix: retry with another form of payment
@@ -352,13 +352,13 @@ REASONCODE_MAP.update(
         # Might as well not show this message to the person using such a card.
         '221': _('Unknown reason'),
         '231': _('Invalid account number. Possible fix: retry with another form of payment'),
-        '232': _(dedent(
+        '232': dedent(_(
             """
             The card type is not accepted by the payment processor.
             Possible fix: retry with another form of payment
             """)),
         '233': _('General decline by the processor.  Possible fix: retry with another form of payment'),
-        '234': _(dedent(
+        '234': dedent(_(
             """
             There is a problem with our CyberSource merchant configuration.  Please let us know at {0}
             """.format(settings.PAYMENT_SUPPORT_EMAIL))),
@@ -370,7 +370,7 @@ REASONCODE_MAP.update(
         # reason code 239 only applies if we are processing a capture or credit through the API,
         # so we should never see it
         '239': _('The requested transaction amount must match the previous transaction amount.'),
-        '240': _(dedent(
+        '240': dedent(_(
             """
             The card type sent is invalid or does not correlate with the credit card number.
             Possible fix: retry with the same card or another form of payment
@@ -382,26 +382,26 @@ REASONCODE_MAP.update(
         # if the previously successful authorization has already been used by another capture request.
         # This reason code only applies when we are processing a capture through the API
         # so we should never see it
-        '242': _(dedent(
+        '242': dedent(_(
             """
             You requested a capture through the API, but there is no corresponding, unused authorization record.
             """)),
         # we should never see 243
         '243': _('The transaction has already been settled or reversed.'),
         # reason code 246 applies only if we are processing a void through the API. so we should never see it
-        '246': _(dedent(
+        '246': dedent(_(
             """
             The capture or credit is not voidable because the capture or credit information has already been
             submitted to your processor. Or, you requested a void for a type of transaction that cannot be voided.
             """)),
         # reason code 247 applies only if we are processing a void through the API. so we should never see it
         '247': _('You requested a credit for a capture that was previously voided'),
-        '250': _(dedent(
+        '250': dedent(_(
             """
             Error: The request was received, but there was a timeout at the payment processor.
             Possible fix: retry the payment.
             """)),
-        '520': _(dedent(
+        '520': dedent(_(
             """
             The authorization request was approved by the issuing bank but declined by CyberSource.'
             Possible fix: retry with a different form of payment.

lms/static/admin/js/calendar.js

@@ -23,8 +23,10 @@ function quickElement() {
 
 // CalendarNamespace -- Provides a collection of HTML calendar-related helper functions
 var CalendarNamespace = {
-    monthsOfYear: gettext('January February March April May June July August September October November December').split(' '),
-    daysOfWeek: gettext('S M T W T F S').split(' '),
+    // Translators: the names of months, keep the pipe (|) separators.
+    monthsOfYear: gettext('January|February|March|April|May|June|July|August|September|October|November|December').split('|'),
+    // Translators: abbreviations for days of the week, keep the pipe (|) separators.
+    daysOfWeek: gettext('S|M|T|W|T|F|S').split('|'),
     firstDayOfWeek: parseInt(get_format('FIRST_DAY_OF_WEEK')),
     isLeapYear: function(year) {
         return (((year % 4)==0) && ((year % 100)!=0) || ((year % 400)==0));

lms/static/admin/js/dateparse.js

@@ -29,8 +29,10 @@ if (typeof Array.prototype.filter == 'undefined') {
     };
 }
 
-var monthNames = gettext("January February March April May June July August September October November December").split(" ");
-var weekdayNames = gettext("Sunday Monday Tuesday Wednesday Thursday Friday Saturday").split(" ");
+// Translators: the names of months, keep the pipe (|) separators.
+var monthNames = gettext("January|February|March|April|May|June|July|August|September|October|November|December").split("|");
+// Translators: the names of days, keep the pipe (|) separators.
+var weekdayNames = gettext("Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday").split("|");
 
 /* Takes a string, returns the index of the month matching that string, throws
    an error if 0 or more than 1 matches

lms/templates/courseware/courseware-error.html

@@ -2,7 +2,6 @@
 <%inherit file="/main.html" />
 <%namespace name='static' file='../static_content.html'/>
 <%block name="bodyclass">courseware</%block>
-## Translators: "edX" should *not* be translated
 <%block name="title"><title>${_("Courseware")} - ${settings.PLATFORM_NAME}</title></%block>
 
 <%block name="headextra">

lms/templates/static_templates/server-overloaded.html

@@ -3,5 +3,5 @@
 
 <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>
+  <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/verify_student/_reverification_support.html

@@ -18,7 +18,7 @@
       <li class="help-item help-item-technical">
         <h3 class="title">${_("Having Technical Trouble?")}</h3>
         <div class="copy">
-          <p>${_("Please make sure your browser is updated to the {strong_start}{a_start}most recent version possible{a_end}{strong_end}. Also, please make sure your {strong_start}web cam is plugged in, turned on, and allowed to function in your web browser (commonly adjustable in your browser settings).{strong_end}").format(a_start='<a rel="external" href="http://browsehappy.com/">', a_end="</a>", strong_start="<strong>", strong_end="</strong>")}</p>
+          <p>${_("Please make sure your browser is updated to the <strong>{a_start}most recent version possible{a_end}</strong>. Also, please make sure your <strong>web cam is plugged in, turned on, and allowed to function in your web browser (commonly adjustable in your browser settings)</strong>").format(a_start='<a rel="external" href="http://browsehappy.com/">', a_end="</a>")}</p>
         </div>
       </li>
 

lms/templates/verify_student/_verification_support.html

@@ -27,7 +27,7 @@
       <li class="help-item help-item-technical">
         <h3 class="title">${_("Technical Requirements")}</h3>
         <div class="copy">
-          <p>${_("Please make sure your browser is updated to the {strong_start}{a_start}most recent version possible{a_end}{strong_end}. Also, please make sure your {strong_start}web cam is plugged in, turned on, and allowed to function in your web browser (commonly adjustable in your browser settings).{strong_end}").format(a_start='<a rel="external" href="http://browsehappy.com/">', a_end="</a>", strong_start="<strong>", strong_end="</strong>")}</p>
+          <p>${_("Please make sure your browser is updated to the <strong>{a_start}most recent version possible{a_end}</strong>. Also, please make sure your <strong>web cam is plugged in, turned on, and allowed to function in your web browser (commonly adjustable in your browser settings).</strong>").format(a_start='<a rel="external" href="http://browsehappy.com/">', a_end="</a>")}</p>
         </div>
       </li>
     </ul>

lms/templates/verify_student/show_requirements.html

@@ -169,7 +169,7 @@
           %if upgrade:
             <span class="help help-inline">${_("Missing something? You can always continue to audit this course instead.")}</span>
           %else:
-            <span class="help help-inline">${_("Missing something? You can always {a_start} audit this course instead {a_end}").format(a_start='<a href="/course_modes/choose/' + course_id + '">', a_end="</a>")}</span>
+            <span class="help help-inline">${_("Missing something? You can always {a_start}audit this course instead{a_end}").format(a_start='<a href="/course_modes/choose/' + course_id + '">', a_end="</a>")}</span>
           %endif
 
           <ol class="wizard-steps">

lms/templates/wiki/includes/cheatsheet.html

@@ -21,9 +21,7 @@
           <pre>{% trans "[Article Name](wiki:ArticleName)" %}</pre>
         </section>
         <section>
-          {% comment %}
-              Translators: Do not translate "edX"
-          {% endcomment %}
+          {# Translators: Do not translate "edX" #}
           <h3>{% trans "edX Additions:" %}</h3>
           <pre>circuit-schematic:</pre>
           <pre>$LaTeX Math Expression$</pre>
@@ -34,12 +32,9 @@
           <section>
               <h3>{% trans "Useful examples:" %}</h3>
               <pre>
-{% comment %}
-  Translators: Do not translate "edX" or "Wikipedia"
-{% endcomment %}
-{% trans "http://wikipedia.org" %}
-{% trans "[Wikipedia](http://wikipedia.org)" %}
-{% trans "[edX Wiki](wiki:/edx/)" %}
+http://wikipedia.org
+[Wikipedia](http://wikipedia.org)
+[edX Wiki](wiki:/edx/)
               </pre>
               <pre>
 {% trans "Huge Header" %}
@@ -48,8 +43,10 @@
 {% trans "Smaller Header" %}
 --------------</pre>
               <pre>
+{# Translators: Leave the punctuation, but translate "emphasis" #}
 {% trans "*emphasis* or _emphasis_" %}</pre>
               <pre>
+{# Translators: Leave the punctuation, but translate "strong" #}
 {% trans "**strong** or __strong__" %}</pre>
               <pre>
 - {% trans "Unordered List" %}

lms/templates/wiki/includes/editor_widget.html

 {% load i18n %}
 <textarea {{ attrs }}>{{ content }}</textarea>
 <p id="hint_id_content" class="help-block">
-	{% comment %}
-		Translators: Do not translate 'cheatsheetLink'
-	{% endcomment %}
-	{% blocktrans with start_link="<a id='cheatsheetLink' href='#cheatsheetModal' rel='leanModal'>" end_link="</a>" %}
-	    Markdown syntax is allowed. See the {{ start_link }}cheatsheet{{ end_link }} for help.
-	{% endblocktrans %}
+    {% blocktrans with start_link="<a id='cheatsheetLink' href='#cheatsheetModal' rel='leanModal'>" end_link="</a>" %}
+        Markdown syntax is allowed. See the {{ start_link }}cheatsheet{{ end_link }} for help.
+    {% endblocktrans %}
 </p>