diff --git a/cms/templates/404.html b/cms/templates/404.html
index 582c6f66eb..3f89cced0c 100644
--- a/cms/templates/404.html
+++ b/cms/templates/404.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="base.html" />
diff --git a/cms/templates/500.html b/cms/templates/500.html
index 6bd686b2b0..0c162e6334 100644
--- a/cms/templates/500.html
+++ b/cms/templates/500.html
@@ -1,7 +1,7 @@
 <%page expression_filter="h"/>
 <%!
 from openedx.core.djangolib.markup import HTML, Text
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 %>
 <%inherit file="base.html" />
 <%block name="title">
diff --git a/cms/templates/base.html b/cms/templates/base.html
index 3fb73fdce7..2e420568ef 100644
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -8,7 +8,7 @@
 ## Standard imports
 <%namespace name='static' file='static_content.html'/>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from cms.djangoapps.contentstore.config.waffle import CUSTOM_RELATIVE_DATES
 from lms.djangoapps.branding import api as branding_api
diff --git a/cms/templates/group_configurations.html b/cms/templates/group_configurations.html
index 27a0c3f252..0a0165df93 100644
--- a/cms/templates/group_configurations.html
+++ b/cms/templates/group_configurations.html
@@ -6,7 +6,7 @@
 <%namespace name='static' file='static_content.html'/>
 <%!
 from cms.djangoapps.contentstore import utils
-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/cms/templates/howitworks.html b/cms/templates/howitworks.html
index 77fb354f38..014ad2798d 100644
--- a/cms/templates/howitworks.html
+++ b/cms/templates/howitworks.html
@@ -4,7 +4,7 @@
 <%namespace name='static' file='static_content.html'/>
 <%!
   from django.conf import settings
-  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/cms/templates/import.html b/cms/templates/import.html
index d37aa30f88..5791fb2f1c 100644
--- a/cms/templates/import.html
+++ b/cms/templates/import.html
@@ -10,7 +10,7 @@ else:
 </%def>
 <%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/cms/templates/index.html b/cms/templates/index.html
index 723bfa694e..4ba762b8f3 100644
--- a/cms/templates/index.html
+++ b/cms/templates/index.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
 
 from openedx.core.djangolib.markup import HTML, Text
diff --git a/cms/templates/library.html b/cms/templates/library.html
index 8985b4e5c5..a1c0f4525f 100644
--- a/cms/templates/library.html
+++ b/cms/templates/library.html
@@ -5,7 +5,7 @@
 </%def>
 <%!
 from cms.djangoapps.contentstore.views.helpers import xblock_studio_url, xblock_type_display_name
-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, Text
 %>
diff --git a/cms/templates/manage_users.html b/cms/templates/manage_users.html
index 580a313dc3..5d844eed27 100644
--- a/cms/templates/manage_users.html
+++ b/cms/templates/manage_users.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 openedx.core.djangolib.js_utils import (
diff --git a/cms/templates/manage_users_lib.html b/cms/templates/manage_users_lib.html
index 0800be9eb5..a42f22cc29 100644
--- a/cms/templates/manage_users_lib.html
+++ b/cms/templates/manage_users_lib.html
@@ -2,7 +2,7 @@
 
 <%inherit file="base.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 (
diff --git a/cms/templates/registration/activation_complete.html b/cms/templates/registration/activation_complete.html
index 0c5364c969..ac4c76972b 100644
--- a/cms/templates/registration/activation_complete.html
+++ b/cms/templates/registration/activation_complete.html
@@ -2,7 +2,7 @@
 <%inherit file="../base.html" />
 <%!
 from django.conf import settings
-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/cms/templates/registration/activation_invalid.html b/cms/templates/registration/activation_invalid.html
index 27bd753343..d106195127 100644
--- a/cms/templates/registration/activation_invalid.html
+++ b/cms/templates/registration/activation_invalid.html
@@ -2,7 +2,7 @@
 <%inherit file="../base.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
 from openedx.core.djangolib.markup import HTML, Text
 %>
diff --git a/cms/templates/textbooks.html b/cms/templates/textbooks.html
index f8cc80e46f..a20586b0f0 100644
--- a/cms/templates/textbooks.html
+++ b/cms/templates/textbooks.html
@@ -3,7 +3,7 @@
 <%def name="online_help_token()"><% return "textbooks" %></%def>
 <%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
 from cms.djangoapps.contentstore.utils import get_pages_and_resources_url
 %>
diff --git a/cms/templates/videos_index.html b/cms/templates/videos_index.html
index 0ab0ef96c5..5e69204255 100644
--- a/cms/templates/videos_index.html
+++ b/cms/templates/videos_index.html
@@ -4,7 +4,7 @@
 <%!
   import json
   from django.core.serializers.json import DjangoJSONEncoder
-  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/cms/templates/videos_index_pagination.html b/cms/templates/videos_index_pagination.html
index aece51624a..a96c291646 100644
--- a/cms/templates/videos_index_pagination.html
+++ b/cms/templates/videos_index_pagination.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 dump_js_escaped_json
 %>
 <link href="//cdnjs.cloudflare.com/ajax/libs/simplePagination.js/1.6/simplePagination.min.css" rel="stylesheet">
@@ -10,13 +10,13 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json
         <br>
         <div id="video_upload_pagination" style="display: inline-block"></div>
         <br>
-        <span id="videos_per_page" 
+        <span id="videos_per_page"
             data-ok-button="${_('Submit')}"
             data-cancel-button="${_('Cancel')}"
-            data-data="${pagination_context['items_on_one_page']}" 
+            data-data="${pagination_context['items_on_one_page']}"
             data-placeholder="${_('Changing..')}"
             data-activator="#edit-activator">
-            ${_('Videos per page:')} ${pagination_context['items_on_one_page']} 
+            ${_('Videos per page:')} ${pagination_context['items_on_one_page']}
         </span>
         <button id="edit-activator" class="btn-default edit-button action-button">
             <span class="icon fa fa-pencil" aria-hidden="true"></span>
diff --git a/cms/templates/visibility_editor.html b/cms/templates/visibility_editor.html
index 1ee658fabc..606a0c5ce3 100644
--- a/cms/templates/visibility_editor.html
+++ b/cms/templates/visibility_editor.html
@@ -1,7 +1,7 @@
 <%page expression_filter="h"/>
 <%
 from django.conf import settings
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from cms.djangoapps.contentstore.utils import ancestor_has_staff_lock, get_visibility_partition_info
 from openedx.core.djangolib.markup import HTML, Text
 from lms.lib.utils import is_unit