Replace ugettext* with gettext*

matthiask · matthiask · commit 43523b107322 · 2020-01-21T16:34:35.000+01:00
diff --git a/docs/page.rst b/docs/page.rst
@@ -34,7 +34,7 @@ be to create :class:`~feincms.content.medialibrary.models.MediaFileContent` and
 by adding the following lines somewhere into your project, for example in a
 ``models.py`` file that will be processed anyway::
 
-    from django.utils.translation import ugettext_lazy as _
+    from django.utils.translation import gettext_lazy as _
 
     from feincms.module.page.models import Page
     from feincms.contents import RichTextContent
diff --git a/feincms/admin/filters.py b/feincms/admin/filters.py
@@ -10,7 +10,7 @@
 from django.db.models import Count
 from django.utils.encoding import smart_text
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django import VERSION as DJANGO_VERSION
 
 from feincms.utils import shorten_string
diff --git a/feincms/admin/tree_editor.py b/feincms/admin/tree_editor.py
@@ -21,7 +21,7 @@
 )
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _, ugettext
+from django.utils.translation import gettext_lazy as _, gettext
 from django.utils.encoding import force_text
 
 from mptt.exceptions import InvalidMove
@@ -509,7 +509,7 @@ def _move_node(self, request):
                 item.save()
 
             self.message_user(
-                request, ugettext("%s has been moved to a new position.") % cut_item
+                request, gettext("%s has been moved to a new position.") % cut_item
             )
             return HttpResponse("OK")
 
diff --git a/feincms/content/application/models.py b/feincms/content/application/models.py
@@ -14,7 +14,7 @@
 from django.utils.functional import lazy
 from django.utils.http import http_date
 from django.utils.safestring import mark_safe
-from django.utils.translation import get_language, ugettext_lazy as _
+from django.utils.translation import get_language, gettext_lazy as _
 
 try:
     from django.urls import (
diff --git a/feincms/content/contactform/models.py b/feincms/content/contactform/models.py
@@ -12,7 +12,7 @@
 from django.db import models
 from django.http import HttpResponseRedirect
 from django.template.loader import render_to_string
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms._internal import ct_render_to_string
 
diff --git a/feincms/content/file/models.py b/feincms/content/file/models.py
@@ -8,7 +8,7 @@
 import os
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import settings
 from feincms._internal import ct_render_to_string
diff --git a/feincms/content/filer/models.py b/feincms/content/filer/models.py
@@ -3,7 +3,7 @@
 from django.contrib import admin
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms.admin.item_editor import FeinCMSInline
 from feincms._internal import ct_render_to_string
diff --git a/feincms/content/image/models.py b/feincms/content/image/models.py
@@ -8,7 +8,7 @@
 import os
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import settings
 from feincms._internal import ct_render_to_string
diff --git a/feincms/content/raw/models.py b/feincms/content/raw/models.py
@@ -2,7 +2,7 @@
 
 from django.db import models
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class RawContent(models.Model):
diff --git a/feincms/content/richtext/models.py b/feincms/content/richtext/models.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import settings
 from feincms._internal import ct_render_to_string
diff --git a/feincms/content/section/models.py b/feincms/content/section/models.py
@@ -4,7 +4,7 @@
 from django.contrib import admin
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import settings
 from feincms._internal import ct_render_to_string
diff --git a/feincms/content/template/models.py b/feincms/content/template/models.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms._internal import ct_render_to_string
 from feincms.content.raw.models import RawContent  # noqa
diff --git a/feincms/content/video/models.py b/feincms/content/video/models.py
@@ -3,7 +3,7 @@
 import re
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms._internal import ct_render_to_string
 
diff --git a/feincms/contrib/tagging.py b/feincms/contrib/tagging.py
@@ -15,7 +15,7 @@
 from django import forms, VERSION
 from django.contrib.admin.widgets import FilteredSelectMultiple
 from django.db.models.signals import pre_save
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from tagging.fields import TagField
 from tagging.models import Tag
diff --git a/feincms/extensions/changedate.py b/feincms/extensions/changedate.py
@@ -14,7 +14,7 @@
 from django.db.models.signals import pre_save
 from django.utils import timezone
 from django.utils.http import http_date
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import extensions
 
diff --git a/feincms/extensions/ct_tracker.py b/feincms/extensions/ct_tracker.py
@@ -21,7 +21,7 @@
 
 from django.contrib.contenttypes.models import ContentType
 from django.db.models.signals import class_prepared, post_save, pre_save
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import extensions
 from feincms.contrib.fields import JSONField
diff --git a/feincms/extensions/datepublisher.py b/feincms/extensions/datepublisher.py
@@ -18,7 +18,7 @@
 from django.utils import timezone
 from django.utils.cache import patch_response_headers
 from django.utils.html import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import extensions
 
diff --git a/feincms/extensions/featured.py b/feincms/extensions/featured.py
@@ -5,7 +5,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import extensions
 
diff --git a/feincms/extensions/seo.py b/feincms/extensions/seo.py
@@ -5,7 +5,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import extensions
 
diff --git a/feincms/extensions/translations.py b/feincms/extensions/translations.py
@@ -25,7 +25,7 @@
 from django.http import HttpResponseRedirect
 from django.utils import translation
 from django.utils.html import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import extensions, settings
 from feincms.translations import is_primary_language
diff --git a/feincms/models.py b/feincms/models.py
@@ -20,7 +20,7 @@
 from django.db.models import Q
 from django.forms.widgets import Media
 from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import ensure_completely_loaded
 from feincms.extensions import ExtensionsMixin
diff --git a/feincms/module/medialibrary/contents.py b/feincms/module/medialibrary/contents.py
@@ -3,7 +3,7 @@
 from django.contrib import admin
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms._internal import ct_render_to_string
 from feincms.admin.item_editor import FeinCMSInline
diff --git a/feincms/module/medialibrary/fields.py b/feincms/module/medialibrary/fields.py
@@ -11,7 +11,7 @@
 from django.db import models
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms.admin.item_editor import FeinCMSInline
 from feincms.utils import shorten_string
diff --git a/feincms/module/medialibrary/forms.py b/feincms/module/medialibrary/forms.py
@@ -7,7 +7,7 @@
 import os
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import settings
 
diff --git a/feincms/module/medialibrary/modeladmins.py b/feincms/module/medialibrary/modeladmins.py
@@ -17,7 +17,7 @@
 from django.shortcuts import render
 from django.template.defaultfilters import filesizeformat
 from django.utils.safestring import mark_safe
-from django.utils.translation import ungettext, ugettext_lazy as _
+from django.utils.translation import ungettext, gettext_lazy as _
 from django.views.decorators.csrf import csrf_protect
 
 try:
diff --git a/feincms/module/medialibrary/models.py b/feincms/module/medialibrary/models.py
@@ -14,7 +14,7 @@
 from django.dispatch.dispatcher import receiver
 from django.template.defaultfilters import slugify
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import settings
 from feincms.models import ExtensionsMixin
diff --git a/feincms/module/page/extensions/excerpt.py b/feincms/module/page/extensions/excerpt.py
@@ -5,7 +5,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import extensions
 
diff --git a/feincms/module/page/extensions/navigation.py b/feincms/module/page/extensions/navigation.py
@@ -15,7 +15,7 @@
 
 from django.db import models
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import extensions
 from feincms.utils import get_object, shorten_string
diff --git a/feincms/module/page/extensions/navigationgroups.py b/feincms/module/page/extensions/navigationgroups.py
@@ -6,7 +6,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import extensions
 
diff --git a/feincms/module/page/extensions/relatedpages.py b/feincms/module/page/extensions/relatedpages.py
@@ -5,7 +5,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import extensions, settings
 
diff --git a/feincms/module/page/extensions/sites.py b/feincms/module/page/extensions/sites.py
@@ -3,7 +3,7 @@
 from django.conf import settings
 from django.contrib.sites.models import Site
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import extensions
 from feincms.module.page.models import PageManager
diff --git a/feincms/module/page/extensions/symlinks.py b/feincms/module/page/extensions/symlinks.py
@@ -6,7 +6,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import extensions
 from feincms._internal import monkeypatch_property
diff --git a/feincms/module/page/extensions/titles.py b/feincms/module/page/extensions/titles.py
@@ -7,7 +7,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import extensions
 from feincms._internal import monkeypatch_property
diff --git a/feincms/module/page/forms.py b/feincms/module/page/forms.py
@@ -10,7 +10,7 @@
 from django.contrib.admin.widgets import ForeignKeyRawIdWidget
 from django.forms.models import model_to_dict
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms import ensure_completely_loaded
 
diff --git a/feincms/module/page/modeladmins.py b/feincms/module/page/modeladmins.py
@@ -13,7 +13,7 @@
 from django.contrib import admin
 from django.contrib import messages
 from django.http import HttpResponseRedirect
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 try:
     from django.urls import reverse
diff --git a/feincms/module/page/models.py b/feincms/module/page/models.py
@@ -10,7 +10,7 @@
 from django.db import models
 from django.db.models import Q
 from django.http import Http404
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 try:
     from django.urls import reverse
diff --git a/feincms/translations.py b/feincms/translations.py
@@ -39,7 +39,7 @@ class NewsTranslation(Translation(News)):
 from django.db import models
 from django.db.models import Q
 from django.utils import translation
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms.utils import queryset_transform
 
diff --git a/tests/testapp/models.py b/tests/testapp/models.py
@@ -5,7 +5,7 @@
 from django import forms
 from django.db import models
 from django.utils.text import capfirst
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms.apps import ApplicationContent
 from feincms.contents import RawContent, TemplateContent

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`)`
`22`	`22`	`from django.utils.html import escape`
`23`	`23`	`from django.utils.safestring import mark_safe`
`24`		`-from django.utils.translation import ugettext_lazy as _, ugettext`
	`24`	`+from django.utils.translation import gettext_lazy as _, gettext`
`25`	`25`	`from django.utils.encoding import force_text`
`26`	`26`
`27`	`27`	`from mptt.exceptions import InvalidMove`
`@@ -509,7 +509,7 @@ def _move_node(self, request):`
`509`	`509`	`item.save()`
`510`	`510`
`511`	`511`	`self.message_user(`
`512`		`- request, ugettext("%s has been moved to a new position.") % cut_item`
	`512`	`+ request, gettext("%s has been moved to a new position.") % cut_item`
`513`	`513`	`)`
`514`	`514`	`return HttpResponse("OK")`
`515`	`515`