discard deprecated unicode-aware i18n utils (#64305)

src/authentic2/a2_rbac/admin.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.contrib import admin
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from . import models
 

src/authentic2/a2_rbac/models.py

@@ -24,8 +24,8 @@ from django.core.validators import MinValueValidator
 from django.db import models
 from django.urls import reverse
 from django.utils.text import slugify
+from django.utils.translation import gettext_lazy as _
 from django.utils.translation import pgettext_lazy
-from django.utils.translation import ugettext_lazy as _
 
 from authentic2.decorators import errorcollector
 from authentic2.utils.cache import GlobalCache

src/authentic2/admin.py

@@ -26,7 +26,7 @@ from django.contrib.auth.forms import ReadOnlyPasswordHashField
 from django.contrib.sessions.models import Session
 from django.db import transaction
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.decorators.cache import never_cache
 
 from . import app_settings, attribute_kinds, decorators, models

src/authentic2/api_mixins.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.db import transaction
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import status
 from rest_framework.exceptions import APIException, ValidationError
 from rest_framework.settings import api_settings

src/authentic2/api_views.py

@@ -29,8 +29,7 @@ from django.shortcuts import get_object_or_404
 from django.utils.dateparse import parse_datetime
 from django.utils.encoding import force_text
 from django.utils.text import slugify
-from django.utils.translation import ugettext as _
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.decorators.cache import cache_control
 from django.views.decorators.vary import vary_on_headers
 from django_filters.fields import IsoDateTimeField as BaseIsoDateTimeField

src/authentic2/app_settings.py

@@ -17,7 +17,7 @@
 import sys
 
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class Setting:

src/authentic2/apps/journal/app.py

@@ -16,7 +16,7 @@
 
 from django.apps import AppConfig
 from django.utils.module_loading import autodiscover_modules
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class JournalAppConfig(AppConfig):

src/authentic2/apps/journal/models.py

@@ -31,7 +31,7 @@ from django.db import models
 from django.db.models import Count, F, Q, QuerySet, Value
 from django.db.models.functions import Trunc
 from django.utils.timezone import now, utc
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from authentic2.utils.cache import GlobalCache
 

src/authentic2/attribute_kinds.py

@@ -34,8 +34,8 @@ from django.db.models import query
 from django.urls import reverse, reverse_lazy
 from django.utils import formats, html
 from django.utils.functional import keep_lazy
+from django.utils.translation import gettext_lazy as _
 from django.utils.translation import pgettext_lazy
-from django.utils.translation import ugettext_lazy as _
 from gadjo.templatetags.gadjo import xstatic
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError as DrfValidationError

src/authentic2/custom_user/models.py

@@ -25,7 +25,7 @@ from django.core.mail import send_mail
 from django.db import models, transaction
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 try:
     from django.contrib.contenttypes.fields import GenericRelation

src/authentic2/forms/profile.py

@@ -17,7 +17,7 @@
 
 from django import forms
 from django.forms.models import modelform_factory as dj_modelform_factory
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from authentic2 import app_settings, models
 from authentic2.custom_user.models import User

src/authentic2/journal_event_types.py

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ugettext_noop as N_
 
 from authentic2.a2_rbac.models import OrganizationalUnit as OU

src/authentic2/manager/journal_event_types.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.contrib.auth import get_user_model
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from authentic2.a2_rbac.models import Role
 from authentic2.apps.journal.models import EventTypeDefinition

src/authentic2/models.py

@@ -33,7 +33,7 @@ from django.db.models.query import Q
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.http import urlquote
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from model_utils.managers import QueryManager
 
 from authentic2.a2_rbac.models import Role

src/authentic2/saml/app_settings.py

@@ -18,7 +18,7 @@ import sys
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AppSettings:

src/authentic2/saml/models.py

@@ -27,7 +27,7 @@ from django.db import models
 from django.db.models import Q
 from django.db.models.query import QuerySet
 from django.utils.encoding import force_str, force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from authentic2.compat_lasso import lasso
 from authentic2.saml.fields import MultiSelectField, PickledObjectField

src/authentic2/utils/misc.py

@@ -44,7 +44,7 @@ from django.urls import reverse
 from django.utils import html, timezone
 from django.utils.encoding import iri_to_uri, uri_to_iri
 from django.utils.formats import localize
-from django.utils.translation import ungettext
+from django.utils.translation import ngettext
 
 from authentic2.saml.saml2utils import filter_attribute_private_key, filter_element_private_key
 
@@ -1087,13 +1087,13 @@ def human_duration(seconds):
 
     s = []
     if days:
-        s.append(ungettext('%s day', '%s days', days) % days)
+        s.append(ngettext('%s day', '%s days', days) % days)
     if hours:
-        s.append(ungettext('%s hour', '%s hours', hours) % hours)
+        s.append(ngettext('%s hour', '%s hours', hours) % hours)
     if minutes:
-        s.append(ungettext('%s minute', '%s minutes', minutes) % minutes)
+        s.append(ngettext('%s minute', '%s minutes', minutes) % minutes)
     if seconds:
-        s.append(ungettext('%s second', '%s seconds', seconds) % seconds)
+        s.append(ngettext('%s second', '%s seconds', seconds) % seconds)
     return ', '.join(s)
 
 

src/authentic2/validators.py

@@ -24,7 +24,7 @@ from django.core.exceptions import ValidationError
 from django.core.validators import EmailValidator as DjangoEmailValidator
 from django.core.validators import RegexValidator
 from django.utils.deconstruct import deconstructible
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from . import app_settings
 

src/authentic2_auth_fc/models.py

@@ -24,7 +24,7 @@ from django.conf import settings
 from django.db import models
 from django.utils.encoding import force_bytes, force_text
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from authentic2_auth_oidc.utils import parse_timestamp
 

src/authentic2_auth_oidc/models.py

@@ -21,7 +21,7 @@ from django.conf import settings
 from django.contrib.postgres.fields import JSONField
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from jwcrypto.jwk import InvalidJWKValue, JWKSet
 
 from authentic2.a2_rbac.models import OrganizationalUnit

src/authentic2_idp_cas/models.py

@@ -18,7 +18,7 @@ from django.core.exceptions import ValidationError
 from django.core.validators import URLValidator
 from django.db import models
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from authentic2.models import LogoutUrlAbstract
 from authentic2.models import Service as BaseService

src/authentic2_idp_oidc/models.py

@@ -24,7 +24,7 @@ from django.core.exceptions import ImproperlyConfigured, ValidationError
 from django.core.validators import URLValidator
 from django.db import models
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from authentic2.a2_rbac.models import OrganizationalUnit
 from authentic2.custom_user.models import Profile