From 49c2abf70d33332f1b26c3bb27659f0fe48796d0 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Tue, 18 Aug 2020 12:34:55 +0200 Subject: [PATCH] Replace ugettext with gettext to fix deprecation warnings --- polymorphic/admin/childadmin.py | 2 +- polymorphic/admin/filters.py | 2 +- polymorphic/admin/forms.py | 2 +- polymorphic/admin/helpers.py | 6 +++--- polymorphic/admin/parentadmin.py | 2 +- polymorphic/templatetags/polymorphic_formset_tags.py | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/polymorphic/admin/childadmin.py b/polymorphic/admin/childadmin.py index cd20773..5e9b17d 100644 --- a/polymorphic/admin/childadmin.py +++ b/polymorphic/admin/childadmin.py @@ -5,7 +5,7 @@ import inspect 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 diff --git a/polymorphic/admin/filters.py b/polymorphic/admin/filters.py index 171599b..37efc7f 100644 --- a/polymorphic/admin/filters.py +++ b/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): diff --git a/polymorphic/admin/forms.py b/polymorphic/admin/forms.py index 08e950f..8a705f0 100644 --- a/polymorphic/admin/forms.py +++ b/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): diff --git a/polymorphic/admin/helpers.py b/polymorphic/admin/helpers.py index 122f467..130ef31 100644 --- a/polymorphic/admin/helpers.py +++ b/polymorphic/admin/helpers.py @@ -8,7 +8,7 @@ import json 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 @@ class PolymorphicInlineAdminFormSet(InlineAdminFormSet): "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 @@ class PolymorphicInlineAdminFormSet(InlineAdminFormSet): } for model in self.formset.child_forms.keys() ], - "deleteText": ugettext("Remove"), + "deleteText": gettext("Remove"), }, } ) diff --git a/polymorphic/admin/parentadmin.py b/polymorphic/admin/parentadmin.py index 8f71e6a..f56bde8 100644 --- a/polymorphic/admin/parentadmin.py +++ b/polymorphic/admin/parentadmin.py @@ -13,7 +13,7 @@ from django.urls import URLResolver 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 diff --git a/polymorphic/templatetags/polymorphic_formset_tags.py b/polymorphic/templatetags/polymorphic_formset_tags.py index 6a78eca..0b2895f 100644 --- a/polymorphic/templatetags/polymorphic_formset_tags.py +++ b/polymorphic/templatetags/polymorphic_formset_tags.py @@ -3,7 +3,7 @@ import json 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):