fix: replace ugettext with gettext (#33022)

cms/templates/html_error.html

@@ -1,4 +1,4 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 <%! from django.urls import reverse %>
 
 <%block name="content">

cms/templates/widgets/html-edit.html

@@ -1,4 +1,4 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 
 <div class="wrapper-comp-editor" id="editor-tab" data-base-asset-url="${base_asset_url}" data-editor="${editor}">
     <section class="html-editor editor">

cms/templates/widgets/metadata-edit.html

@@ -1,4 +1,4 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 <%namespace name='static' file='../static_content.html'/>
 
 <%

cms/templates/widgets/tabs-aggregator.html

@@ -1,4 +1,4 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 <div class="wrapper-comp-editor" id="editor-tab-${html_id}" data-html_id="${html_id}">
     <section class="editor-with-tabs">
      <div class="edit-header">

common/templates/edxnotes_wrapper.html

@@ -3,7 +3,7 @@
 
 <%!
 import json
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from common.djangoapps.student.models import anonymous_id_for_user
 from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json
 %>

common/templates/emails/contact_us_feedback_email_body.txt

@@ -1,4 +1,4 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 ${_("Feedback Form")}
 
 ${_("Email: {email}").format(email=email)}

common/templates/emails/contact_us_feedback_email_subject.txt

@@ -1 +1 @@
-<%! from django.utils.translation import ugettext as _ %>${_("Feedback from user")}
+<%! from django.utils.translation import gettext as _ %>${_("Feedback from user")}

common/templates/emails/sync_learner_profile_data_email_change_body.txt

@@ -1,4 +1,4 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 <%! from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers %>
 
 <p>

common/templates/emails/sync_learner_profile_data_email_change_subject.txt

@@ -1,4 +1,4 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 <%! from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers %>
 
 ${_("Your {platform_name} account email has been updated").format(

common/test/test-theme/lms/templates/static_templates/embargo.html

@@ -1,6 +1,6 @@
 <%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
 %>
 <%inherit file="../main.html" />

lms/templates/annotatable.html

@@ -1,4 +1,4 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 
 <div class="annotatable-wrapper">
 	<div class="annotatable-header">

lms/templates/api_admin/catalogs/edit.html

@@ -3,7 +3,7 @@
 <%inherit file="../../main.html"/>
 <%!
 from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from openedx.core.djangolib.js_utils import js_escaped_string
 %>
 

lms/templates/api_admin/catalogs/search.html

@@ -3,7 +3,7 @@
 <%inherit file="../../main.html"/>
 <%!
 from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 %>
 
 <%block name="pagetitle">${_("Catalog search")}</%block>

lms/templates/certificates/_about-edx.html

@@ -1,5 +1,5 @@
 <%page expression_filter="h"/>
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 <section class="about-item about-edx">
     <h2 class="about-edx-title hd-4">${company_about_title}</h2>
 

lms/templates/certificates/_accomplishment-banner.html

@@ -1,6 +1,6 @@
 <%page expression_filter="h"/>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from openedx.core.djangolib.js_utils import js_escaped_string
 %>
 <%namespace name='static' file='../static_content.html'/>

lms/templates/certificates/_accomplishment-header.html

@@ -1,5 +1,5 @@
 <%page expression_filter="h"/>
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 
 <div class="wrapper-header">
 

lms/templates/certificates/_edx-accomplishment-print-help.html

@@ -1,6 +1,6 @@
 <%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
 %>
 <div class="wrapper-accomplishment-support">

lms/templates/certificates/invalid.html

@@ -1,6 +1,6 @@
 <%page expression_filter="h"/>
 <%inherit file="accomplishment-base.html" />
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 
 <div class="wrapper-content status status-invalid">
     <div class="wrapper-content-grid">

lms/templates/certificates/url_unsupported.html

@@ -1,6 +1,6 @@
 <%page expression_filter="h"/>
 <%inherit file="accomplishment-base.html" />
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 
 <div class="wrapper-content status status-invalid">
     <div class="wrapper-content-grid">

lms/templates/certificates/valid.html

@@ -1,6 +1,6 @@
 <%page expression_filter="h"/>
 <%inherit file="accomplishment-base.html" />
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 
 % if user.is_authenticated and user.id == int(accomplishment_user_id):
 <%include file="_accomplishment-banner.html" />

lms/templates/conditional_block.html

@@ -1,7 +1,7 @@
 <%page expression_filter="h"/>
 <%!
 from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from openedx.core.djangolib.markup import HTML, Text
 %>
 

lms/templates/course_modes/_upgrade_button.html

@@ -1,7 +1,7 @@
 <%page args="content_gating_enabled, course_duration_limit_enabled, min_price, price_before_discount" 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
 %>
 

lms/templates/course_modes/choose.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 django.urls import reverse
 from openedx.core.djangolib.js_utils import js_escaped_string
 from openedx.core.djangolib.markup import HTML, Text

lms/templates/course_modes/error.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
 from openedx.core.djangolib.js_utils import js_escaped_string

lms/templates/course_modes/fbe.html

@@ -6,7 +6,7 @@
 <%page expression_filter="h"/>
 <%inherit file="track_selection.html" />
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from openedx.core.djangolib.markup import HTML, Text
 %>
 <%block name="track_selection_certificate_bullets">

lms/templates/course_modes/track_selection.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
 from openedx.core.djangolib.js_utils import js_escaped_string

lms/templates/course_modes/unfbe.html

@@ -10,7 +10,7 @@
 <%page expression_filter="h"/>
 <%inherit file="track_selection.html" />
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from openedx.core.djangolib.markup import HTML, Text
 %>
 <%block name="track_selection_certificate_bullets">

lms/templates/courseware/accordion.html

@@ -2,7 +2,7 @@
 <%namespace name='static' file='../static_content.html'/>
 <%!
     from django.urls import reverse
-    from django.utils.translation import ugettext as _
+    from django.utils.translation import gettext as _
     from django.conf import settings
     from openedx.core.djangolib.markup import HTML, Text
 %>

lms/templates/courseware/course_about_sidebar_header.html

@@ -3,7 +3,7 @@
 <%!
 import six
 
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.urls import reverse
 from django.conf import settings
 %>

lms/templates/courseware/course_navigation.html

@@ -10,7 +10,7 @@
 
 from django.conf import settings
 from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 %>
 
 <%

lms/templates/courseware/course_updates.html

@@ -1,5 +1,5 @@
 <%page expression_filter="h"/>
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 <div class="recent-updates">
   % for index, update in enumerate(visible_updates):
     <article class="updates-article">

lms/templates/courseware/courses.html

@@ -1,7 +1,7 @@
 <%page expression_filter="h"/>
 <%!
   import json
-  from django.utils.translation import ugettext as _
+  from django.utils.translation import gettext as _
   from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json
 %>
 <%inherit file="../main.html" />

lms/templates/courseware/courseware-chromeless.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 openedx.core.djangolib.markup import HTML
 from openedx.core.djangolib.js_utils import js_escaped_string

lms/templates/courseware/courseware.html

@@ -7,7 +7,7 @@
 
 from django.conf import settings
 from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from lms.djangoapps.edxnotes.helpers import is_feature_enabled as is_edxnotes_enabled
 from openedx.core.djangolib.js_utils import js_escaped_string

lms/templates/courseware/error-message.html

@@ -2,7 +2,7 @@
 <%page expression_filter="h"/>
 <%namespace name='static' file='../static_content.html'/>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from openedx.core.djangolib.markup import HTML, Text
 %>
 

lms/templates/courseware/gradebook.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.urls import reverse
 %>
 

lms/templates/courseware/program_marketing.html

@@ -6,7 +6,7 @@
 from datetime import datetime
 
 from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from mako import exceptions
 
 from openedx.core.djangolib.markup import HTML, Text

lms/templates/courseware/progress.html

@@ -8,7 +8,7 @@
 from django.conf import settings
 from django.urls import reverse
 from django.utils.http import urlquote_plus
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from pytz import UTC
 
 from common.djangoapps.course_modes.models import CourseMode

lms/templates/courseware/tab-view.html

@@ -6,7 +6,7 @@
 <%! main_css = "css/bootstrap/lms-main.css" %>
 
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from openedx.core.djangolib.markup import HTML
 %>
 

lms/templates/courseware/tabs.html

@@ -2,7 +2,7 @@
 
 <%namespace name='static' file='/static_content.html'/>
 <%!
- from django.utils.translation import ugettext as _
+ from django.utils.translation import gettext as _
  from django.urls import reverse
  %>
 <%page args="tab_list, active_page, default_tab, tab_image" expression_filter="h" />

lms/templates/courseware/welcome-back.html

@@ -1,6 +1,6 @@
 <%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
 %>
 

lms/templates/credit_notifications/credit_eligibility_email.html

@@ -1,6 +1,6 @@
 <%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
 %>
 

lms/templates/credit_notifications/credit_eligibility_email.txt

@@ -1,4 +1,4 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 % if full_name is not UNDEFINED and full_name is not None:
 ${_(u"Hi {name},").format(name=full_name)}
 % else:

lms/templates/dashboard/_dashboard_credit_info.html

@@ -1,6 +1,6 @@
 <%page args="credit_status" 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
 %>
 <%namespace name='static' file='../static_content.html'/>

lms/templates/dashboard/_dashboard_third_party_error.html

@@ -1,6 +1,6 @@
 <%page expression_filter="h"/>
 
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 <div class="wrapper-msg urgency-high">
     <div class="msg">
         <div class="msg-content">

lms/templates/dashboard/_entitlement_reason_survey.html

@@ -1,6 +1,6 @@
 <%page expression_filter="h"/>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 %>
 <div class="reasons_survey">
   <div class="slide1 hidden">

lms/templates/discussion/_discussion_inline.html

@@ -4,7 +4,7 @@
 <%include file="_thread_list_template.html" />
 
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from json import dumps as json_dumps
 from openedx.core.djangolib.js_utils import js_escaped_string
 %>

lms/templates/discussion/_discussion_inline_studio.html

@@ -1,4 +1,4 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 <%page expression_filter="h"/>
 
 <div class="discussion-module" data-discussion-id="${discussion_id}">

lms/templates/discussion/_filter_dropdown.html

@@ -1,6 +1,6 @@
 <%page expression_filter="h"/>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from lms.djangoapps.discussion.django_comment_client.constants import TYPE_ENTRY
 from openedx.core.djangolib.markup import HTML
 %>

lms/templates/discussion/_thread_list_template.html

@@ -1,5 +1,5 @@
 <%page expression_filter="h"/>
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 <script type="text/template" id="thread-list-template">
     <div class="forum-nav-thread-list-wrapper" id="sort-filter-wrapper" tabindex="-1">
         <div class="forum-nav-refine-bar">