Merge pull request #457 from yakky/bugfix/issue-424-gettext

Replace ugettext with gettext to fix deprecation warnings

polymorphic/admin/childadmin.py

@@ -5,7 +5,7 @@
 
 from django.contrib import admin
 from django.urls import resolve
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from polymorphic.utils import get_base_polymorphic_model
 

polymorphic/admin/filters.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 from django.core.exceptions import PermissionDenied
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class PolymorphicChildModelFilter(admin.SimpleListFilter):

polymorphic/admin/forms.py

@@ -1,6 +1,6 @@
 from django import forms
 from django.contrib.admin.widgets import AdminRadioSelect
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class PolymorphicModelChoiceForm(forms.Form):

polymorphic/admin/helpers.py

@@ -8,7 +8,7 @@
 from django.contrib.admin.helpers import AdminField, InlineAdminForm, InlineAdminFormSet
 from django.utils.encoding import force_text
 from django.utils.text import capfirst
-from django.utils.translation import ugettext
+from django.utils.translation import gettext
 
 from polymorphic.formsets import BasePolymorphicModelFormSet
 
@@ -96,7 +96,7 @@ def inline_formset_data(self):
                 "name": "#%s" % self.formset.prefix,
                 "options": {
                     "prefix": self.formset.prefix,
-                    "addText": ugettext("Add another %(verbose_name)s")
+                    "addText": gettext("Add another %(verbose_name)s")
                     % {"verbose_name": capfirst(verbose_name)},
                     "childTypes": [
                         {
@@ -105,7 +105,7 @@ def inline_formset_data(self):
                         }
                         for model in self.formset.child_forms.keys()
                     ],
-                    "deleteText": ugettext("Remove"),
+                    "deleteText": gettext("Remove"),
                 },
             }
         )

polymorphic/admin/parentadmin.py

@@ -13,7 +13,7 @@
 from django.utils.encoding import force_text
 from django.utils.http import urlencode
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from polymorphic.utils import get_base_polymorphic_model
 

polymorphic/templatetags/polymorphic_formset_tags.py

@@ -3,7 +3,7 @@
 from django.template import Library
 from django.utils.encoding import force_text
 from django.utils.text import capfirst
-from django.utils.translation import ugettext
+from django.utils.translation import gettext
 
 from polymorphic.formsets import BasePolymorphicModelFormSet
 
@@ -44,10 +44,10 @@ def as_script_options(formset):
         "prefix": formset.prefix,
         "pkFieldName": formset.model._meta.pk.name,
         "addText": getattr(formset, "add_text", None)
-        or ugettext("Add another %(verbose_name)s")
+        or gettext("Add another %(verbose_name)s")
         % {"verbose_name": capfirst(verbose_name)},
         "showAddButton": getattr(formset, "show_add_button", True),
-        "deleteText": ugettext("Delete"),
+        "deleteText": gettext("Delete"),
     }
 
     if isinstance(formset, BasePolymorphicModelFormSet):