diff --git a/cms/templates/html_error.html b/cms/templates/html_error.html
index 5cf980d73d..4493a273cc 100644
--- a/cms/templates/html_error.html
+++ b/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">
diff --git a/cms/templates/widgets/html-edit.html b/cms/templates/widgets/html-edit.html
index 15cf178965..8074e0d583 100644
--- a/cms/templates/widgets/html-edit.html
+++ b/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">
diff --git a/cms/templates/widgets/metadata-edit.html b/cms/templates/widgets/metadata-edit.html
index e1152624c9..c70d9bd9c8 100644
--- a/cms/templates/widgets/metadata-edit.html
+++ b/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'/>
 
 <%
diff --git a/cms/templates/widgets/tabs-aggregator.html b/cms/templates/widgets/tabs-aggregator.html
index 14a9e7b4cc..411f5615a8 100644
--- a/cms/templates/widgets/tabs-aggregator.html
+++ b/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">
diff --git a/common/templates/edxnotes_wrapper.html b/common/templates/edxnotes_wrapper.html
index e47dc50916..6186e3a626 100644
--- a/common/templates/edxnotes_wrapper.html
+++ b/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
 %>
diff --git a/common/templates/emails/contact_us_feedback_email_body.txt b/common/templates/emails/contact_us_feedback_email_body.txt
index 167ebd8550..23b68ba3f0 100644
--- a/common/templates/emails/contact_us_feedback_email_body.txt
+++ b/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)}
diff --git a/common/templates/emails/contact_us_feedback_email_subject.txt b/common/templates/emails/contact_us_feedback_email_subject.txt
index dca9f1b0c5..da6eddc37e 100644
--- a/common/templates/emails/contact_us_feedback_email_subject.txt
+++ b/common/templates/emails/contact_us_feedback_email_subject.txt
@@ -1 +1 @@
-<%! from django.utils.translation import ugettext as _ %>${_("Feedback from user")}
\ No newline at end of file
+<%! from django.utils.translation import gettext as _ %>${_("Feedback from user")}
\ No newline at end of file
diff --git a/common/templates/emails/sync_learner_profile_data_email_change_body.txt b/common/templates/emails/sync_learner_profile_data_email_change_body.txt
index 75483715b9..a4bfec67c2 100644
--- a/common/templates/emails/sync_learner_profile_data_email_change_body.txt
+++ b/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>
diff --git a/common/templates/emails/sync_learner_profile_data_email_change_subject.txt b/common/templates/emails/sync_learner_profile_data_email_change_subject.txt
index 48dd43534f..128bad6d3e 100644
--- a/common/templates/emails/sync_learner_profile_data_email_change_subject.txt
+++ b/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(
diff --git a/common/test/test-theme/lms/templates/static_templates/embargo.html b/common/test/test-theme/lms/templates/static_templates/embargo.html
index b7006b0111..20b0b57092 100644
--- a/common/test/test-theme/lms/templates/static_templates/embargo.html
+++ b/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" />
diff --git a/lms/templates/annotatable.html b/lms/templates/annotatable.html
index 7d7015d272..dcd51a0cd5 100644
--- a/lms/templates/annotatable.html
+++ b/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">
diff --git a/lms/templates/api_admin/catalogs/edit.html b/lms/templates/api_admin/catalogs/edit.html
index 93f41c1ebf..16a8dab45f 100644
--- a/lms/templates/api_admin/catalogs/edit.html
+++ b/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
 %>
 
diff --git a/lms/templates/api_admin/catalogs/search.html b/lms/templates/api_admin/catalogs/search.html
index 9b3d2881ea..e3a07c80e7 100644
--- a/lms/templates/api_admin/catalogs/search.html
+++ b/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>
diff --git a/lms/templates/certificates/_about-edx.html b/lms/templates/certificates/_about-edx.html
index d0b06a6c92..70b0308525 100644
--- a/lms/templates/certificates/_about-edx.html
+++ b/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>
 
diff --git a/lms/templates/certificates/_accomplishment-banner.html b/lms/templates/certificates/_accomplishment-banner.html
index 9e9b1c2cd3..24cfbae734 100644
--- a/lms/templates/certificates/_accomplishment-banner.html
+++ b/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'/>
diff --git a/lms/templates/certificates/_accomplishment-header.html b/lms/templates/certificates/_accomplishment-header.html
index e787e63635..6604aca2dd 100644
--- a/lms/templates/certificates/_accomplishment-header.html
+++ b/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">
 
diff --git a/lms/templates/certificates/_edx-accomplishment-print-help.html b/lms/templates/certificates/_edx-accomplishment-print-help.html
index 9622aa7208..eae27d96b0 100644
--- a/lms/templates/certificates/_edx-accomplishment-print-help.html
+++ b/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">
diff --git a/lms/templates/certificates/invalid.html b/lms/templates/certificates/invalid.html
index c67dfcbcfb..f951a454ba 100644
--- a/lms/templates/certificates/invalid.html
+++ b/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">
diff --git a/lms/templates/certificates/url_unsupported.html b/lms/templates/certificates/url_unsupported.html
index 46e22d7e3f..f4f50b2f9c 100644
--- a/lms/templates/certificates/url_unsupported.html
+++ b/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">
diff --git a/lms/templates/certificates/valid.html b/lms/templates/certificates/valid.html
index 4e89b0f251..961317bf34 100644
--- a/lms/templates/certificates/valid.html
+++ b/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" />
diff --git a/lms/templates/conditional_block.html b/lms/templates/conditional_block.html
index 4e9311a877..0ed667dd55 100644
--- a/lms/templates/conditional_block.html
+++ b/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
 %>
 
diff --git a/lms/templates/course_modes/_upgrade_button.html b/lms/templates/course_modes/_upgrade_button.html
index 29632bea01..02ff82c101 100644
--- a/lms/templates/course_modes/_upgrade_button.html
+++ b/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
 %>
 
diff --git a/lms/templates/course_modes/choose.html b/lms/templates/course_modes/choose.html
index f942734451..7dc2a00b41 100644
--- a/lms/templates/course_modes/choose.html
+++ b/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
diff --git a/lms/templates/course_modes/error.html b/lms/templates/course_modes/error.html
index 93e384e52f..0e1a3d2e28 100644
--- a/lms/templates/course_modes/error.html
+++ b/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
diff --git a/lms/templates/course_modes/fbe.html b/lms/templates/course_modes/fbe.html
index 2feaab8d72..048b73242e 100644
--- a/lms/templates/course_modes/fbe.html
+++ b/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">
diff --git a/lms/templates/course_modes/track_selection.html b/lms/templates/course_modes/track_selection.html
index f8af422e60..d1afba0d5c 100644
--- a/lms/templates/course_modes/track_selection.html
+++ b/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
diff --git a/lms/templates/course_modes/unfbe.html b/lms/templates/course_modes/unfbe.html
index 3ace0b1504..76189bae01 100644
--- a/lms/templates/course_modes/unfbe.html
+++ b/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">
diff --git a/lms/templates/courseware/accordion.html b/lms/templates/courseware/accordion.html
index a1a3e1290b..bfbff20731 100644
--- a/lms/templates/courseware/accordion.html
+++ b/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
 %>
diff --git a/lms/templates/courseware/course_about_sidebar_header.html b/lms/templates/courseware/course_about_sidebar_header.html
index b511fe7ce6..7f59ed1f2f 100644
--- a/lms/templates/courseware/course_about_sidebar_header.html
+++ b/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
 %>
diff --git a/lms/templates/courseware/course_navigation.html b/lms/templates/courseware/course_navigation.html
index 6f63e76fce..a0a784c318 100644
--- a/lms/templates/courseware/course_navigation.html
+++ b/lms/templates/courseware/course_navigation.html
@@ -10,7 +10,7 @@ from lms.djangoapps.course_goals.models import UserActivity
 
 from django.conf import settings
 from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 %>
 
 <%
diff --git a/lms/templates/courseware/course_updates.html b/lms/templates/courseware/course_updates.html
index eea03d65f5..777df9e725 100644
--- a/lms/templates/courseware/course_updates.html
+++ b/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">
diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html
index db30307367..a3ecb7c58c 100644
--- a/lms/templates/courseware/courses.html
+++ b/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" />
diff --git a/lms/templates/courseware/courseware-chromeless.html b/lms/templates/courseware/courseware-chromeless.html
index aaa94b9100..053fef73a7 100644
--- a/lms/templates/courseware/courseware-chromeless.html
+++ b/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
diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html
index 094a6766c5..28e3e5893e 100644
--- a/lms/templates/courseware/courseware.html
+++ b/lms/templates/courseware/courseware.html
@@ -7,7 +7,7 @@ import waffle
 
 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
diff --git a/lms/templates/courseware/error-message.html b/lms/templates/courseware/error-message.html
index afad57abfb..d1540aecd7 100644
--- a/lms/templates/courseware/error-message.html
+++ b/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
 %>
 
diff --git a/lms/templates/courseware/gradebook.html b/lms/templates/courseware/gradebook.html
index c5f4152a02..ef94c51649 100644
--- a/lms/templates/courseware/gradebook.html
+++ b/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
 %>
 
diff --git a/lms/templates/courseware/program_marketing.html b/lms/templates/courseware/program_marketing.html
index 4dd86c484d..656123b472 100644
--- a/lms/templates/courseware/program_marketing.html
+++ b/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
diff --git a/lms/templates/courseware/progress.html b/lms/templates/courseware/progress.html
index f0f1850e6e..fd087493d1 100644
--- a/lms/templates/courseware/progress.html
+++ b/lms/templates/courseware/progress.html
@@ -8,7 +8,7 @@ from datetime import datetime
 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
diff --git a/lms/templates/courseware/tab-view.html b/lms/templates/courseware/tab-view.html
index 727e7b8b37..319861c8ff 100644
--- a/lms/templates/courseware/tab-view.html
+++ b/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
 %>
 
diff --git a/lms/templates/courseware/tabs.html b/lms/templates/courseware/tabs.html
index 8dd79f22bb..120ac035a2 100644
--- a/lms/templates/courseware/tabs.html
+++ b/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" />
diff --git a/lms/templates/courseware/welcome-back.html b/lms/templates/courseware/welcome-back.html
index fe0130ca14..99320e0bd2 100644
--- a/lms/templates/courseware/welcome-back.html
+++ b/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
 %>
 
diff --git a/lms/templates/credit_notifications/credit_eligibility_email.html b/lms/templates/credit_notifications/credit_eligibility_email.html
index 3a91f26ca4..fa72266415 100644
--- a/lms/templates/credit_notifications/credit_eligibility_email.html
+++ b/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
 %>
 
diff --git a/lms/templates/credit_notifications/credit_eligibility_email.txt b/lms/templates/credit_notifications/credit_eligibility_email.txt
index 937c1fb7ed..c9a50a9d62 100644
--- a/lms/templates/credit_notifications/credit_eligibility_email.txt
+++ b/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:
diff --git a/lms/templates/dashboard/_dashboard_credit_info.html b/lms/templates/dashboard/_dashboard_credit_info.html
index eaac92e7b2..2f13f6e734 100644
--- a/lms/templates/dashboard/_dashboard_credit_info.html
+++ b/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'/>
diff --git a/lms/templates/dashboard/_dashboard_third_party_error.html b/lms/templates/dashboard/_dashboard_third_party_error.html
index 8903056380..5b9efe0bbd 100644
--- a/lms/templates/dashboard/_dashboard_third_party_error.html
+++ b/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">
diff --git a/lms/templates/dashboard/_entitlement_reason_survey.html b/lms/templates/dashboard/_entitlement_reason_survey.html
index 83e5e405e0..ba45364224 100644
--- a/lms/templates/dashboard/_entitlement_reason_survey.html
+++ b/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">
diff --git a/lms/templates/discussion/_discussion_inline.html b/lms/templates/discussion/_discussion_inline.html
index 335a291765..dea3156f37 100644
--- a/lms/templates/discussion/_discussion_inline.html
+++ b/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
 %>
diff --git a/lms/templates/discussion/_discussion_inline_studio.html b/lms/templates/discussion/_discussion_inline_studio.html
index 9433b6e7d5..a064b7d558 100644
--- a/lms/templates/discussion/_discussion_inline_studio.html
+++ b/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}">
diff --git a/lms/templates/discussion/_filter_dropdown.html b/lms/templates/discussion/_filter_dropdown.html
index fa04ac8eb8..c7b395c8f5 100644
--- a/lms/templates/discussion/_filter_dropdown.html
+++ b/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
 %>
diff --git a/lms/templates/discussion/_thread_list_template.html b/lms/templates/discussion/_thread_list_template.html
index e47bf34a0b..7120e9e10b 100644
--- a/lms/templates/discussion/_thread_list_template.html
+++ b/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">
diff --git a/lms/templates/discussion/_user_profile.html b/lms/templates/discussion/_user_profile.html
index e18b85cac6..d1910919fe 100644
--- a/lms/templates/discussion/_user_profile.html
+++ b/lms/templates/discussion/_user_profile.html
@@ -1,4 +1,4 @@
-<%! from django.utils.translation import ugettext as _, ungettext %>
+<%! from django.utils.translation import gettext as _, ungettext %>
 <%def name="span(num)"><span>${num}</span></%def>
 <div class="user-profile">
   <div class="sidebar-username"><a class="learner-profile-link" href="${learner_profile_page_url}">${django_user.username | h}</a></div>
diff --git a/lms/templates/enrollment/course_enrollment_message.html b/lms/templates/enrollment/course_enrollment_message.html
index 92885caae4..692fdcaddf 100644
--- a/lms/templates/enrollment/course_enrollment_message.html
+++ b/lms/templates/enrollment/course_enrollment_message.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="wrapper-msg urgency-high">
     <div class="msg">
diff --git a/lms/templates/financial-assistance/financial-assistance.html b/lms/templates/financial-assistance/financial-assistance.html
index a41799293f..88a8d5ff26 100644
--- a/lms/templates/financial-assistance/financial-assistance.html
+++ b/lms/templates/financial-assistance/financial-assistance.html
@@ -2,7 +2,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 common.djangoapps.edxmako.shortcuts import marketing_link
 
diff --git a/lms/templates/hidden_content.html b/lms/templates/hidden_content.html
index 33d7b79a7e..8af955f698 100644
--- a/lms/templates/hidden_content.html
+++ b/lms/templates/hidden_content.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
 %>
 
diff --git a/lms/templates/index_overlay.html b/lms/templates/index_overlay.html
index 9cd7a0f970..8a49adef32 100644
--- a/lms/templates/index_overlay.html
+++ b/lms/templates/index_overlay.html
@@ -1,7 +1,7 @@
 <%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/instructor/instructor_dashboard_2/certificates.html b/lms/templates/instructor/instructor_dashboard_2/certificates.html
index 0b993a0483..60e08f76aa 100644
--- a/lms/templates/instructor/instructor_dashboard_2/certificates.html
+++ b/lms/templates/instructor/instructor_dashboard_2/certificates.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 openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string
 %>
 
diff --git a/lms/templates/instructor/instructor_dashboard_2/cohort_management.html b/lms/templates/instructor/instructor_dashboard_2/cohort_management.html
index c7d6a67e8c..7322546e34 100644
--- a/lms/templates/instructor/instructor_dashboard_2/cohort_management.html
+++ b/lms/templates/instructor/instructor_dashboard_2/cohort_management.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 openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json
 from lms.djangoapps.courseware.courses import get_studio_url
 from openedx.core.djangoapps.course_groups.partition_scheme import get_cohorted_user_partition
diff --git a/lms/templates/instructor/instructor_dashboard_2/course_info.html b/lms/templates/instructor/instructor_dashboard_2/course_info.html
index 0daa68f6b8..600454826a 100644
--- a/lms/templates/instructor/instructor_dashboard_2/course_info.html
+++ b/lms/templates/instructor/instructor_dashboard_2/course_info.html
@@ -1,6 +1,6 @@
 <%page args="section_data" 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/instructor/instructor_dashboard_2/data_download_2.html b/lms/templates/instructor/instructor_dashboard_2/data_download_2.html
index fe3e12cece..f4554da0b9 100644
--- a/lms/templates/instructor/instructor_dashboard_2/data_download_2.html
+++ b/lms/templates/instructor/instructor_dashboard_2/data_download_2.html
@@ -1,7 +1,7 @@
 <%page args="section_data" 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
 %>
 
diff --git a/lms/templates/instructor/instructor_dashboard_2/data_download_2/certificates.html b/lms/templates/instructor/instructor_dashboard_2/data_download_2/certificates.html
index ea36196553..56c3fbb44d 100644
--- a/lms/templates/instructor/instructor_dashboard_2/data_download_2/certificates.html
+++ b/lms/templates/instructor/instructor_dashboard_2/data_download_2/certificates.html
@@ -1,7 +1,7 @@
 <%page args="section_data" 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
 %>
 
diff --git a/lms/templates/instructor/instructor_dashboard_2/data_download_2/grading.html b/lms/templates/instructor/instructor_dashboard_2/data_download_2/grading.html
index 5cd84df4a6..1b4749788f 100644
--- a/lms/templates/instructor/instructor_dashboard_2/data_download_2/grading.html
+++ b/lms/templates/instructor/instructor_dashboard_2/data_download_2/grading.html
@@ -1,7 +1,7 @@
 <%page args="section_data" 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
 %>
 
diff --git a/lms/templates/instructor/instructor_dashboard_2/data_download_2/problem_report.html b/lms/templates/instructor/instructor_dashboard_2/data_download_2/problem_report.html
index df2caff36f..82914987ef 100644
--- a/lms/templates/instructor/instructor_dashboard_2/data_download_2/problem_report.html
+++ b/lms/templates/instructor/instructor_dashboard_2/data_download_2/problem_report.html
@@ -1,7 +1,7 @@
 <%page args="section_data" 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
 %>
 
diff --git a/lms/templates/instructor/instructor_dashboard_2/data_download_2/reports.html b/lms/templates/instructor/instructor_dashboard_2/data_download_2/reports.html
index 71a3c2f45a..4a70e99b70 100644
--- a/lms/templates/instructor/instructor_dashboard_2/data_download_2/reports.html
+++ b/lms/templates/instructor/instructor_dashboard_2/data_download_2/reports.html
@@ -1,7 +1,7 @@
 <%page args="section_data" 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
 %>
 
diff --git a/lms/templates/instructor/instructor_dashboard_2/discussions_management.html b/lms/templates/instructor/instructor_dashboard_2/discussions_management.html
index 5b90141bb1..b65fae5897 100644
--- a/lms/templates/instructor/instructor_dashboard_2/discussions_management.html
+++ b/lms/templates/instructor/instructor_dashboard_2/discussions_management.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 openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json
 from lms.djangoapps.courseware.courses import get_studio_url
 from openedx.core.djangoapps.course_groups.partition_scheme import get_cohorted_user_partition
diff --git a/lms/templates/instructor/instructor_dashboard_2/extensions.html b/lms/templates/instructor/instructor_dashboard_2/extensions.html
index 504080cb8f..b32f6d0257 100644
--- a/lms/templates/instructor/instructor_dashboard_2/extensions.html
+++ b/lms/templates/instructor/instructor_dashboard_2/extensions.html
@@ -1,6 +1,6 @@
 <%page args="section_data" expression_filter="h"/>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 %>
 
 <div id="set-extension">
diff --git a/lms/templates/instructor/instructor_dashboard_2/generate_registarion_codes_modal.html b/lms/templates/instructor/instructor_dashboard_2/generate_registarion_codes_modal.html
index 4c81c080de..adb32a200a 100644
--- a/lms/templates/instructor/instructor_dashboard_2/generate_registarion_codes_modal.html
+++ b/lms/templates/instructor/instructor_dashboard_2/generate_registarion_codes_modal.html
@@ -1,6 +1,6 @@
 <%page args="section_data" expression_filter="h"/>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.urls import reverse
 %>
 <section id="registration_code_generation_modal" class="modal" role="dialog" tabindex="-1" aria-labelledby="header-registration-code">
diff --git a/lms/templates/instructor/instructor_dashboard_2/invalidate_registration_code_modal.html b/lms/templates/instructor/instructor_dashboard_2/invalidate_registration_code_modal.html
index 3275681faa..4f205292fa 100644
--- a/lms/templates/instructor/instructor_dashboard_2/invalidate_registration_code_modal.html
+++ b/lms/templates/instructor/instructor_dashboard_2/invalidate_registration_code_modal.html
@@ -1,5 +1,5 @@
 <%page args="section_data" expression_filter="h"/>
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 <%! from django.urls import reverse %>
 <section id="invalidate_registration_code_modal" class="modal" role="dialog" tabindex="-1" aria-labelledby="header-enrollment-code-status">
     <h2 id="header-enrollment-code-status" class="hd hd-2">${_("Enrollment Code Status")}</h2>
diff --git a/lms/templates/instructor/instructor_dashboard_2/membership.html b/lms/templates/instructor/instructor_dashboard_2/membership.html
index 5446f21f49..7fba151bbf 100644
--- a/lms/templates/instructor/instructor_dashboard_2/membership.html
+++ b/lms/templates/instructor/instructor_dashboard_2/membership.html
@@ -1,7 +1,7 @@
 <%page args="section_data" 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 django.utils.translation import pgettext
 from openedx.core.djangolib.markup import HTML, Text
 %>
diff --git a/lms/templates/instructor/instructor_dashboard_2/send_email.html b/lms/templates/instructor/instructor_dashboard_2/send_email.html
index e6d729480a..4550b7e76a 100644
--- a/lms/templates/instructor/instructor_dashboard_2/send_email.html
+++ b/lms/templates/instructor/instructor_dashboard_2/send_email.html
@@ -1,6 +1,6 @@
 <%page args="section_data" 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/instructor/instructor_dashboard_2/special_exams.html b/lms/templates/instructor/instructor_dashboard_2/special_exams.html
index b00a55aae5..194c0cdcb0 100644
--- a/lms/templates/instructor/instructor_dashboard_2/special_exams.html
+++ b/lms/templates/instructor/instructor_dashboard_2/special_exams.html
@@ -1,6 +1,6 @@
 <%page args="section_data" expression_filter="h"/>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from datetime import datetime, timedelta
 import pytz
 %>
diff --git a/lms/templates/instructor/instructor_dashboard_2/student_admin.html b/lms/templates/instructor/instructor_dashboard_2/student_admin.html
index ec21e3a993..668488bbf7 100644
--- a/lms/templates/instructor/instructor_dashboard_2/student_admin.html
+++ b/lms/templates/instructor/instructor_dashboard_2/student_admin.html
@@ -1,5 +1,5 @@
 <%page args="section_data" expression_filter="h"/>
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 %if section_data['access']['staff'] or section_data['access']['instructor']:
 <div class="action-type-container">
     %if section_data.get('writable_gradebook_url') or section_data.get('is_small_course'):
diff --git a/lms/templates/learner_dashboard/_dashboard_navigation_courses.html b/lms/templates/learner_dashboard/_dashboard_navigation_courses.html
index 697ae3706a..fed34134dd 100644
--- a/lms/templates/learner_dashboard/_dashboard_navigation_courses.html
+++ b/lms/templates/learner_dashboard/_dashboard_navigation_courses.html
@@ -1,6 +1,6 @@
 <%page expression_filter="h"/>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 %>
 
 <header class="wrapper-header-courses">
diff --git a/lms/templates/learner_dashboard/program_details.html b/lms/templates/learner_dashboard/program_details.html
index b18c48d151..bdf4bc00b7 100644
--- a/lms/templates/learner_dashboard/program_details.html
+++ b/lms/templates/learner_dashboard/program_details.html
@@ -4,7 +4,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
 %>
 
diff --git a/lms/templates/learner_dashboard/programs.html b/lms/templates/learner_dashboard/programs.html
index c37db0af4b..ded244caa1 100644
--- a/lms/templates/learner_dashboard/programs.html
+++ b/lms/templates/learner_dashboard/programs.html
@@ -4,7 +4,7 @@
 <%inherit file="../main.html" />
 <%def name="online_help_token()"><% return "programs" %></%def>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from openedx.core.djangolib.markup import HTML
 %>
 
diff --git a/lms/templates/navigation/bootstrap/navbar-authenticated.html b/lms/templates/navigation/bootstrap/navbar-authenticated.html
index 290920cf9d..6f53cc535b 100644
--- a/lms/templates/navigation/bootstrap/navbar-authenticated.html
+++ b/lms/templates/navigation/bootstrap/navbar-authenticated.html
@@ -6,7 +6,7 @@
 <%namespace file='../../main.html' import="login_query"/>
 <%!
 from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 %>
 
 <div class="collapse navbar-collapse" id="navbarSupportedContent">
diff --git a/lms/templates/navigation/bootstrap/navbar-logo-header.html b/lms/templates/navigation/bootstrap/navbar-logo-header.html
index 43fa05827c..e895e1f407 100644
--- a/lms/templates/navigation/bootstrap/navbar-logo-header.html
+++ b/lms/templates/navigation/bootstrap/navbar-logo-header.html
@@ -4,7 +4,7 @@
 
 <%namespace name='static' file='../../static_content.html'/>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 # App that handles subdomain specific branding
 from lms.djangoapps.branding import api as branding_api
diff --git a/lms/templates/navigation/navbar-authenticated.html b/lms/templates/navigation/navbar-authenticated.html
index 456338948a..32f8082a4d 100644
--- a/lms/templates/navigation/navbar-authenticated.html
+++ b/lms/templates/navigation/navbar-authenticated.html
@@ -6,7 +6,7 @@
 <%namespace file='../main.html' import="login_query"/>
 <%!
 from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 %>
 
 <ol class="left nav-global list-inline authenticated">
diff --git a/lms/templates/navigation/navbar-logo-header.html b/lms/templates/navigation/navbar-logo-header.html
index a07dd74cb5..1534e44e99 100644
--- a/lms/templates/navigation/navbar-logo-header.html
+++ b/lms/templates/navigation/navbar-logo-header.html
@@ -5,7 +5,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 lms.djangoapps.ccx.overrides import get_current_ccx
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 
diff --git a/lms/templates/navigation/navbar-not-authenticated.html b/lms/templates/navigation/navbar-not-authenticated.html
index 5a82a76ef0..cef6a96e46 100644
--- a/lms/templates/navigation/navbar-not-authenticated.html
+++ b/lms/templates/navigation/navbar-not-authenticated.html
@@ -6,7 +6,7 @@
 <%namespace file='../main.html' import="login_query"/>
 <%!
 from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 %>
 
 <ol class="left list-inline nav-global">
diff --git a/lms/templates/navigation/navigation.html b/lms/templates/navigation/navigation.html
index b26e1d60f1..b4d0b5b83e 100644
--- a/lms/templates/navigation/navigation.html
+++ b/lms/templates/navigation/navigation.html
@@ -10,7 +10,7 @@
 <%namespace file='../main.html' import="login_query"/>
 <%!
 from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from lms.djangoapps.ccx.overrides import get_current_ccx
 from openedx.core.djangolib.markup import HTML, Text
diff --git a/lms/templates/peer_grading/peer_grading.html b/lms/templates/peer_grading/peer_grading.html
index 928d2a6708..4ee10bc3ea 100644
--- a/lms/templates/peer_grading/peer_grading.html
+++ b/lms/templates/peer_grading/peer_grading.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/peer_grading/peer_grading_closed.html b/lms/templates/peer_grading/peer_grading_closed.html
index 698d3763bc..2da1485677 100644
--- a/lms/templates/peer_grading/peer_grading_closed.html
+++ b/lms/templates/peer_grading/peer_grading_closed.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="container peer-grading-container">
 <h2>${_("Peer Grading")}</h2>
     % if use_for_single_location:
diff --git a/lms/templates/peer_grading/peer_grading_problem.html b/lms/templates/peer_grading/peer_grading_problem.html
index ec8c87b420..d42cf5fdf9 100644
--- a/lms/templates/peer_grading/peer_grading_problem.html
+++ b/lms/templates/peer_grading/peer_grading_problem.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="container peer-grading-container">
     <div class="peer-grading" data-ajax-url="${ajax_url}" data-location="${problem_location}" data-use-single-location="${use_single_location}">
         <div class="error-container"></div>
diff --git a/lms/templates/registration/account_activation_sidebar_notice.html b/lms/templates/registration/account_activation_sidebar_notice.html
index be474707d2..afc82a11a5 100644
--- a/lms/templates/registration/account_activation_sidebar_notice.html
+++ b/lms/templates/registration/account_activation_sidebar_notice.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="profile-sidebar" role="region" aria-labelledby="account-activation-title">
diff --git a/lms/templates/registration/password_reset_complete.html b/lms/templates/registration/password_reset_complete.html
index 2bbfd8eb3d..bc39e3717f 100644
--- a/lms/templates/registration/password_reset_complete.html
+++ b/lms/templates/registration/password_reset_complete.html
@@ -3,7 +3,7 @@
 <%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/registration/password_reset_confirm.html b/lms/templates/registration/password_reset_confirm.html
index 3d07b365f3..f28b8b7016 100644
--- a/lms/templates/registration/password_reset_confirm.html
+++ b/lms/templates/registration/password_reset_confirm.html
@@ -3,7 +3,7 @@
 <%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
 from openedx.core.djangolib.markup import HTML, Text
 %>
diff --git a/lms/templates/registration/password_reset_done.html b/lms/templates/registration/password_reset_done.html
index fa34ab6e19..382ec437e7 100644
--- a/lms/templates/registration/password_reset_done.html
+++ b/lms/templates/registration/password_reset_done.html
@@ -1,4 +1,4 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 <header>
   <h2>${_("Password reset successful")}</h2>
   <hr>
diff --git a/lms/templates/split_test_staff_view.html b/lms/templates/split_test_staff_view.html
index 28bbd66534..b2eaa338e9 100644
--- a/lms/templates/split_test_staff_view.html
+++ b/lms/templates/split_test_staff_view.html
@@ -1,4 +1,4 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 
 <div class="split-test-view">
     <select class="split-test-select">
diff --git a/lms/templates/static_templates/404.html b/lms/templates/static_templates/404.html
index 6e0ad2268b..4ee3ea04e5 100644
--- a/lms/templates/static_templates/404.html
+++ b/lms/templates/static_templates/404.html
@@ -1,7 +1,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
 %>
 <%inherit file="../main.html" />
diff --git a/lms/templates/static_templates/429.html b/lms/templates/static_templates/429.html
index 8f3079f02f..4a27a0de14 100644
--- a/lms/templates/static_templates/429.html
+++ b/lms/templates/static_templates/429.html
@@ -1,7 +1,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
 %>
 <%inherit file="../main.html" />
diff --git a/lms/templates/static_templates/about.html b/lms/templates/static_templates/about.html
index 2bedeb61f6..dae42e36de 100644
--- a/lms/templates/static_templates/about.html
+++ b/lms/templates/static_templates/about.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">${_("About")}</%block>
diff --git a/lms/templates/static_templates/blog.html b/lms/templates/static_templates/blog.html
index 1256e97ee1..ba4d1ebae1 100644
--- a/lms/templates/static_templates/blog.html
+++ b/lms/templates/static_templates/blog.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">${_("Blog")}</%block>
diff --git a/lms/templates/static_templates/contact.html b/lms/templates/static_templates/contact.html
index d607dccb65..a5d772edaf 100644
--- a/lms/templates/static_templates/contact.html
+++ b/lms/templates/static_templates/contact.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">${_("Contact")}</%block>
diff --git a/lms/templates/static_templates/donate.html b/lms/templates/static_templates/donate.html
index 86d6e0812a..22f7a80df7 100644
--- a/lms/templates/static_templates/donate.html
+++ b/lms/templates/static_templates/donate.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">${_("Donate")}</%block>
diff --git a/lms/templates/static_templates/embargo.html b/lms/templates/static_templates/embargo.html
index 4a22d27ed4..f3b7161963 100644
--- a/lms/templates/static_templates/embargo.html
+++ b/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" />
diff --git a/lms/templates/static_templates/faq.html b/lms/templates/static_templates/faq.html
index d4c413e02c..6c22cfb007 100644
--- a/lms/templates/static_templates/faq.html
+++ b/lms/templates/static_templates/faq.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">${_("FAQ")}</%block>
diff --git a/lms/templates/static_templates/help.html b/lms/templates/static_templates/help.html
index 546f2e0410..054187b85a 100644
--- a/lms/templates/static_templates/help.html
+++ b/lms/templates/static_templates/help.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">${_("Help")}</%block>
diff --git a/lms/templates/static_templates/honor.html b/lms/templates/static_templates/honor.html
index 4fee7f2cee..84247773c6 100644
--- a/lms/templates/static_templates/honor.html
+++ b/lms/templates/static_templates/honor.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">${_("Honor Code")}</%block>
diff --git a/lms/templates/static_templates/jobs.html b/lms/templates/static_templates/jobs.html
index 3a736dbab1..61546e50b0 100644
--- a/lms/templates/static_templates/jobs.html
+++ b/lms/templates/static_templates/jobs.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">${_("Jobs")}</%block>
diff --git a/lms/templates/static_templates/media-kit.html b/lms/templates/static_templates/media-kit.html
index 4819bcaa9f..e9626fb372 100644
--- a/lms/templates/static_templates/media-kit.html
+++ b/lms/templates/static_templates/media-kit.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">${_("Media Kit")}</%block>
diff --git a/lms/templates/static_templates/news.html b/lms/templates/static_templates/news.html
index c7337a2ee6..6e930a6308 100644
--- a/lms/templates/static_templates/news.html
+++ b/lms/templates/static_templates/news.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" />
 
diff --git a/lms/templates/static_templates/press.html b/lms/templates/static_templates/press.html
index c7337a2ee6..6e930a6308 100644
--- a/lms/templates/static_templates/press.html
+++ b/lms/templates/static_templates/press.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" />
 
diff --git a/lms/templates/static_templates/privacy.html b/lms/templates/static_templates/privacy.html
index 1c4830feee..2ed74c7481 100644
--- a/lms/templates/static_templates/privacy.html
+++ b/lms/templates/static_templates/privacy.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" />
 
diff --git a/lms/templates/static_templates/server-down.html b/lms/templates/static_templates/server-down.html
index 1bfb1b27bb..252ce862b7 100644
--- a/lms/templates/static_templates/server-down.html
+++ b/lms/templates/static_templates/server-down.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" />
diff --git a/lms/templates/static_templates/server-error.html b/lms/templates/static_templates/server-error.html
index 89e7b99b7a..7d5e319353 100644
--- a/lms/templates/static_templates/server-error.html
+++ b/lms/templates/static_templates/server-error.html
@@ -1,7 +1,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
 %>
 <%inherit file="../main.html" />
diff --git a/lms/templates/static_templates/server-overloaded.html b/lms/templates/static_templates/server-overloaded.html
index 4511e6b4df..a797bbdad4 100644
--- a/lms/templates/static_templates/server-overloaded.html
+++ b/lms/templates/static_templates/server-overloaded.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" />
diff --git a/lms/templates/static_templates/tos.html b/lms/templates/static_templates/tos.html
index 107b035943..e8f893d7f2 100644
--- a/lms/templates/static_templates/tos.html
+++ b/lms/templates/static_templates/tos.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">${_("Terms of Service")}</%block>
diff --git a/lms/templates/student_account/account_settings.html b/lms/templates/student_account/account_settings.html
index 9f43b0b601..2748dc0379 100644
--- a/lms/templates/student_account/account_settings.html
+++ b/lms/templates/student_account/account_settings.html
@@ -5,7 +5,7 @@ import json
 
 from django.urls import reverse
 from django.conf import settings
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string
 from openedx.core.djangolib.markup import HTML
diff --git a/lms/templates/student_account/finish_auth.html b/lms/templates/student_account/finish_auth.html
index 3cd8d1d21e..a21d7ebe01 100644
--- a/lms/templates/student_account/finish_auth.html
+++ b/lms/templates/student_account/finish_auth.html
@@ -1,5 +1,5 @@
 <%page expression_filter="h"/>
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 <%namespace name='static' file='/static_content.html'/>
 <%inherit file="/main.html" />
 
diff --git a/lms/templates/student_account/login_and_register.html b/lms/templates/student_account/login_and_register.html
index 41a3ab6e12..a38212da22 100644
--- a/lms/templates/student_account/login_and_register.html
+++ b/lms/templates/student_account/login_and_register.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.djangoapps.site_configuration import helpers as configuration_helpers
     from openedx.core.djangolib.js_utils import dump_js_escaped_json
 %>
diff --git a/lms/templates/studio_render_paged_children_view.html b/lms/templates/studio_render_paged_children_view.html
index 46921168fc..9c057cb369 100644
--- a/lms/templates/studio_render_paged_children_view.html
+++ b/lms/templates/studio_render_paged_children_view.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'/>
 
diff --git a/lms/templates/support/certificates.html b/lms/templates/support/certificates.html
index 025eb88605..9e511987df 100644
--- a/lms/templates/support/certificates.html
+++ b/lms/templates/support/certificates.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.js_utils import js_escaped_string
 %>
 <%namespace name='static' file='../static_content.html'/>
diff --git a/lms/templates/support/contact_us.html b/lms/templates/support/contact_us.html
index dbdb93171f..4a93d60238 100644
--- a/lms/templates/support/contact_us.html
+++ b/lms/templates/support/contact_us.html
@@ -2,7 +2,7 @@
 
 <%!
 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, dump_js_escaped_json
 %>
diff --git a/lms/templates/support/enrollment.html b/lms/templates/support/enrollment.html
index 355242b34a..487a05be08 100644
--- a/lms/templates/support/enrollment.html
+++ b/lms/templates/support/enrollment.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
 %>
 
diff --git a/lms/templates/support/entitlement.html b/lms/templates/support/entitlement.html
index 71c03d930d..8b53a00e36 100644
--- a/lms/templates/support/entitlement.html
+++ b/lms/templates/support/entitlement.html
@@ -1,7 +1,7 @@
 <%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
 %>
 
diff --git a/lms/templates/support/link_program_enrollments.html b/lms/templates/support/link_program_enrollments.html
index 13b9b7f839..d721f5c448 100644
--- a/lms/templates/support/link_program_enrollments.html
+++ b/lms/templates/support/link_program_enrollments.html
@@ -1,7 +1,7 @@
 <%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
 %>
 
diff --git a/lms/templates/support/manage_user.html b/lms/templates/support/manage_user.html
index 61ef5262a2..d75b573d66 100644
--- a/lms/templates/support/manage_user.html
+++ b/lms/templates/support/manage_user.html
@@ -1,7 +1,7 @@
 <%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
 %>
 
diff --git a/lms/templates/support/program_enrollments_inspector.html b/lms/templates/support/program_enrollments_inspector.html
index 35d7f0ec5f..d42530ca36 100644
--- a/lms/templates/support/program_enrollments_inspector.html
+++ b/lms/templates/support/program_enrollments_inspector.html
@@ -1,7 +1,7 @@
 <%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
 %>
 
diff --git a/lms/templates/verify_student/_verification_help.html b/lms/templates/verify_student/_verification_help.html
index 9520638525..f3af82f5ad 100644
--- a/lms/templates/verify_student/_verification_help.html
+++ b/lms/templates/verify_student/_verification_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
 %>
 <%namespace name='static' file='../static_content.html'/>
diff --git a/lms/templates/verify_student/incourse_reverify.html b/lms/templates/verify_student/incourse_reverify.html
index fc451529b7..f05e36469c 100644
--- a/lms/templates/verify_student/incourse_reverify.html
+++ b/lms/templates/verify_student/incourse_reverify.html
@@ -1,6 +1,6 @@
 <%page expression_filter="h"/>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 %>
 <%namespace name='static' file='../static_content.html'/>
 
diff --git a/lms/templates/verify_student/missed_deadline.html b/lms/templates/verify_student/missed_deadline.html
index f9272a53bd..988f9d7371 100644
--- a/lms/templates/verify_student/missed_deadline.html
+++ b/lms/templates/verify_student/missed_deadline.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.verify_student.views import PayAndVerifyView
 %>
 <%namespace name='static' file='../static_content.html'/>
diff --git a/lms/templates/verify_student/pay_and_verify.html b/lms/templates/verify_student/pay_and_verify.html
index c6001e4fe8..8d2f4c1864 100644
--- a/lms/templates/verify_student/pay_and_verify.html
+++ b/lms/templates/verify_student/pay_and_verify.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.markup import HTML, Text
 from lms.djangoapps.verify_student.views import PayAndVerifyView
diff --git a/lms/templates/verify_student/reverify.html b/lms/templates/verify_student/reverify.html
index 7467ba1bee..e32e5b76b9 100644
--- a/lms/templates/verify_student/reverify.html
+++ b/lms/templates/verify_student/reverify.html
@@ -1,6 +1,6 @@
 <%page expression_filter="h"/>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 %>
 <%namespace name='static' file='../static_content.html'/>
 
diff --git a/lms/templates/verify_student/reverify_not_allowed.html b/lms/templates/verify_student/reverify_not_allowed.html
index 8fc7d63f86..0861942b23 100644
--- a/lms/templates/verify_student/reverify_not_allowed.html
+++ b/lms/templates/verify_student/reverify_not_allowed.html
@@ -1,6 +1,6 @@
 <%page expression_filter="h"/>
 <%!
-    from django.utils.translation import ugettext as _
+    from django.utils.translation import gettext as _
     from django.urls import reverse
 %>
 
diff --git a/lms/templates/widgets/html-edit.html b/lms/templates/widgets/html-edit.html
index 5e05bd2590..53c924aca7 100644
--- a/lms/templates/widgets/html-edit.html
+++ b/lms/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-editor="${editor}">
     <div class="html-editor editor">
diff --git a/lms/templates/word_cloud.html b/lms/templates/word_cloud.html
index 8cbd49fcea..9e2623f193 100644
--- a/lms/templates/word_cloud.html
+++ b/lms/templates/word_cloud.html
@@ -1,5 +1,5 @@
 <%page expression_filter="h"/>
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 
 <div
     id="word_cloud_${element_id}"
diff --git a/openedx/core/djangoapps/dark_lang/templates/dark_lang/preview-language-fragment.html b/openedx/core/djangoapps/dark_lang/templates/dark_lang/preview-language-fragment.html
index 311c1aac49..e39a4469dd 100644
--- a/openedx/core/djangoapps/dark_lang/templates/dark_lang/preview-language-fragment.html
+++ b/openedx/core/djangoapps/dark_lang/templates/dark_lang/preview-language-fragment.html
@@ -5,7 +5,7 @@
 <%namespace name='static' file='../static_content.html'/>
 
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 %>
 
 <%block name="content">
diff --git a/openedx/core/lib/license/templates/license.html b/openedx/core/lib/license/templates/license.html
index bfa41aa15e..d5a4832f13 100644
--- a/openedx/core/lib/license/templates/license.html
+++ b/openedx/core/lib/license/templates/license.html
@@ -1,7 +1,7 @@
 <%page args="license, button=False, button_size='88x31'" expression_filter="h"/>
 ## keep this synchronized with the contents of cms/templates/js/license-selector.underscore
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 def parse_license(lic):
     """
diff --git a/openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html b/openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
index a01005706f..a7038b3bda 100644
--- a/openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
+++ b/openedx/features/course_bookmarks/templates/course_bookmarks/course-bookmarks.html
@@ -12,7 +12,7 @@
 
 <%!
 import json
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.template.defaultfilters import escapejs
 
 from lms.djangoapps.discussion.django_comment_client.permissions import has_permission
diff --git a/openedx/features/course_experience/templates/course_experience/course-dates-fragment.html b/openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
index 62e08b6328..9ac8da9238 100644
--- a/openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
+++ b/openedx/features/course_experience/templates/course_experience/course-dates-fragment.html
@@ -5,7 +5,7 @@
 <%namespace name='static' file='../static_content.html'/>
 
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 %>
 % if len(course_date_blocks) > 0:
     <h3 class="hd hd-6 handouts-header">${_("Upcoming Dates")}</h3>
diff --git a/openedx/features/course_experience/templates/course_experience/course-sock-fragment.html b/openedx/features/course_experience/templates/course_experience/course-sock-fragment.html
index 7cba34ef8a..ede2a7f2b2 100644
--- a/openedx/features/course_experience/templates/course_experience/course-sock-fragment.html
+++ b/openedx/features/course_experience/templates/course_experience/course-sock-fragment.html
@@ -4,7 +4,7 @@
 <%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
 from openedx.features.course_experience import DISPLAY_COURSE_SOCK_FLAG
 %>
diff --git a/openedx/features/course_experience/templates/course_experience/course-updates-fragment.html b/openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
index 7b7d2dfe57..0e24960c78 100644
--- a/openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
+++ b/openedx/features/course_experience/templates/course_experience/course-updates-fragment.html
@@ -4,7 +4,7 @@
 <%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.features.course_experience import course_home_page_title
diff --git a/openedx/features/course_experience/templates/course_experience/dates-summary.html b/openedx/features/course_experience/templates/course_experience/dates-summary.html
index ec1f8b6bf7..7a2af96bd1 100644
--- a/openedx/features/course_experience/templates/course_experience/dates-summary.html
+++ b/openedx/features/course_experience/templates/course_experience/dates-summary.html
@@ -1,5 +1,5 @@
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 %>
 <%page args="course_date" expression_filter="h"/>
 ## The date-summary-container div must stay here because it is used in our
diff --git a/openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html b/openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
index e8ed1b1230..07e14bc48a 100644
--- a/openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
+++ b/openedx/features/learner_profile/static/learner_profile/templates/third_party_auth.html
@@ -1,6 +1,6 @@
 <%page expression_filter="h"/>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from common.djangoapps.third_party_auth import pipeline
 %>
 
diff --git a/openedx/features/learner_profile/templates/learner_profile/learner-achievements-fragment.html b/openedx/features/learner_profile/templates/learner_profile/learner-achievements-fragment.html
index 33fe77186f..09e6ce36b9 100644
--- a/openedx/features/learner_profile/templates/learner_profile/learner-achievements-fragment.html
+++ b/openedx/features/learner_profile/templates/learner_profile/learner-achievements-fragment.html
@@ -5,7 +5,7 @@
 <%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
 %>
 
diff --git a/openedx/features/learner_profile/templates/learner_profile/learner_profile.html b/openedx/features/learner_profile/templates/learner_profile/learner_profile.html
index 30d21a9c5a..6de4744e66 100644
--- a/openedx/features/learner_profile/templates/learner_profile/learner_profile.html
+++ b/openedx/features/learner_profile/templates/learner_profile/learner_profile.html
@@ -8,7 +8,7 @@
 <%!
 import json
 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 dump_js_escaped_json
 from openedx.core.djangolib.markup import HTML
 %>
diff --git a/themes/red-theme/lms/templates/footer.html b/themes/red-theme/lms/templates/footer.html
index 41b33d5672..d253ac93f8 100755
--- a/themes/red-theme/lms/templates/footer.html
+++ b/themes/red-theme/lms/templates/footer.html
@@ -3,7 +3,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 datetime import datetime
diff --git a/themes/stanford-style/lms/templates/courseware/course_about_sidebar_header.html b/themes/stanford-style/lms/templates/courseware/course_about_sidebar_header.html
index ee6566d91c..b20d635f09 100644
--- a/themes/stanford-style/lms/templates/courseware/course_about_sidebar_header.html
+++ b/themes/stanford-style/lms/templates/courseware/course_about_sidebar_header.html
@@ -1,6 +1,6 @@
 <%page expression_filter="h"/>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 %>
 
 <header>
diff --git a/themes/stanford-style/lms/templates/emails/activation_email.txt b/themes/stanford-style/lms/templates/emails/activation_email.txt
index 75958ffcae..d94a8d41f0 100644
--- a/themes/stanford-style/lms/templates/emails/activation_email.txt
+++ b/themes/stanford-style/lms/templates/emails/activation_email.txt
@@ -1,4 +1,4 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 ${_("Thank you for signing up for {platform_name}.").format(platform_name=settings.PLATFORM_NAME)}
 
 ${_("Change your life and start learning today by activating your "
diff --git a/themes/stanford-style/lms/templates/emails/confirm_email_change.txt b/themes/stanford-style/lms/templates/emails/confirm_email_change.txt
index c908534a83..e5ae79491f 100644
--- a/themes/stanford-style/lms/templates/emails/confirm_email_change.txt
+++ b/themes/stanford-style/lms/templates/emails/confirm_email_change.txt
@@ -1,4 +1,4 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 ${_("This is to confirm that you changed the e-mail associated with "
   "{platform_name} from {old_email} to {new_email}. If you "
   "did not make this request, please contact us at").format(platform_name=settings.PLATFORM_NAME, old_email=old_email, new_email=new_email)}
diff --git a/themes/stanford-style/lms/templates/emails/email_change.txt b/themes/stanford-style/lms/templates/emails/email_change.txt
index 108d661ec9..f1f020714d 100644
--- a/themes/stanford-style/lms/templates/emails/email_change.txt
+++ b/themes/stanford-style/lms/templates/emails/email_change.txt
@@ -1,4 +1,4 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 ${_("We received a request to change the e-mail associated with your "
     "{platform_name} account from {old_email} to {new_email}. "
     "If this is correct, please confirm your new e-mail address by "
diff --git a/themes/stanford-style/lms/templates/emails/reject_name_change.txt b/themes/stanford-style/lms/templates/emails/reject_name_change.txt
index 3e191ebef8..84b3672b30 100644
--- a/themes/stanford-style/lms/templates/emails/reject_name_change.txt
+++ b/themes/stanford-style/lms/templates/emails/reject_name_change.txt
@@ -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'/>
 (Not currently used)
 
diff --git a/themes/stanford-style/lms/templates/embargo/default_courseware.html b/themes/stanford-style/lms/templates/embargo/default_courseware.html
index cdd199f234..f1f508774c 100644
--- a/themes/stanford-style/lms/templates/embargo/default_courseware.html
+++ b/themes/stanford-style/lms/templates/embargo/default_courseware.html
@@ -1,4 +1,4 @@
-<%! 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/themes/stanford-style/lms/templates/embargo/default_enrollment.html b/themes/stanford-style/lms/templates/embargo/default_enrollment.html
index cdd199f234..f1f508774c 100644
--- a/themes/stanford-style/lms/templates/embargo/default_enrollment.html
+++ b/themes/stanford-style/lms/templates/embargo/default_enrollment.html
@@ -1,4 +1,4 @@
-<%! 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/themes/stanford-style/lms/templates/footer.html b/themes/stanford-style/lms/templates/footer.html
index 454272c49d..afd4dfd4e4 100644
--- a/themes/stanford-style/lms/templates/footer.html
+++ b/themes/stanford-style/lms/templates/footer.html
@@ -2,7 +2,7 @@
 <%!
   from datetime import date
   from django.urls import reverse
-  from django.utils.translation import ugettext as _
+  from django.utils.translation import gettext as _
   from openedx.core.djangoapps.lang_pref.api import footer_language_selector_is_enabled
 %>
 <%namespace name='static' file='static_content.html'/>
diff --git a/themes/stanford-style/lms/templates/index.html b/themes/stanford-style/lms/templates/index.html
index a9e368008e..9d0f8f0d14 100644
--- a/themes/stanford-style/lms/templates/index.html
+++ b/themes/stanford-style/lms/templates/index.html
@@ -1,6 +1,6 @@
 <%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
 %>
 
diff --git a/themes/stanford-style/lms/templates/register-form.html b/themes/stanford-style/lms/templates/register-form.html
index 16228ad8ed..4faef45c31 100644
--- a/themes/stanford-style/lms/templates/register-form.html
+++ b/themes/stanford-style/lms/templates/register-form.html
@@ -2,7 +2,7 @@
 <%!
 from common.djangoapps import third_party_auth
 from common.djangoapps.third_party_auth import pipeline, provider
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django_countries import countries
 from common.djangoapps.student.models import UserProfile
 %>
diff --git a/themes/stanford-style/lms/templates/register-shib.html b/themes/stanford-style/lms/templates/register-shib.html
index a619398d9e..d26e1041b6 100644
--- a/themes/stanford-style/lms/templates/register-shib.html
+++ b/themes/stanford-style/lms/templates/register-shib.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
diff --git a/themes/stanford-style/lms/templates/register-sidebar.html b/themes/stanford-style/lms/templates/register-sidebar.html
index d3738c529b..97c2e35881 100644
--- a/themes/stanford-style/lms/templates/register-sidebar.html
+++ b/themes/stanford-style/lms/templates/register-sidebar.html
@@ -1,5 +1,5 @@
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.urls import reverse
 %>
 <%namespace file='main.html' import="login_query"/>
diff --git a/themes/stanford-style/lms/templates/static_templates/about.html b/themes/stanford-style/lms/templates/static_templates/about.html
index e416d49572..b2698a267d 100644
--- a/themes/stanford-style/lms/templates/static_templates/about.html
+++ b/themes/stanford-style/lms/templates/static_templates/about.html
@@ -1,6 +1,6 @@
 ## mako
 <%!
-  from django.utils.translation import ugettext as _
+  from django.utils.translation import gettext as _
 %>
 <%namespace name='static' file='/static_content.html'/>
 
diff --git a/themes/stanford-style/lms/templates/static_templates/embargo.html b/themes/stanford-style/lms/templates/static_templates/embargo.html
index 72a3e2bf0c..b52436c258 100644
--- a/themes/stanford-style/lms/templates/static_templates/embargo.html
+++ b/themes/stanford-style/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" />
diff --git a/themes/stanford-style/lms/templates/static_templates/tos.html b/themes/stanford-style/lms/templates/static_templates/tos.html
index 574b08d44b..d6f33a6c93 100644
--- a/themes/stanford-style/lms/templates/static_templates/tos.html
+++ b/themes/stanford-style/lms/templates/static_templates/tos.html
@@ -1,7 +1,7 @@
 ## mako
 <%page expression_filter="h"/>
 <%!
-  from django.utils.translation import ugettext as _
+  from django.utils.translation import gettext as _
 %>
 <%inherit file="/main.html" />
 
diff --git a/xmodule/capa/templates/choicetext.html b/xmodule/capa/templates/choicetext.html
index 64c4226b08..544a30ac6a 100644
--- a/xmodule/capa/templates/choicetext.html
+++ b/xmodule/capa/templates/choicetext.html
@@ -1,5 +1,5 @@
 <%! from xmodule.capa.util import remove_markup
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from openedx.core.djangolib.markup import HTML
 %>
 
diff --git a/xmodule/capa/templates/codeinput.html b/xmodule/capa/templates/codeinput.html
index 11c5e23526..6bb972756b 100644
--- a/xmodule/capa/templates/codeinput.html
+++ b/xmodule/capa/templates/codeinput.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
 %>
 <div id="textbox_${id}" class="capa_inputtype textbox cminput">