${_("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='', em_end="")}
${_("An activation link has been sent to {emaiL}, along with instructions for activating your account.").format(email=email)}
+${_("An activation link has been sent to {email}, along with instructions for activating your account.").format(email=email)}
diff --git a/common/lib/xmodule/xmodule/js/src/annotatable/display.coffee b/common/lib/xmodule/xmodule/js/src/annotatable/display.coffee index 8a32c8f51e..531ea91145 100644 --- a/common/lib/xmodule/xmodule/js/src/annotatable/display.coffee +++ b/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) -> $("Sorry! Our payment processor did not accept your payment. - The decision in they returned was {decision}, + The decision they returned was {decision}, and the reason was {reason_code}:{reason_msg}. 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}.
""")) @@ -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(_( """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(_( """
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(_( """
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. diff --git a/lms/static/admin/js/calendar.js b/lms/static/admin/js/calendar.js index c95a95db1b..750e8ee463 100644 --- a/lms/static/admin/js/calendar.js +++ b/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)); diff --git a/lms/static/admin/js/dateparse.js b/lms/static/admin/js/dateparse.js index 3cb82dea13..e46ab1dc29 100644 --- a/lms/static/admin/js/dateparse.js +++ b/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 diff --git a/lms/templates/courseware/courseware-error.html b/lms/templates/courseware/courseware-error.html index 9018495bff..71744259a6 100644 --- a/lms/templates/courseware/courseware-error.html +++ b/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 -## Translators: "edX" should *not* be translated <%block name="title">
${_("Our staff is currently working to get the site back up as soon as possible. Please email us at {tech_support_email} to report any problems or downtime.").format(tech_support_email=settings.TECH_SUPPORT_EMAIL)}
+${_("Our staff is currently working to get the site back up as soon as possible. Please email us at {tech_support_email} to report any problems or downtime.").format(tech_support_email=settings.TECH_SUPPORT_EMAIL)}
${_("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_end="", strong_start="", strong_end="")}
+${_("Please make sure your browser is updated to the {a_start}most recent version possible{a_end}. Also, please make sure your web cam is plugged in, turned on, and allowed to function in your web browser (commonly adjustable in your browser settings)").format(a_start='', a_end="")}
${_("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_end="", strong_start="", strong_end="")}
+${_("Please make sure your browser is updated to the {a_start}most recent version possible{a_end}. Also, please make sure your web cam is plugged in, turned on, and allowed to function in your web browser (commonly adjustable in your browser settings).").format(a_start='', a_end="")}
{% trans "[Article Name](wiki:ArticleName)" %}
circuit-schematic:
$LaTeX Math Expression$@@ -34,12 +32,9 @@
-{% 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/)
{% trans "Huge Header" %}
@@ -48,8 +43,10 @@
{% trans "Smaller Header" %}
--------------
+{# Translators: Leave the punctuation, but translate "emphasis" #}
{% trans "*emphasis* or _emphasis_" %}
+{# Translators: Leave the punctuation, but translate "strong" #}
{% trans "**strong** or __strong__" %}
- {% trans "Unordered List" %}
diff --git a/lms/templates/wiki/includes/editor_widget.html b/lms/templates/wiki/includes/editor_widget.html
index e306787488..54cef5e36e 100644
--- a/lms/templates/wiki/includes/editor_widget.html
+++ b/lms/templates/wiki/includes/editor_widget.html
@@ -1,10 +1,7 @@
{% load i18n %}
- {% comment %}
- Translators: Do not translate 'cheatsheetLink'
- {% endcomment %}
- {% blocktrans with start_link="" end_link="" %}
- Markdown syntax is allowed. See the {{ start_link }}cheatsheet{{ end_link }} for help.
- {% endblocktrans %}
+ {% blocktrans with start_link="" end_link="" %}
+ Markdown syntax is allowed. See the {{ start_link }}cheatsheet{{ end_link }} for help.
+ {% endblocktrans %}