diff --git a/lms/templates/edxnotes/edxnotes.html b/lms/templates/edxnotes/edxnotes.html index 445b52f856..4cd07e4494 100644 --- a/lms/templates/edxnotes/edxnotes.html +++ b/lms/templates/edxnotes/edxnotes.html @@ -3,7 +3,7 @@ <%namespace name='static' file='/static_content.html'/> <%def name="online_help_token()"><% return "notes" %>%def> <%! -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from lms.djangoapps.edxnotes.helpers import NoteJSONEncoder from openedx.core.djangolib.markup import HTML, Text from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string diff --git a/lms/templates/edxnotes/toggle_notes.html b/lms/templates/edxnotes/toggle_notes.html index ee55a31d4e..0c0fc3b928 100644 --- a/lms/templates/edxnotes/toggle_notes.html +++ b/lms/templates/edxnotes/toggle_notes.html @@ -1,6 +1,6 @@ <%page args="course" expression_filter="h"/> <%! -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from django.urls import reverse from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string %> diff --git a/lms/templates/email_change_failed.html b/lms/templates/email_change_failed.html index 8fbe6c4654..8e5537d871 100644 --- a/lms/templates/email_change_failed.html +++ b/lms/templates/email_change_failed.html @@ -1,5 +1,5 @@ <%page expression_filter="h"/> -<%! from django.utils.translation import ugettext as _ +<%! from django.utils.translation import gettext as _ from openedx.core.djangolib.markup import HTML, Text %> diff --git a/lms/templates/email_change_successful.html b/lms/templates/email_change_successful.html index e91da6a294..00215c3453 100644 --- a/lms/templates/email_change_successful.html +++ b/lms/templates/email_change_successful.html @@ -1,7 +1,7 @@ <%page expression_filter="h"/> <%inherit file="main.html" /> <%! -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from openedx.core.djangolib.markup import HTML, Text from django.urls import reverse %> diff --git a/lms/templates/email_exists.html b/lms/templates/email_exists.html index ce3848578a..6676f96f21 100644 --- a/lms/templates/email_exists.html +++ b/lms/templates/email_exists.html @@ -1,5 +1,5 @@ <%page expression_filter="h"/> -<%! from django.utils.translation import ugettext as _ +<%! from django.utils.translation import gettext as _ from openedx.core.djangolib.markup import HTML, Text %> diff --git a/lms/templates/emails/business_order_confirmation_email.txt b/lms/templates/emails/business_order_confirmation_email.txt index 8e83c86712..9846288892 100644 --- a/lms/templates/emails/business_order_confirmation_email.txt +++ b/lms/templates/emails/business_order_confirmation_email.txt @@ -1,5 +1,5 @@ ## mako -<%! from django.utils.translation import ugettext as _ %> +<%! from django.utils.translation import gettext as _ %>
${_("Hi {name},").format(name=recipient_name)}
diff --git a/lms/templates/emails/failed_verification_email.txt b/lms/templates/emails/failed_verification_email.txt index bdedc646f4..7b61be682c 100644 --- a/lms/templates/emails/failed_verification_email.txt +++ b/lms/templates/emails/failed_verification_email.txt @@ -1,4 +1,4 @@ -<%! from django.utils.translation import ugettext as _ %> +<%! from django.utils.translation import gettext as _ %> ${_("Sorry! The photos you submitted for ID verification were not accepted, for the following reason(s):")} @@ -35,4 +35,4 @@ ${_("Resubmit Verification: {reverify_url}").format(reverify_url=reverify_url)} ${_("ID Verification FAQ: {faq_url}").format(faq_url=faq_url)} ${_("Thank you,")} -${_("The {platform_name} team").format(platform_name=platform_name)} \ No newline at end of file +${_("The {platform_name} team").format(platform_name=platform_name)} diff --git a/lms/templates/emails/order_confirmation_email.txt b/lms/templates/emails/order_confirmation_email.txt index b875edef84..223a52be2f 100644 --- a/lms/templates/emails/order_confirmation_email.txt +++ b/lms/templates/emails/order_confirmation_email.txt @@ -1,5 +1,5 @@ ## mako -<%! from django.utils.translation import ugettext as _ %> +<%! from django.utils.translation import gettext as _ %> ${_("Hi {name},").format(name=order.user.profile.name)} ${_("Your payment was successful. You will see the charge below on your next credit or debit card statement under the company name {merchant_name}.").format(merchant_name=settings.CC_MERCHANT_NAME)} diff --git a/lms/templates/emails/passed_verification_email.txt b/lms/templates/emails/passed_verification_email.txt index e2ad087811..16e46928ad 100644 --- a/lms/templates/emails/passed_verification_email.txt +++ b/lms/templates/emails/passed_verification_email.txt @@ -1,4 +1,4 @@ -<%! from django.utils.translation import ugettext as _ %> +<%! from django.utils.translation import gettext as _ %> ${_("Hello {full_name},").format(full_name=full_name)} diff --git a/lms/templates/emails/photo_submission_confirmation.txt b/lms/templates/emails/photo_submission_confirmation.txt index 44c97790a1..31fd6159c1 100644 --- a/lms/templates/emails/photo_submission_confirmation.txt +++ b/lms/templates/emails/photo_submission_confirmation.txt @@ -1,5 +1,5 @@ ## mako -<%! from django.utils.translation import ugettext as _ %> +<%! from django.utils.translation import gettext as _ %> ${_("Hi {full_name},").format(full_name=full_name)} diff --git a/lms/templates/emails/reject_name_change.txt b/lms/templates/emails/reject_name_change.txt index 4079d964bd..c2ff34ff43 100644 --- a/lms/templates/emails/reject_name_change.txt +++ b/lms/templates/emails/reject_name_change.txt @@ -1,5 +1,5 @@ ## mako -<%! from django.utils.translation import ugettext as _ %> +<%! from django.utils.translation import gettext as _ %> <%namespace name='static' file='../static_content.html'/> (Not currently used) diff --git a/lms/templates/emails/reverification_processed.txt b/lms/templates/emails/reverification_processed.txt index 0f65e16ac6..19b1f5d270 100644 --- a/lms/templates/emails/reverification_processed.txt +++ b/lms/templates/emails/reverification_processed.txt @@ -1,5 +1,5 @@ ## mako -<%! from django.utils.translation import ugettext as _ %> +<%! from django.utils.translation import gettext as _ %> % if status == "approved": ${_("We have successfully verified your identity for the {assessment} assessment in the {course_name} course." ).format(course_name=course_name, assessment=assessment)} diff --git a/lms/templates/embargo/default_courseware.html b/lms/templates/embargo/default_courseware.html index c1431c61b1..c767104e72 100644 --- a/lms/templates/embargo/default_courseware.html +++ b/lms/templates/embargo/default_courseware.html @@ -1,5 +1,5 @@ <%page expression_filter="h"/> -<%! from django.utils.translation import ugettext as _ %> +<%! from django.utils.translation import gettext as _ %> <%inherit file="../main.html" /> <%block name="pagetitle">${_("This Course Unavailable In Your Country")}%block> diff --git a/lms/templates/embargo/default_enrollment.html b/lms/templates/embargo/default_enrollment.html index 0989ec1638..a8608880cc 100644 --- a/lms/templates/embargo/default_enrollment.html +++ b/lms/templates/embargo/default_enrollment.html @@ -1,5 +1,5 @@ <%page expression_filter="h"/> -<%! from django.utils.translation import ugettext as _ %> +<%! from django.utils.translation import gettext as _ %> <%inherit file="../main.html" /> <%block name="pagetitle">${_("This Course Unavailable In Your Country")}%block> diff --git a/lms/templates/enroll_staff.html b/lms/templates/enroll_staff.html index 9a2e534769..e610e7d10f 100644 --- a/lms/templates/enroll_staff.html +++ b/lms/templates/enroll_staff.html @@ -2,7 +2,7 @@ <%inherit file="main.html" /> <%namespace name='static' file='static_content.html'/> <%! - from django.utils.translation import ugettext as _ + from django.utils.translation import gettext as _ from django.utils.translation import pgettext from lms.djangoapps.courseware.courses import get_course_about_section %> diff --git a/lms/templates/enroll_students.html b/lms/templates/enroll_students.html index 6b3074fe89..608523e63b 100644 --- a/lms/templates/enroll_students.html +++ b/lms/templates/enroll_students.html @@ -1,11 +1,11 @@ <%page expression_filter="h" /> -<%! from django.utils.translation import ugettext as _ %> +<%! from django.utils.translation import gettext as _ %>${_("Course: ") % course} -