Replace ugettext with gettext to fix deprecation warnings
parent
1d719a0e60
commit
49c2abf70d
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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"),
|
||||
},
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
Loading…
Reference in New Issue