Converted usage of ugettext* functions to their gettext* aliases

Thanks Tim Graham for the review.

32 files changed, 107 insertions, 96 deletions

diff --git a/tests/admin_utils/models.py b/tests/admin_utils/models.py
index cf90421e9a..dafb24e342 100644
--- a/tests/admin_utils/models.py
+++ b/tests/admin_utils/models.py
@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class Site(models.Model):
diff --git a/tests/auth_tests/test_forms.py b/tests/auth_tests/test_forms.py
index 24343ea5f5..68bcd892a1 100644
--- a/tests/auth_tests/test_forms.py
+++ b/tests/auth_tests/test_forms.py
@@ -17,7 +17,7 @@ from django.forms.fields import CharField, Field, IntegerField
 from django.test import SimpleTestCase, TestCase, override_settings
 from django.utils import translation
 from django.utils.text import capfirst
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from .models.custom_user import (
     CustomUser, CustomUserWithoutIsActiveField, ExtensionUser,
diff --git a/tests/auth_tests/test_management.py b/tests/auth_tests/test_management.py
index b1b629021f..28e8c6328e 100644
--- a/tests/auth_tests/test_management.py
+++ b/tests/auth_tests/test_management.py
@@ -16,7 +16,7 @@ from django.core.management import call_command
 from django.core.management.base import CommandError
 from django.db import migrations
 from django.test import TestCase, override_settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .models import (
     CustomUser, CustomUserNonUniqueUsername, CustomUserWithFK, Email,
diff --git a/tests/basic/tests.py b/tests/basic/tests.py
index 571088da40..12da117edf 100644
--- a/tests/basic/tests.py
+++ b/tests/basic/tests.py
@@ -9,7 +9,7 @@ from django.test import (
     SimpleTestCase, TestCase, TransactionTestCase, skipIfDBFeature,
     skipUnlessDBFeature,
 )
-from django.utils.translation import ugettext_lazy
+from django.utils.translation import gettext_lazy
 
 from .models import Article, ArticleSelectOnSave, SelfRef
 
@@ -310,13 +310,13 @@ class ModelTest(TestCase):
             pub_date__year=2008).extra(select={'dashed-value': '1', 'undashedvalue': '2'})
         self.assertEqual(articles[0].undashedvalue, 2)
 
-    def test_create_relation_with_ugettext_lazy(self):
+    def test_create_relation_with_gettext_lazy(self):
         """
-        ugettext_lazy objects work when saving model instances
+        gettext_lazy objects work when saving model instances
         through various methods. Refs #10498.
         """
         notlazy = 'test'
-        lazy = ugettext_lazy(notlazy)
+        lazy = gettext_lazy(notlazy)
         Article.objects.create(headline=lazy, pub_date=datetime.now())
         article = Article.objects.get()
         self.assertEqual(article.headline, notlazy)
diff --git a/tests/flatpages_tests/test_forms.py b/tests/flatpages_tests/test_forms.py
index 228790a448..9ed678fdc2 100644
--- a/tests/flatpages_tests/test_forms.py
+++ b/tests/flatpages_tests/test_forms.py
@@ -99,6 +99,4 @@ class FlatpageAdminFormTests(TestCase):
 
         self.assertFalse(f.is_valid())
 
-        self.assertEqual(
-            f.errors,
-            {'sites': [translation.ugettext('This field is required.')]})
+        self.assertEqual(f.errors, {'sites': [translation.gettext('This field is required.')]})
diff --git a/tests/forms_tests/tests/test_i18n.py b/tests/forms_tests/tests/test_i18n.py
index a8a2cf3846..73d5b270eb 100644
--- a/tests/forms_tests/tests/test_i18n.py
+++ b/tests/forms_tests/tests/test_i18n.py
@@ -3,13 +3,13 @@ from django.forms import (
 )
 from django.test import SimpleTestCase
 from django.utils import translation
-from django.utils.translation import gettext_lazy, ugettext_lazy
+from django.utils.translation import gettext_lazy
 
 
 class FormsI18nTests(SimpleTestCase):
     def test_lazy_labels(self):
         class SomeForm(Form):
-            username = CharField(max_length=10, label=ugettext_lazy('username'))
+            username = CharField(max_length=10, label=gettext_lazy('username'))
 
         f = SomeForm()
         self.assertHTMLEqual(
@@ -34,10 +34,10 @@ class FormsI18nTests(SimpleTestCase):
 
     def test_non_ascii_label(self):
         class SomeForm(Form):
-            field_1 = CharField(max_length=10, label=ugettext_lazy('field_1'))
+            field_1 = CharField(max_length=10, label=gettext_lazy('field_1'))
             field_2 = CharField(
                 max_length=10,
-                label=ugettext_lazy('field_2'),
+                label=gettext_lazy('field_2'),
                 widget=TextInput(attrs={'id': 'field_2_id'}),
             )
 
diff --git a/tests/forms_tests/tests/test_utils.py b/tests/forms_tests/tests/test_utils.py
index 68991319e2..a9b4d99560 100644
--- a/tests/forms_tests/tests/test_utils.py
+++ b/tests/forms_tests/tests/test_utils.py
@@ -4,7 +4,7 @@ from django.core.exceptions import ValidationError
 from django.forms.utils import ErrorDict, ErrorList, flatatt
 from django.test import SimpleTestCase
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy
+from django.utils.translation import gettext_lazy
 
 
 class FormsUtilsTestCase(SimpleTestCase):
@@ -66,7 +66,7 @@ class FormsUtilsTestCase(SimpleTestCase):
         )
         # Can take a lazy string.
         self.assertHTMLEqual(
-            str(ErrorList(ValidationError(ugettext_lazy("Error.")).messages)),
+            str(ErrorList(ValidationError(gettext_lazy("Error.")).messages)),
             '<ul class="errorlist"><li>Error.</li></ul>'
         )
         # Can take a list.
@@ -84,7 +84,7 @@ class FormsUtilsTestCase(SimpleTestCase):
             str(ErrorList(sorted(ValidationError([
                 "1. First error.",
                 "2. Not \u03C0.",
-                ugettext_lazy("3. Error."),
+                gettext_lazy("3. Error."),
                 {
                     'error_1': "4. First dict error.",
                     'error_2': "5. Second dict error.",
diff --git a/tests/humanize_tests/tests.py b/tests/humanize_tests/tests.py
index 90a5155cfb..df9ae4f35d 100644
--- a/tests/humanize_tests/tests.py
+++ b/tests/humanize_tests/tests.py
@@ -7,7 +7,7 @@ from django.test import SimpleTestCase, modify_settings, override_settings
 from django.utils import translation
 from django.utils.html import escape
 from django.utils.timezone import get_fixed_timezone, utc
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 # Mock out datetime in some tests so they don't fail occasionally when they
 # run too slow. Use a fixed datetime for datetime.now(). DST change in
diff --git a/tests/i18n/commands/__init__.py b/tests/i18n/commands/__init__.py
index 39ce6d7a17..f0a06505de 100644
--- a/tests/i18n/commands/__init__.py
+++ b/tests/i18n/commands/__init__.py
@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext as _, ungettext
+from django.utils.translation import gettext as _, ngettext
 
 # Translators: This comment should be extracted
 dummy1 = _("This is a translatable string.")
@@ -9,7 +9,7 @@ dummy2 = _("This is another translatable string.")
 # This file has a literal with plural forms. When processed first, makemessages
 # shouldn't create a .po file with duplicate `Plural-Forms` headers
 number = 3
-dummy3 = ungettext("%(number)s Foo", "%(number)s Foos", number) % {'number': number}
+dummy3 = ngettext("%(number)s Foo", "%(number)s Foos", number) % {'number': number}
 
 dummy4 = _('Size')
 
diff --git a/tests/i18n/commands/code.sample b/tests/i18n/commands/code.sample
index bbcb83164b..a5f1520ecb 100644
--- a/tests/i18n/commands/code.sample
+++ b/tests/i18n/commands/code.sample
@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext
+from django.utils.translation import gettext
 
 # This will generate an xgettext warning
-my_string = ugettext("This string contain two placeholders: %s and %s" % ('a', 'b'))
+my_string = gettext("This string contain two placeholders: %s and %s" % ('a', 'b'))
diff --git a/tests/i18n/exclude/__init__.py b/tests/i18n/exclude/__init__.py
index ff4b2bb2ad..18c8be6e85 100644
--- a/tests/i18n/exclude/__init__.py
+++ b/tests/i18n/exclude/__init__.py
@@ -3,7 +3,7 @@
 # The locale directory for this app is generated automatically
 # by the test cases.
 
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 # Translators: This comment should be extracted
 dummy1 = _("This is a translatable string.")
diff --git a/tests/i18n/models.py b/tests/i18n/models.py
index 3afc0841c6..15b4de57b6 100644
--- a/tests/i18n/models.py
+++ b/tests/i18n/models.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class TestModel(models.Model):
diff --git a/tests/i18n/patterns/urls/default.py b/tests/i18n/patterns/urls/default.py
index caf1a7637d..b7fc38cf89 100644
--- a/tests/i18n/patterns/urls/default.py
+++ b/tests/i18n/patterns/urls/default.py
@@ -1,6 +1,6 @@
 from django.conf.urls import include, url
 from django.conf.urls.i18n import i18n_patterns
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import TemplateView
 
 view = TemplateView.as_view(template_name='dummy.html')
diff --git a/tests/i18n/patterns/urls/namespace.py b/tests/i18n/patterns/urls/namespace.py
index 3a34c7d815..2f19640d37 100644
--- a/tests/i18n/patterns/urls/namespace.py
+++ b/tests/i18n/patterns/urls/namespace.py
@@ -1,5 +1,5 @@
 from django.conf.urls import url
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import TemplateView
 
 view = TemplateView.as_view(template_name='dummy.html')
diff --git a/tests/i18n/patterns/urls/wrong.py b/tests/i18n/patterns/urls/wrong.py
index a8f9410db8..99504dbb87 100644
--- a/tests/i18n/patterns/urls/wrong.py
+++ b/tests/i18n/patterns/urls/wrong.py
@@ -1,6 +1,6 @@
 from django.conf.urls import include, url
 from django.conf.urls.i18n import i18n_patterns
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 urlpatterns = i18n_patterns(
     url(_(r'^account/'), include('i18n.patterns.urls.wrong_namespace', namespace='account')),
diff --git a/tests/i18n/patterns/urls/wrong_namespace.py b/tests/i18n/patterns/urls/wrong_namespace.py
index 3983cb6195..f36c1a88a2 100644
--- a/tests/i18n/patterns/urls/wrong_namespace.py
+++ b/tests/i18n/patterns/urls/wrong_namespace.py
@@ -1,6 +1,6 @@
 from django.conf.urls import url
 from django.conf.urls.i18n import i18n_patterns
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import TemplateView
 
 view = TemplateView.as_view(template_name='dummy.html')
diff --git a/tests/i18n/project_dir/__init__.py b/tests/i18n/project_dir/__init__.py
index b32b258e37..2f19eed79f 100644
--- a/tests/i18n/project_dir/__init__.py
+++ b/tests/i18n/project_dir/__init__.py
@@ -1,4 +1,4 @@
 # Sample project used by test_extraction.CustomLayoutExtractionTests
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 string = _("This is a project-level string")
diff --git a/tests/i18n/project_dir/app_no_locale/models.py b/tests/i18n/project_dir/app_no_locale/models.py
index 06dfbaa5d4..00c2691bf2 100644
--- a/tests/i18n/project_dir/app_no_locale/models.py
+++ b/tests/i18n/project_dir/app_no_locale/models.py
@@ -1,3 +1,3 @@
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 string = _("This app has no locale directory")
diff --git a/tests/i18n/project_dir/app_with_locale/models.py b/tests/i18n/project_dir/app_with_locale/models.py
index ab35d5002a..b773e95e2b 100644
--- a/tests/i18n/project_dir/app_with_locale/models.py
+++ b/tests/i18n/project_dir/app_with_locale/models.py
@@ -1,3 +1,3 @@
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 string = _("This app has a locale directory")
diff --git a/tests/i18n/test_compilation.py b/tests/i18n/test_compilation.py
index db6c813115..258ab53042 100644
--- a/tests/i18n/test_compilation.py
+++ b/tests/i18n/test_compilation.py
@@ -15,7 +15,7 @@ from django.core.management.utils import find_command
 from django.test import SimpleTestCase, override_settings
 from django.test.utils import captured_stderr, captured_stdout
 from django.utils import translation
-from django.utils.translation import ugettext
+from django.utils.translation import gettext
 
 from .utils import RunInTmpDirMixin, copytree
 
@@ -167,15 +167,15 @@ class FuzzyTranslationTest(ProjectAndAppTests):
         with override_settings(LOCALE_PATHS=[os.path.join(self.test_dir, 'locale')]):
             call_command('compilemessages', locale=[self.LOCALE], stdout=StringIO())
             with translation.override(self.LOCALE):
-                self.assertEqual(ugettext('Lenin'), 'Ленин')
-                self.assertEqual(ugettext('Vodka'), 'Vodka')
+                self.assertEqual(gettext('Lenin'), 'Ленин')
+                self.assertEqual(gettext('Vodka'), 'Vodka')
 
     def test_fuzzy_compiling(self):
         with override_settings(LOCALE_PATHS=[os.path.join(self.test_dir, 'locale')]):
             call_command('compilemessages', locale=[self.LOCALE], fuzzy=True, stdout=StringIO())
             with translation.override(self.LOCALE):
-                self.assertEqual(ugettext('Lenin'), 'Ленин')
-                self.assertEqual(ugettext('Vodka'), 'Водка')
+                self.assertEqual(gettext('Lenin'), 'Ленин')
+                self.assertEqual(gettext('Vodka'), 'Водка')
 
 
 class AppCompilationTest(ProjectAndAppTests):
diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py
index 9aa8821ef9..2f61007fff 100644
--- a/tests/i18n/tests.py
+++ b/tests/i18n/tests.py
@@ -23,9 +23,9 @@ from django.utils.numberformat import format as nformat
 from django.utils.safestring import SafeText
 from django.utils.translation import (
     LANGUAGE_SESSION_KEY, activate, check_for_language, deactivate,
-    get_language, get_language_from_request, get_language_info, gettext_lazy,
-    npgettext, npgettext_lazy, pgettext, trans_real, ugettext, ugettext_lazy,
-    ungettext, ungettext_lazy,
+    get_language, get_language_from_request, get_language_info, gettext,
+    gettext_lazy, ngettext, ngettext_lazy, npgettext, npgettext_lazy, pgettext,
+    trans_real, ugettext, ugettext_lazy, ungettext, ungettext_lazy,
 )
 
 from .forms import CompanyForm, I18nForm, SelectDateForm
@@ -52,15 +52,28 @@ def patch_formats(lang, **settings):
 
 class TranslationTests(SimpleTestCase):
 
+    @translation.override('de')
+    def test_legacy_aliases(self):
+        """
+        Pre-Django 2.0 aliases with u prefix are still available.
+        """
+        self.assertEqual(ugettext("Image"), "Bild")
+        self.assertEqual(ugettext_lazy("Image"), gettext_lazy("Image"))
+        self.assertEqual(ungettext("%d year", "%d years", 0) % 0, "0 Jahre")
+        self.assertEqual(
+            ungettext_lazy("%d year", "%d years", 0) % 0,
+            ngettext_lazy("%d year", "%d years", 0) % 0,
+        )
+
     @translation.override('fr')
     def test_plural(self):
         """
-        Test plurals with ungettext. French differs from English in that 0 is singular.
+        Test plurals with ngettext. French differs from English in that 0 is singular.
         """
-        self.assertEqual(ungettext("%d year", "%d years", 0) % 0, "0 année")
-        self.assertEqual(ungettext("%d year", "%d years", 2) % 2, "2 années")
-        self.assertEqual(ungettext("%(size)d byte", "%(size)d bytes", 0) % {'size': 0}, "0 octet")
-        self.assertEqual(ungettext("%(size)d byte", "%(size)d bytes", 2) % {'size': 2}, "2 octets")
+        self.assertEqual(ngettext("%d year", "%d years", 0) % 0, "0 année")
+        self.assertEqual(ngettext("%d year", "%d years", 2) % 2, "2 années")
+        self.assertEqual(ngettext("%(size)d byte", "%(size)d bytes", 0) % {'size': 0}, "0 octet")
+        self.assertEqual(ngettext("%(size)d byte", "%(size)d bytes", 2) % {'size': 2}, "2 octets")
 
     def test_override(self):
         activate('de')
@@ -119,7 +132,7 @@ class TranslationTests(SimpleTestCase):
         """
         Format string interpolation should work with *_lazy objects.
         """
-        s = ugettext_lazy('Add %(name)s')
+        s = gettext_lazy('Add %(name)s')
         d = {'name': 'Ringo'}
         self.assertEqual('Add Ringo', s % d)
         with translation.override('de', deactivate=True):
@@ -128,26 +141,26 @@ class TranslationTests(SimpleTestCase):
                 self.assertEqual('Dodaj Ringo', s % d)
 
         # It should be possible to compare *_lazy objects.
-        s1 = ugettext_lazy('Add %(name)s')
+        s1 = gettext_lazy('Add %(name)s')
         self.assertEqual(s, s1)
         s2 = gettext_lazy('Add %(name)s')
         s3 = gettext_lazy('Add %(name)s')
         self.assertEqual(s2, s3)
         self.assertEqual(s, s2)
-        s4 = ugettext_lazy('Some other string')
+        s4 = gettext_lazy('Some other string')
         self.assertNotEqual(s, s4)
 
     def test_lazy_pickle(self):
-        s1 = ugettext_lazy("test")
+        s1 = gettext_lazy("test")
         self.assertEqual(str(s1), "test")
         s2 = pickle.loads(pickle.dumps(s1))
         self.assertEqual(str(s2), "test")
 
     @override_settings(LOCALE_PATHS=extended_locale_paths)
-    def test_ungettext_lazy(self):
-        simple_with_format = ungettext_lazy('%d good result', '%d good results')
+    def test_ngettext_lazy(self):
+        simple_with_format = ngettext_lazy('%d good result', '%d good results')
         simple_context_with_format = npgettext_lazy('Exclamation', '%d good result', '%d good results')
-        simple_without_format = ungettext_lazy('good result', 'good results')
+        simple_without_format = ngettext_lazy('good result', 'good results')
         with translation.override('de'):
             self.assertEqual(simple_with_format % 1, '1 gutes Resultat')
             self.assertEqual(simple_with_format % 4, '4 guten Resultate')
@@ -156,8 +169,8 @@ class TranslationTests(SimpleTestCase):
             self.assertEqual(simple_without_format % 1, 'gutes Resultat')
             self.assertEqual(simple_without_format % 4, 'guten Resultate')
 
-        complex_nonlazy = ungettext_lazy('Hi %(name)s, %(num)d good result', 'Hi %(name)s, %(num)d good results', 4)
-        complex_deferred = ungettext_lazy(
+        complex_nonlazy = ngettext_lazy('Hi %(name)s, %(num)d good result', 'Hi %(name)s, %(num)d good results', 4)
+        complex_deferred = ngettext_lazy(
             'Hi %(name)s, %(num)d good result', 'Hi %(name)s, %(num)d good results', 'num'
         )
         complex_context_nonlazy = npgettext_lazy(
@@ -178,12 +191,12 @@ class TranslationTests(SimpleTestCase):
             with self.assertRaisesMessage(KeyError, 'Your dictionary lacks key'):
                 complex_context_deferred % {'name': 'Jim'}
 
-    def test_ungettext_lazy_bool(self):
-        self.assertTrue(ungettext_lazy('%d good result', '%d good results'))
-        self.assertFalse(ungettext_lazy('', ''))
+    def test_ngettext_lazy_bool(self):
+        self.assertTrue(ngettext_lazy('%d good result', '%d good results'))
+        self.assertFalse(ngettext_lazy('', ''))
 
-    def test_ungettext_lazy_pickle(self):
-        s1 = ungettext_lazy('%d good result', '%d good results')
+    def test_ngettext_lazy_pickle(self):
+        s1 = ngettext_lazy('%d good result', '%d good results')
         self.assertEqual(s1 % 1, '1 good result')
         self.assertEqual(s1 % 8, '8 good results')
         s2 = pickle.loads(pickle.dumps(s1))
@@ -991,13 +1004,13 @@ class MiscTests(SimpleTestCase):
         or one of its variants, the untranslated string should be returned
         (instead of falling back to LANGUAGE_CODE) (See #24413).
         """
-        self.assertEqual(ugettext("Image"), "Bild")
+        self.assertEqual(gettext("Image"), "Bild")
         with translation.override('en'):
-            self.assertEqual(ugettext("Image"), "Image")
+            self.assertEqual(gettext("Image"), "Image")
         with translation.override('en-us'):
-            self.assertEqual(ugettext("Image"), "Image")
+            self.assertEqual(gettext("Image"), "Image")
         with translation.override('en-ca'):
-            self.assertEqual(ugettext("Image"), "Image")
+            self.assertEqual(gettext("Image"), "Image")
 
     def test_parse_spec_http_header(self):
         """
@@ -1222,8 +1235,8 @@ class ResolutionOrderI18NTests(SimpleTestCase):
         deactivate()
         super().tearDown()
 
-    def assertUgettext(self, msgid, msgstr):
-        result = ugettext(msgid)
+    def assertGettext(self, msgid, msgstr):
+        result = gettext(msgid)
         self.assertIn(
             msgstr, result,
             "The string '%s' isn't in the translation of '%s'; the actual result is '%s'."
@@ -1236,7 +1249,7 @@ class AppResolutionOrderI18NTests(ResolutionOrderI18NTests):
     @override_settings(LANGUAGE_CODE='de')
     def test_app_translation(self):
         # Original translation.
-        self.assertUgettext('Date/time', 'Datum/Zeit')
+        self.assertGettext('Date/time', 'Datum/Zeit')
 
         # Different translation.
         with self.modify_settings(INSTALLED_APPS={'append': 'i18n.resolution'}):
@@ -1244,31 +1257,31 @@ class AppResolutionOrderI18NTests(ResolutionOrderI18NTests):
             activate('de')
 
             # Doesn't work because it's added later in the list.
-            self.assertUgettext('Date/time', 'Datum/Zeit')
+            self.assertGettext('Date/time', 'Datum/Zeit')
 
             with self.modify_settings(INSTALLED_APPS={'remove': 'django.contrib.admin.apps.SimpleAdminConfig'}):
                 # Force refreshing translations.
                 activate('de')
 
                 # Unless the original is removed from the list.
-                self.assertUgettext('Date/time', 'Datum/Zeit (APP)')
+                self.assertGettext('Date/time', 'Datum/Zeit (APP)')
 
 
 @override_settings(LOCALE_PATHS=extended_locale_paths)
 class LocalePathsResolutionOrderI18NTests(ResolutionOrderI18NTests):
 
     def test_locale_paths_translation(self):
-        self.assertUgettext('Time', 'LOCALE_PATHS')
+        self.assertGettext('Time', 'LOCALE_PATHS')
 
     def test_locale_paths_override_app_translation(self):
         with self.settings(INSTALLED_APPS=['i18n.resolution']):
-            self.assertUgettext('Time', 'LOCALE_PATHS')
+            self.assertGettext('Time', 'LOCALE_PATHS')
 
 
 class DjangoFallbackResolutionOrderI18NTests(ResolutionOrderI18NTests):
 
     def test_django_fallback(self):
-        self.assertEqual(ugettext('Date/time'), 'Datum/Zeit')
+        self.assertEqual(gettext('Date/time'), 'Datum/Zeit')
 
 
 class TestModels(TestCase):
@@ -1296,7 +1309,7 @@ class TestLanguageInfo(SimpleTestCase):
         with translation.override('xx'):
             # A language with no translation catalogs should fallback to the
             # untranslated string.
-            self.assertEqual(ugettext("Title"), "Title")
+            self.assertEqual(gettext("Title"), "Title")
 
     def test_unknown_only_country_code(self):
         li = get_language_info('de-xx')
@@ -1511,7 +1524,7 @@ class NonDjangoLanguageTests(SimpleTestCase):
     )
     def test_non_django_language(self):
         self.assertEqual(get_language(), 'xxx')
-        self.assertEqual(ugettext("year"), "reay")
+        self.assertEqual(gettext("year"), "reay")
 
     @override_settings(
         USE_I18N=True,
@@ -1524,4 +1537,4 @@ class NonDjangoLanguageTests(SimpleTestCase):
     @translation.override('xyz')
     def test_plural_non_django_language(self):
         self.assertEqual(get_language(), 'xyz')
-        self.assertEqual(ungettext('year', 'years', 2), 'years')
+        self.assertEqual(ngettext('year', 'years', 2), 'years')
diff --git a/tests/i18n/urls.py b/tests/i18n/urls.py
index 911a1cf8e7..233ad699a3 100644
--- a/tests/i18n/urls.py
+++ b/tests/i18n/urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls import url
 from django.conf.urls.i18n import i18n_patterns
 from django.http import HttpResponse, StreamingHttpResponse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 urlpatterns = i18n_patterns(
     url(r'^simple/$', lambda r: HttpResponse()),
diff --git a/tests/i18n/urls_default_unprefixed.py b/tests/i18n/urls_default_unprefixed.py
index 85f9bf049b..9f0e6f3902 100644
--- a/tests/i18n/urls_default_unprefixed.py
+++ b/tests/i18n/urls_default_unprefixed.py
@@ -1,7 +1,7 @@
 from django.conf.urls import url
 from django.conf.urls.i18n import i18n_patterns
 from django.http import HttpResponse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 urlpatterns = i18n_patterns(
     url(r'^(?P<arg>[\w-]+)-page', lambda request, **arg: HttpResponse(_("Yes"))),
diff --git a/tests/mail/tests.py b/tests/mail/tests.py
index 242bb57915..74d40c67ce 100644
--- a/tests/mail/tests.py
+++ b/tests/mail/tests.py
@@ -26,7 +26,7 @@ from django.core.mail.message import BadHeaderError, sanitize_address
 from django.test import SimpleTestCase, override_settings
 from django.test.utils import requires_tz_support
 from django.utils.encoding import force_bytes, force_text
-from django.utils.translation import ugettext_lazy
+from django.utils.translation import gettext_lazy
 
 
 class HeadersCheckMixin:
@@ -177,7 +177,7 @@ class MailTests(HeadersCheckMixin, SimpleTestCase):
         with self.assertRaises(BadHeaderError):
             email.message()
         email = EmailMessage(
-            ugettext_lazy('Subject\nInjection Test'), 'Content', 'from@example.com', ['to@example.com']
+            gettext_lazy('Subject\nInjection Test'), 'Content', 'from@example.com', ['to@example.com']
         )
         with self.assertRaises(BadHeaderError):
             email.message()
@@ -856,12 +856,12 @@ class BaseEmailBackendTests(HeadersCheckMixin):
         String prefix + lazy translated subject = bad output
         Regression for #13494
         """
-        mail_managers(ugettext_lazy('Subject'), 'Content')
+        mail_managers(gettext_lazy('Subject'), 'Content')
         message = self.get_the_message()
         self.assertEqual(message.get('subject'), '[Django] Subject')
 
         self.flush_mailbox()
-        mail_admins(ugettext_lazy('Subject'), 'Content')
+        mail_admins(gettext_lazy('Subject'), 'Content')
         message = self.get_the_message()
         self.assertEqual(message.get('subject'), '[Django] Subject')
 
@@ -926,7 +926,7 @@ class BaseEmailBackendTests(HeadersCheckMixin):
         """
         Email sending should support lazy email addresses (#24416).
         """
-        _ = ugettext_lazy
+        _ = gettext_lazy
         self.assertTrue(send_mail('Subject', 'Content', _('tester'), [_('django')]))
         message = self.get_the_message()
         self.assertEqual(message.get('from'), 'tester')
diff --git a/tests/many_to_one/tests.py b/tests/many_to_one/tests.py
index 52ddcc8cfe..8252fd0e56 100644
--- a/tests/many_to_one/tests.py
+++ b/tests/many_to_one/tests.py
@@ -5,7 +5,7 @@ from django.core.exceptions import FieldError, MultipleObjectsReturned
 from django.db import models, transaction
 from django.db.utils import IntegrityError
 from django.test import TestCase
-from django.utils.translation import ugettext_lazy
+from django.utils.translation import gettext_lazy
 
 from .models import (
     Article, Category, Child, City, District, First, Parent, Record, Relation,
@@ -429,9 +429,9 @@ class ManyToOneTests(TestCase):
         # Same as each other
         self.assertIs(r1.article_set.__class__, r2.article_set.__class__)
 
-    def test_create_relation_with_ugettext_lazy(self):
+    def test_create_relation_with_gettext_lazy(self):
         reporter = Reporter.objects.create(first_name='John', last_name='Smith', email='john.smith@example.com')
-        lazy = ugettext_lazy('test')
+        lazy = gettext_lazy('test')
         reporter.article_set.create(headline=lazy, pub_date=datetime.date(2011, 6, 10))
         notlazy = str(lazy)
         article = reporter.article_set.get()
diff --git a/tests/messages_tests/base.py b/tests/messages_tests/base.py
index f713d72ab8..d05f73bb82 100644
--- a/tests/messages_tests/base.py
+++ b/tests/messages_tests/base.py
@@ -6,7 +6,7 @@ from django.contrib.messages.storage import base, default_storage
 from django.contrib.messages.storage.base import Message
 from django.test import modify_settings, override_settings
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy
+from django.utils.translation import gettext_lazy
 
 
 def add_level_messages(storage):
@@ -100,7 +100,7 @@ class BaseTests:
         storage = self.get_storage()
         response = self.get_response()
 
-        storage.add(constants.INFO, ugettext_lazy('lazy message'))
+        storage.add(constants.INFO, gettext_lazy('lazy message'))
         storage.update(response)
 
         storing = self.stored_messages_count(storage, response)
diff --git a/tests/migrations/test_writer.py b/tests/migrations/test_writer.py
index 32751d8923..1e6455d2fa 100644
--- a/tests/migrations/test_writer.py
+++ b/tests/migrations/test_writer.py
@@ -24,7 +24,7 @@ from django.utils import datetime_safe
 from django.utils.deconstruct import deconstructible
 from django.utils.functional import SimpleLazyObject
 from django.utils.timezone import FixedOffset, get_default_timezone, utc
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .models import FoodManager, FoodQuerySet
 
diff --git a/tests/queryset_pickle/models.py b/tests/queryset_pickle/models.py
index a5c0d15441..fba65d7a9e 100644
--- a/tests/queryset_pickle/models.py
+++ b/tests/queryset_pickle/models.py
@@ -1,7 +1,7 @@
 import datetime
 
 from django.db import DJANGO_VERSION_PICKLE_KEY, models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 def standalone_number():
diff --git a/tests/serializers/test_json.py b/tests/serializers/test_json.py
index ae671f4847..9037e75e46 100644
--- a/tests/serializers/test_json.py
+++ b/tests/serializers/test_json.py
@@ -9,7 +9,7 @@ from django.core.serializers.json import DjangoJSONEncoder
 from django.db import models
 from django.test import SimpleTestCase, TestCase, TransactionTestCase
 from django.test.utils import isolate_apps
-from django.utils.translation import override, ugettext_lazy
+from django.utils.translation import gettext_lazy, override
 
 from .models import Score
 from .tests import SerializersTestBase, SerializersTransactionTestBase
@@ -292,12 +292,12 @@ class JsonSerializerTransactionTestCase(SerializersTransactionTestBase, Transact
 class DjangoJSONEncoderTests(SimpleTestCase):
     def test_lazy_string_encoding(self):
         self.assertEqual(
-            json.dumps({'lang': ugettext_lazy("French")}, cls=DjangoJSONEncoder),
+            json.dumps({'lang': gettext_lazy("French")}, cls=DjangoJSONEncoder),
             '{"lang": "French"}'
         )
         with override('fr'):
             self.assertEqual(
-                json.dumps({'lang': ugettext_lazy("French")}, cls=DjangoJSONEncoder),
+                json.dumps({'lang': gettext_lazy("French")}, cls=DjangoJSONEncoder),
                 '{"lang": "Fran\\u00e7ais"}'
             )
 
diff --git a/tests/test_client_regress/tests.py b/tests/test_client_regress/tests.py
index e4fd2bb8fe..1231568c37 100644
--- a/tests/test_client_regress/tests.py
+++ b/tests/test_client_regress/tests.py
@@ -17,7 +17,7 @@ from django.test import (
 from django.test.client import RedirectCycleError, RequestFactory, encode_file
 from django.test.utils import ContextList
 from django.urls import NoReverseMatch, reverse
-from django.utils.translation import ugettext_lazy
+from django.utils.translation import gettext_lazy
 
 from .models import CustomUser
 from .views import CustomTestException
@@ -154,11 +154,11 @@ class AssertContainsTests(SimpleTestCase):
 
     def test_nontext_contains(self):
         r = self.client.get('/no_template_view/')
-        self.assertContains(r, ugettext_lazy('once'))
+        self.assertContains(r, gettext_lazy('once'))
 
     def test_nontext_not_contains(self):
         r = self.client.get('/no_template_view/')
-        self.assertNotContains(r, ugettext_lazy('never'))
+        self.assertNotContains(r, gettext_lazy('never'))
 
     def test_assert_contains_renders_template_response(self):
         """
diff --git a/tests/utils_tests/test_text.py b/tests/utils_tests/test_text.py
index 22695277a4..a869ced774 100644
--- a/tests/utils_tests/test_text.py
+++ b/tests/utils_tests/test_text.py
@@ -4,7 +4,7 @@ from django.test import SimpleTestCase
 from django.utils import text
 from django.utils.functional import lazystr
 from django.utils.text import format_lazy
-from django.utils.translation import override, ugettext_lazy
+from django.utils.translation import gettext_lazy, override
 
 IS_WIDE_BUILD = (len('\U0001F4A9') == 1)
 
@@ -235,7 +235,7 @@ class TestUtilsText(SimpleTestCase):
 
         # The format string can be lazy. (string comes from contrib.admin)
         s = format_lazy(
-            ugettext_lazy("Added {name} \"{object}\"."),
+            gettext_lazy("Added {name} \"{object}\"."),
             name='article', object='My first try',
         )
         with override('fr'):
diff --git a/tests/view_tests/urls.py b/tests/view_tests/urls.py
index a942662845..bb450717a8 100644
--- a/tests/view_tests/urls.py
+++ b/tests/view_tests/urls.py
@@ -3,7 +3,7 @@ from os import path
 
 from django.conf.urls import include, url
 from django.conf.urls.i18n import i18n_patterns
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views import defaults, i18n, static
 
 from . import views