From c53c6162ed0cf58ee122ed976a8175d0e104872f Mon Sep 17 00:00:00 2001 From: Agate Berriot Date: Wed, 31 Aug 2022 10:16:04 +0200 Subject: [PATCH 1/5] django4: replaced ugettext* calls with corresponding gettext* calls (#68576) --- passerelle/address/models.py | 2 +- passerelle/apps/actesweb/models.py | 2 +- passerelle/apps/airquality/models.py | 2 +- passerelle/apps/api_entreprise/models.py | 2 +- passerelle/apps/api_particulier/models.py | 2 +- passerelle/apps/arcgis/models.py | 2 +- passerelle/apps/arpege_ecp/models.py | 2 +- passerelle/apps/astech/models.py | 2 +- passerelle/apps/astre_rest/models.py | 2 +- passerelle/apps/astregs/models.py | 2 +- passerelle/apps/atal/models.py | 2 +- passerelle/apps/atos_genesys/models.py | 2 +- passerelle/apps/base_adresse/models.py | 2 +- passerelle/apps/bdp/models.py | 2 +- passerelle/apps/cartads_cs/models.py | 2 +- passerelle/apps/choosit/models.py | 2 +- passerelle/apps/cityweb/models.py | 2 +- passerelle/apps/clicrdv/models.py | 2 +- passerelle/apps/cmis/models.py | 2 +- passerelle/apps/cmis/views.py | 2 +- passerelle/apps/cryptor/models.py | 2 +- passerelle/apps/csvdatasource/forms.py | 2 +- passerelle/apps/csvdatasource/models.py | 2 +- passerelle/apps/esabora/models.py | 2 +- passerelle/apps/esirius/models.py | 2 +- passerelle/apps/family/loaders/concerto_fondettes.py | 2 +- passerelle/apps/family/loaders/concerto_orleans.py | 2 +- passerelle/apps/family/loaders/egee_thonon.py | 2 +- passerelle/apps/family/loaders/opus_fondettes.py | 2 +- .../family/management/commands/update_families_from_zip.py | 2 +- passerelle/apps/family/models.py | 2 +- passerelle/apps/feeds/models.py | 2 +- passerelle/apps/franceconnect_data/fc.py | 2 +- passerelle/apps/franceconnect_data/models.py | 2 +- passerelle/apps/gdc/models.py | 2 +- passerelle/apps/gesbac/models.py | 2 +- passerelle/apps/holidays/forms.py | 2 +- passerelle/apps/holidays/models.py | 2 +- passerelle/apps/jsondatastore/models.py | 2 +- passerelle/apps/maelis/models.py | 2 +- passerelle/apps/mdel/models.py | 2 +- passerelle/apps/mdel_ddpacs/abstract.py | 2 +- passerelle/apps/mdel_ddpacs/models.py | 2 +- passerelle/apps/mobyt/models.py | 2 +- passerelle/apps/okina/models.py | 2 +- passerelle/apps/opendatasoft/models.py | 2 +- passerelle/apps/opengis/forms.py | 2 +- passerelle/apps/opengis/models.py | 2 +- passerelle/apps/orange/models.py | 2 +- passerelle/apps/ovh/models.py | 2 +- passerelle/apps/ovh/views.py | 2 +- passerelle/apps/oxyd/models.py | 2 +- passerelle/apps/phonecalls/models.py | 2 +- passerelle/apps/photon/models.py | 2 +- passerelle/apps/plone_restapi/models.py | 2 +- passerelle/apps/sector/models.py | 2 +- passerelle/apps/sfr_dmc/models.py | 2 +- passerelle/apps/signal_arretes/models.py | 2 +- passerelle/apps/sivin/models.py | 2 +- passerelle/apps/soap/models.py | 2 +- passerelle/apps/solis/models.py | 2 +- passerelle/apps/sp_fr/models.py | 6 +++--- passerelle/apps/twilio/models.py | 2 +- passerelle/apps/vivaticket/models.py | 2 +- passerelle/base/forms.py | 2 +- passerelle/base/models.py | 2 +- passerelle/base/templatetags/passerelle.py | 2 +- passerelle/base/views.py | 2 +- passerelle/contrib/adict/models.py | 2 +- passerelle/contrib/caluire_axel/models.py | 2 +- passerelle/contrib/caluire_axel/schemas.py | 2 +- passerelle/contrib/dpark/models.py | 2 +- passerelle/contrib/esirius_swi/models.py | 2 +- passerelle/contrib/fake_family/models.py | 2 +- passerelle/contrib/gdema/models.py | 2 +- passerelle/contrib/grandlyon_streetsections/models.py | 2 +- passerelle/contrib/greco/models.py | 2 +- passerelle/contrib/grenoble_gru/models.py | 2 +- passerelle/contrib/isere_ens/models.py | 2 +- passerelle/contrib/iws/models.py | 2 +- passerelle/contrib/lille_kimoce/models.py | 2 +- passerelle/contrib/lille_urban_card/models.py | 2 +- passerelle/contrib/mdph13/models.py | 2 +- passerelle/contrib/nancypoll/models.py | 2 +- passerelle/contrib/planitech/models.py | 2 +- passerelle/contrib/rsa13/models.py | 2 +- passerelle/contrib/sigerly/models.py | 2 +- passerelle/contrib/solis_afi_mss/models.py | 2 +- passerelle/contrib/solis_apa/models.py | 2 +- passerelle/contrib/solis_apa/views.py | 2 +- passerelle/contrib/strasbourg_eu/models.py | 2 +- passerelle/contrib/stub_invoices/models.py | 2 +- passerelle/contrib/tcl/models.py | 2 +- passerelle/contrib/teamnet_axel/models.py | 2 +- passerelle/contrib/toulouse_axel/models.py | 2 +- passerelle/contrib/toulouse_foederis/models.py | 2 +- passerelle/contrib/toulouse_smart/models.py | 2 +- passerelle/forms.py | 2 +- passerelle/sms/forms.py | 2 +- passerelle/sms/models.py | 2 +- passerelle/sms/views.py | 2 +- passerelle/utils/paginator.py | 2 +- passerelle/utils/sftp.py | 2 +- passerelle/utils/templates.py | 2 +- passerelle/views.py | 2 +- tests/test_sms.py | 2 +- 106 files changed, 108 insertions(+), 108 deletions(-) diff --git a/passerelle/address/models.py b/passerelle/address/models.py index cd4177a3..6a141845 100644 --- a/passerelle/address/models.py +++ b/passerelle/address/models.py @@ -19,7 +19,7 @@ from urllib.parse import urljoin from django.conf import settings from django.db import models from django.db.models import Q -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.apps.sector.models import ( MAX_HOUSENUMBER, diff --git a/passerelle/apps/actesweb/models.py b/passerelle/apps/actesweb/models.py index 646ae48f..70ec07bb 100644 --- a/passerelle/apps/actesweb/models.py +++ b/passerelle/apps/actesweb/models.py @@ -26,7 +26,7 @@ from django.template.loader import get_template from django.utils.dateparse import parse_date from django.utils.encoding import force_bytes from django.utils.timezone import now -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/airquality/models.py b/passerelle/apps/airquality/models.py index 96203583..845c44e9 100644 --- a/passerelle/apps/airquality/models.py +++ b/passerelle/apps/airquality/models.py @@ -19,7 +19,7 @@ import datetime from django.db import models from django.http import Http404 -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/api_entreprise/models.py b/passerelle/apps/api_entreprise/models.py index 9409f167..9556e86e 100644 --- a/passerelle/apps/api_entreprise/models.py +++ b/passerelle/apps/api_entreprise/models.py @@ -26,7 +26,7 @@ from django.db import models from django.http import Http404, HttpResponse from django.urls import reverse from django.utils.timezone import datetime, make_aware, timedelta -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/api_particulier/models.py b/passerelle/apps/api_particulier/models.py index 2fa9df33..00991f23 100644 --- a/passerelle/apps/api_particulier/models.py +++ b/passerelle/apps/api_particulier/models.py @@ -32,7 +32,7 @@ except ImportError: from django.contrib.postgres.fields import ArrayField from django.core.cache import cache from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/arcgis/models.py b/passerelle/apps/arcgis/models.py index 2f47dc31..18328901 100644 --- a/passerelle/apps/arcgis/models.py +++ b/passerelle/apps/arcgis/models.py @@ -23,7 +23,7 @@ from django.http import HttpResponse from django.shortcuts import get_object_or_404 from django.urls import reverse from django.utils.text import slugify -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseQuery, BaseResource, HTTPResource from passerelle.utils import mark_safe_lazy diff --git a/passerelle/apps/arpege_ecp/models.py b/passerelle/apps/arpege_ecp/models.py index 5ec213e4..03324b21 100644 --- a/passerelle/apps/arpege_ecp/models.py +++ b/passerelle/apps/arpege_ecp/models.py @@ -20,7 +20,7 @@ from urllib import parse as urlparse from django.db import models from django.utils import timezone from django.utils.dateparse import parse_date, parse_time -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from requests import RequestException from passerelle.base.models import BaseResource diff --git a/passerelle/apps/astech/models.py b/passerelle/apps/astech/models.py index 722cd39d..61949464 100644 --- a/passerelle/apps/astech/models.py +++ b/passerelle/apps/astech/models.py @@ -20,7 +20,7 @@ from urllib import parse as urlparse from django.core.cache import cache from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from requests.exceptions import ConnectionError from passerelle.base.models import BaseResource, HTTPResource diff --git a/passerelle/apps/astre_rest/models.py b/passerelle/apps/astre_rest/models.py index c1a807fd..73094223 100644 --- a/passerelle/apps/astre_rest/models.py +++ b/passerelle/apps/astre_rest/models.py @@ -20,7 +20,7 @@ import urllib.parse import requests from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/astregs/models.py b/passerelle/apps/astregs/models.py index 0f71c5cd..d8dd68ee 100644 --- a/passerelle/apps/astregs/models.py +++ b/passerelle/apps/astregs/models.py @@ -20,7 +20,7 @@ from urllib import parse as urlparse import zeep from django.db import models from django.http import Http404 -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zeep.helpers import serialize_object from passerelle.base.models import BaseResource diff --git a/passerelle/apps/atal/models.py b/passerelle/apps/atal/models.py index a730f99e..55e1ee65 100644 --- a/passerelle/apps/atal/models.py +++ b/passerelle/apps/atal/models.py @@ -22,7 +22,7 @@ import lxml.etree from django.db import models from django.utils import dateformat, dateparse from django.utils.encoding import force_text -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zeep import helpers from zeep.exceptions import Fault diff --git a/passerelle/apps/atos_genesys/models.py b/passerelle/apps/atos_genesys/models.py index 186b5753..9c905728 100644 --- a/passerelle/apps/atos_genesys/models.py +++ b/passerelle/apps/atos_genesys/models.py @@ -21,7 +21,7 @@ from urllib import parse as urlparse import requests from django.contrib.postgres.fields import JSONField from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource, HTTPResource from passerelle.utils import xml as xmlutils diff --git a/passerelle/apps/base_adresse/models.py b/passerelle/apps/base_adresse/models.py index f2546e32..2dff18e6 100644 --- a/passerelle/apps/base_adresse/models.py +++ b/passerelle/apps/base_adresse/models.py @@ -10,7 +10,7 @@ from django.db import connection, models from django.db.models import Q from django.utils import timezone from django.utils.http import urlencode -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from requests import RequestException from passerelle.address.models import AddressResource diff --git a/passerelle/apps/bdp/models.py b/passerelle/apps/bdp/models.py index 59b74d2c..68867e2b 100644 --- a/passerelle/apps/bdp/models.py +++ b/passerelle/apps/bdp/models.py @@ -1,7 +1,7 @@ import json from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from requests.auth import HTTPBasicAuth from passerelle.base.models import BaseResource diff --git a/passerelle/apps/cartads_cs/models.py b/passerelle/apps/cartads_cs/models.py index bb216792..f86a0773 100644 --- a/passerelle/apps/cartads_cs/models.py +++ b/passerelle/apps/cartads_cs/models.py @@ -40,7 +40,7 @@ from django.http import HttpResponse from django.urls import reverse from django.utils.encoding import 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 passerelle.base.models import BaseResource from passerelle.base.signature import sign_url diff --git a/passerelle/apps/choosit/models.py b/passerelle/apps/choosit/models.py index 98e69f88..829e3323 100644 --- a/passerelle/apps/choosit/models.py +++ b/passerelle/apps/choosit/models.py @@ -3,7 +3,7 @@ import json import requests from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.sms.models import SMSResource from passerelle.utils.jsonresponse import APIError diff --git a/passerelle/apps/cityweb/models.py b/passerelle/apps/cityweb/models.py index 0c7ecb00..01cb3db5 100644 --- a/passerelle/apps/cityweb/models.py +++ b/passerelle/apps/cityweb/models.py @@ -18,7 +18,7 @@ import json import os from django.core.files.storage import default_storage -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/clicrdv/models.py b/passerelle/apps/clicrdv/models.py index 7e8fd369..f8e2d1d2 100644 --- a/passerelle/apps/clicrdv/models.py +++ b/passerelle/apps/clicrdv/models.py @@ -11,7 +11,7 @@ from django.db import models from django.utils.dateformat import format as date_format from django.utils.dateformat import time_format from django.utils.http import urlquote -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/cmis/models.py b/passerelle/apps/cmis/models.py index 20003aa3..fb7fa123 100644 --- a/passerelle/apps/cmis/models.py +++ b/passerelle/apps/cmis/models.py @@ -33,7 +33,7 @@ from cmislib.exceptions import ( ) 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 passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/cmis/views.py b/passerelle/apps/cmis/views.py index ead657c2..2cef4e21 100644 --- a/passerelle/apps/cmis/views.py +++ b/passerelle/apps/cmis/views.py @@ -16,7 +16,7 @@ from cmislib.exceptions import ObjectNotFoundException from django.http import Http404 -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.generic import TemplateView from .models import CmisConnector diff --git a/passerelle/apps/cryptor/models.py b/passerelle/apps/cryptor/models.py index 2cc1810f..75e28b68 100644 --- a/passerelle/apps/cryptor/models.py +++ b/passerelle/apps/cryptor/models.py @@ -29,7 +29,7 @@ from django.core.exceptions import ValidationError from django.core.files.storage import default_storage from django.db import models from django.http import HttpResponse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/csvdatasource/forms.py b/passerelle/apps/csvdatasource/forms.py index f61fb055..a9a7a85e 100644 --- a/passerelle/apps/csvdatasource/forms.py +++ b/passerelle/apps/csvdatasource/forms.py @@ -16,7 +16,7 @@ from django import forms from django.core.exceptions import ValidationError -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from .models import Query, get_code, identifier_re diff --git a/passerelle/apps/csvdatasource/models.py b/passerelle/apps/csvdatasource/models.py index 9e82ad63..3a75018c 100644 --- a/passerelle/apps/csvdatasource/models.py +++ b/passerelle/apps/csvdatasource/models.py @@ -33,7 +33,7 @@ from django.db import models, transaction from django.urls import reverse from django.utils.encoding import force_str, force_text, smart_text from django.utils.timezone import make_aware, now -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils import batch diff --git a/passerelle/apps/esabora/models.py b/passerelle/apps/esabora/models.py index 773d0ead..1215d177 100644 --- a/passerelle/apps/esabora/models.py +++ b/passerelle/apps/esabora/models.py @@ -3,7 +3,7 @@ import urllib.parse import requests from django.db import models from django.utils.text import slugify -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource, HTTPResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/esirius/models.py b/passerelle/apps/esirius/models.py index 3755f353..42a666dc 100644 --- a/passerelle/apps/esirius/models.py +++ b/passerelle/apps/esirius/models.py @@ -25,7 +25,7 @@ from Cryptodome.Util.Padding import pad from django.core.exceptions import ValidationError from django.db import models from django.utils.encoding import force_bytes -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource, HTTPResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/family/loaders/concerto_fondettes.py b/passerelle/apps/family/loaders/concerto_fondettes.py index e6a1e210..09f05473 100644 --- a/passerelle/apps/family/loaders/concerto_fondettes.py +++ b/passerelle/apps/family/loaders/concerto_fondettes.py @@ -21,7 +21,7 @@ from decimal import Decimal from django.core.exceptions import ValidationError from django.utils.encoding import force_text -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from ..models import Invoice diff --git a/passerelle/apps/family/loaders/concerto_orleans.py b/passerelle/apps/family/loaders/concerto_orleans.py index 2a5a9c93..7a789cf2 100644 --- a/passerelle/apps/family/loaders/concerto_orleans.py +++ b/passerelle/apps/family/loaders/concerto_orleans.py @@ -23,7 +23,7 @@ from django.core.exceptions import ValidationError from django.core.files.storage import DefaultStorage from django.utils import timezone from django.utils.encoding import force_text -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from ..models import Adult, Child, Family, Invoice, dict_cherry_pick, get_date, get_datetime diff --git a/passerelle/apps/family/loaders/egee_thonon.py b/passerelle/apps/family/loaders/egee_thonon.py index 86dfce25..39997166 100644 --- a/passerelle/apps/family/loaders/egee_thonon.py +++ b/passerelle/apps/family/loaders/egee_thonon.py @@ -18,7 +18,7 @@ import datetime from xml.etree import ElementTree as ET from django.core.exceptions import ValidationError -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from ..models import Invoice diff --git a/passerelle/apps/family/loaders/opus_fondettes.py b/passerelle/apps/family/loaders/opus_fondettes.py index f02f3364..ca15890c 100644 --- a/passerelle/apps/family/loaders/opus_fondettes.py +++ b/passerelle/apps/family/loaders/opus_fondettes.py @@ -21,7 +21,7 @@ from decimal import Decimal from django.core.exceptions import ValidationError from django.utils.encoding import force_text -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from ..models import Invoice diff --git a/passerelle/apps/family/management/commands/update_families_from_zip.py b/passerelle/apps/family/management/commands/update_families_from_zip.py index 818e9b6f..a6135261 100644 --- a/passerelle/apps/family/management/commands/update_families_from_zip.py +++ b/passerelle/apps/family/management/commands/update_families_from_zip.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from django.core.management.base import BaseCommand -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from ...models import GenericFamily diff --git a/passerelle/apps/family/models.py b/passerelle/apps/family/models.py index ee74f95f..7d974477 100644 --- a/passerelle/apps/family/models.py +++ b/passerelle/apps/family/models.py @@ -29,7 +29,7 @@ from django.core.files.storage import default_storage from django.db import models, transaction from django.http import Http404, HttpResponse from django.utils.timezone import datetime, make_aware, now -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/feeds/models.py b/passerelle/apps/feeds/models.py index 2f1476e8..970aaf3e 100644 --- a/passerelle/apps/feeds/models.py +++ b/passerelle/apps/feeds/models.py @@ -16,7 +16,7 @@ import feedparser from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/franceconnect_data/fc.py b/passerelle/apps/franceconnect_data/fc.py index 34ddfb9e..9e86107a 100644 --- a/passerelle/apps/franceconnect_data/fc.py +++ b/passerelle/apps/franceconnect_data/fc.py @@ -21,7 +21,7 @@ import urllib.parse import uuid import requests -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class FranceConnectError(Exception): diff --git a/passerelle/apps/franceconnect_data/models.py b/passerelle/apps/franceconnect_data/models.py index bb41ff6f..5c15ab87 100644 --- a/passerelle/apps/franceconnect_data/models.py +++ b/passerelle/apps/franceconnect_data/models.py @@ -27,7 +27,7 @@ from django.template.response import TemplateResponse from django.urls import reverse from django.utils.http import urlencode from django.utils.timezone import now -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils import get_trusted_services diff --git a/passerelle/apps/gdc/models.py b/passerelle/apps/gdc/models.py index 2dfbc719..537d41b6 100644 --- a/passerelle/apps/gdc/models.py +++ b/passerelle/apps/gdc/models.py @@ -23,7 +23,7 @@ except ImportError: from django.db import models from django.utils.encoding import force_text -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/gesbac/models.py b/passerelle/apps/gesbac/models.py index 5c7e7b57..841cc9cf 100644 --- a/passerelle/apps/gesbac/models.py +++ b/passerelle/apps/gesbac/models.py @@ -21,7 +21,7 @@ from collections import OrderedDict from django.contrib.postgres.fields import JSONField from django.db import IntegrityError, models, transaction from django.http import Http404 -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils import SFTPField diff --git a/passerelle/apps/holidays/forms.py b/passerelle/apps/holidays/forms.py index 8183a186..f2baeb49 100644 --- a/passerelle/apps/holidays/forms.py +++ b/passerelle/apps/holidays/forms.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 . from django import forms -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.forms import GenericConnectorForm diff --git a/passerelle/apps/holidays/models.py b/passerelle/apps/holidays/models.py index c00abd93..e955fb8b 100644 --- a/passerelle/apps/holidays/models.py +++ b/passerelle/apps/holidays/models.py @@ -19,7 +19,7 @@ import vobject from django.contrib.postgres.fields import ArrayField from django.db import models from django.http import HttpResponse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/jsondatastore/models.py b/passerelle/apps/jsondatastore/models.py index 8d18410b..21c6ea94 100644 --- a/passerelle/apps/jsondatastore/models.py +++ b/passerelle/apps/jsondatastore/models.py @@ -20,7 +20,7 @@ import uuid from django.contrib.postgres.fields import JSONField from django.db import models from django.template import Context, Template -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import APIError, endpoint diff --git a/passerelle/apps/maelis/models.py b/passerelle/apps/maelis/models.py index b8101b81..def7e8dd 100644 --- a/passerelle/apps/maelis/models.py +++ b/passerelle/apps/maelis/models.py @@ -22,7 +22,7 @@ import zeep from django.db import models from django.utils import timezone from django.utils.dateparse import parse_date -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zeep.helpers import serialize_object from zeep.wsse.username import UsernameToken diff --git a/passerelle/apps/mdel/models.py b/passerelle/apps/mdel/models.py index ffb08495..fbbd8346 100644 --- a/passerelle/apps/mdel/models.py +++ b/passerelle/apps/mdel/models.py @@ -19,7 +19,7 @@ import json import os from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils import SFTPField diff --git a/passerelle/apps/mdel_ddpacs/abstract.py b/passerelle/apps/mdel_ddpacs/abstract.py index 090a1133..cdda66d5 100644 --- a/passerelle/apps/mdel_ddpacs/abstract.py +++ b/passerelle/apps/mdel_ddpacs/abstract.py @@ -29,7 +29,7 @@ from django.db import IntegrityError, models, transaction from django.http import HttpResponse from django.urls import reverse from django.utils import functional -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource, SkipJob from passerelle.utils import sftp, xml diff --git a/passerelle/apps/mdel_ddpacs/models.py b/passerelle/apps/mdel_ddpacs/models.py index 3c6b0828..9a759d99 100644 --- a/passerelle/apps/mdel_ddpacs/models.py +++ b/passerelle/apps/mdel_ddpacs/models.py @@ -19,7 +19,7 @@ from __future__ import unicode_literals import xmlschema from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.utils.api import endpoint from passerelle.utils.xml import JSONSchemaFromXMLSchema diff --git a/passerelle/apps/mobyt/models.py b/passerelle/apps/mobyt/models.py index 9a43aeb4..cf9a96b1 100644 --- a/passerelle/apps/mobyt/models.py +++ b/passerelle/apps/mobyt/models.py @@ -1,6 +1,6 @@ import requests from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.sms.models import SMSResource from passerelle.utils.jsonresponse import APIError diff --git a/passerelle/apps/okina/models.py b/passerelle/apps/okina/models.py index e42e3f77..05bd6bcf 100644 --- a/passerelle/apps/okina/models.py +++ b/passerelle/apps/okina/models.py @@ -19,7 +19,7 @@ import json from django.db import models from django.http import HttpResponse from django.utils.http import urlencode -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/opendatasoft/models.py b/passerelle/apps/opendatasoft/models.py index 386ade0e..62f1a3f6 100644 --- a/passerelle/apps/opendatasoft/models.py +++ b/passerelle/apps/opendatasoft/models.py @@ -20,7 +20,7 @@ from urllib import parse as urlparse from django.db import models from django.shortcuts import get_object_or_404 from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from requests import RequestException from passerelle.base.models import BaseQuery, BaseResource diff --git a/passerelle/apps/opengis/forms.py b/passerelle/apps/opengis/forms.py index 4dba1b2d..7aa8e0f8 100644 --- a/passerelle/apps/opengis/forms.py +++ b/passerelle/apps/opengis/forms.py @@ -18,7 +18,7 @@ from xml.etree import ElementTree as ET from django import forms from django.forms import formset_factory -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.forms import BaseQueryFormMixin diff --git a/passerelle/apps/opengis/models.py b/passerelle/apps/opengis/models.py index 5ee26fc8..ade401fe 100644 --- a/passerelle/apps/opengis/models.py +++ b/passerelle/apps/opengis/models.py @@ -28,7 +28,7 @@ from django.shortcuts import get_object_or_404 from django.template import Context, Template, TemplateSyntaxError from django.urls import reverse from django.utils.text import slugify -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseQuery, BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/orange/models.py b/passerelle/apps/orange/models.py index c3977205..ddd535c7 100644 --- a/passerelle/apps/orange/models.py +++ b/passerelle/apps/orange/models.py @@ -20,7 +20,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.sms.models import SMSResource from passerelle.utils.jsonresponse import APIError diff --git a/passerelle/apps/ovh/models.py b/passerelle/apps/ovh/models.py index 75488eee..13f4fd55 100644 --- a/passerelle/apps/ovh/models.py +++ b/passerelle/apps/ovh/models.py @@ -13,7 +13,7 @@ from django.db import models from django.template.loader import render_to_string from django.utils import timezone from django.utils.encoding import force_text -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import SkipJob from passerelle.sms.models import SMSResource diff --git a/passerelle/apps/ovh/views.py b/passerelle/apps/ovh/views.py index 78ea0291..13a4ad92 100644 --- a/passerelle/apps/ovh/views.py +++ b/passerelle/apps/ovh/views.py @@ -2,7 +2,7 @@ import uuid from django.contrib import messages from django.shortcuts import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.generic.base import RedirectView from requests import RequestException diff --git a/passerelle/apps/oxyd/models.py b/passerelle/apps/oxyd/models.py index 319b07f5..e46bb58e 100644 --- a/passerelle/apps/oxyd/models.py +++ b/passerelle/apps/oxyd/models.py @@ -1,7 +1,7 @@ import requests from django.db import models from django.utils.encoding import force_text -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.sms.models import SMSResource from passerelle.utils.jsonresponse import APIError diff --git a/passerelle/apps/phonecalls/models.py b/passerelle/apps/phonecalls/models.py index d110cca9..8a8bc7eb 100644 --- a/passerelle/apps/phonecalls/models.py +++ b/passerelle/apps/phonecalls/models.py @@ -20,7 +20,7 @@ from django.http import HttpResponseRedirect from django.shortcuts import render from django.utils.http import urlencode from django.utils.timezone import make_naive, now, timedelta -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/photon/models.py b/passerelle/apps/photon/models.py index 0ae11443..7e8083d2 100644 --- a/passerelle/apps/photon/models.py +++ b/passerelle/apps/photon/models.py @@ -22,7 +22,7 @@ from django.contrib.postgres.fields import JSONField from django.db import models from django.utils.encoding import force_bytes from django.utils.http import urlencode -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from requests import RequestException from passerelle.base.models import BaseResource diff --git a/passerelle/apps/plone_restapi/models.py b/passerelle/apps/plone_restapi/models.py index a8e8863c..dee10810 100644 --- a/passerelle/apps/plone_restapi/models.py +++ b/passerelle/apps/plone_restapi/models.py @@ -21,7 +21,7 @@ from django.core.cache import cache from django.db import models from django.shortcuts import get_object_or_404 from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from requests import RequestException from passerelle.base.models import BaseQuery, BaseResource, HTTPResource diff --git a/passerelle/apps/sector/models.py b/passerelle/apps/sector/models.py index af964546..7ee2254d 100644 --- a/passerelle/apps/sector/models.py +++ b/passerelle/apps/sector/models.py @@ -27,7 +27,7 @@ from django.db.models import Q from django.http import HttpResponse from django.utils.encoding import force_bytes, force_str, smart_text from django.utils.timezone import now -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/sfr_dmc/models.py b/passerelle/apps/sfr_dmc/models.py index 2af2b34a..09f8066e 100644 --- a/passerelle/apps/sfr_dmc/models.py +++ b/passerelle/apps/sfr_dmc/models.py @@ -16,7 +16,7 @@ import json from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.sms.models import SMSResource from passerelle.utils.jsonresponse import APIError diff --git a/passerelle/apps/signal_arretes/models.py b/passerelle/apps/signal_arretes/models.py index 289f082e..88e37188 100644 --- a/passerelle/apps/signal_arretes/models.py +++ b/passerelle/apps/signal_arretes/models.py @@ -24,7 +24,7 @@ from datetime import datetime from django.db import models from django.http import HttpResponse from django.utils.text import slugify -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from requests import RequestException from passerelle.base.models import BaseResource, HTTPResource diff --git a/passerelle/apps/sivin/models.py b/passerelle/apps/sivin/models.py index dfca5e48..1e7f110f 100644 --- a/passerelle/apps/sivin/models.py +++ b/passerelle/apps/sivin/models.py @@ -19,7 +19,7 @@ from urllib.parse import urljoin from django.core.cache import cache from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from requests import RequestException from passerelle.base.models import BaseResource diff --git a/passerelle/apps/soap/models.py b/passerelle/apps/soap/models.py index 421a98c9..69bb94e7 100644 --- a/passerelle/apps/soap/models.py +++ b/passerelle/apps/soap/models.py @@ -23,7 +23,7 @@ import zeep.xsd from django.db import models from django.forms import ValidationError from django.utils.functional import cached_property -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zeep.wsse.username import UsernameToken from passerelle.base.models import BaseResource, HTTPResource diff --git a/passerelle/apps/solis/models.py b/passerelle/apps/solis/models.py index 8cf3d6e0..f91abf30 100644 --- a/passerelle/apps/solis/models.py +++ b/passerelle/apps/solis/models.py @@ -22,7 +22,7 @@ from django.db import models from django.template.loader import get_template from django.utils.encoding import force_text from django.utils.http import urlencode -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/apps/sp_fr/models.py b/passerelle/apps/sp_fr/models.py index 9f33dcce..987b1548 100644 --- a/passerelle/apps/sp_fr/models.py +++ b/passerelle/apps/sp_fr/models.py @@ -28,8 +28,8 @@ from django.core.files import File from django.db import models, transaction from django.template import engines from django.urls import reverse -from django.utils.translation import ugettext -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext +from django.utils.translation import gettext_lazy as _ from lxml import etree as ET from passerelle.base.models import BaseResource @@ -628,7 +628,7 @@ class Mapping(models.Model): yield 'convention_specifique' def __str__(self): - return ugettext('Mapping from "{procedure}" to formdef "{formdef}"').format( + return gettext('Mapping from "{procedure}" to formdef "{formdef}"').format( procedure=self.get_procedure_display(), formdef=self.formdef.title if self.formdef else '-' ) diff --git a/passerelle/apps/twilio/models.py b/passerelle/apps/twilio/models.py index 5723bd0c..0e8ebb41 100644 --- a/passerelle/apps/twilio/models.py +++ b/passerelle/apps/twilio/models.py @@ -15,7 +15,7 @@ # along with this program. If not, see . import requests from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from requests.auth import HTTPBasicAuth from passerelle.sms.models import SMSResource diff --git a/passerelle/apps/vivaticket/models.py b/passerelle/apps/vivaticket/models.py index 49d8b97d..5d51c9f5 100644 --- a/passerelle/apps/vivaticket/models.py +++ b/passerelle/apps/vivaticket/models.py @@ -19,7 +19,7 @@ from urllib import parse as urlparse from django.core.cache import cache from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/base/forms.py b/passerelle/base/forms.py index 87d788dd..cc6ca4e3 100644 --- a/passerelle/base/forms.py +++ b/passerelle/base/forms.py @@ -1,5 +1,5 @@ from django import forms -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from .models import AccessRight, ApiUser, AvailabilityParameters diff --git a/passerelle/base/models.py b/passerelle/base/models.py index 2d8106d7..cfff2826 100644 --- a/passerelle/base/models.py +++ b/passerelle/base/models.py @@ -31,7 +31,7 @@ from django.utils.encoding import force_text from django.utils.log import AdminEmailHandler from django.utils.text import slugify from django.utils.timezone import now -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from model_utils.managers import InheritanceManager as ModelUtilsInheritanceManager import passerelle diff --git a/passerelle/base/templatetags/passerelle.py b/passerelle/base/templatetags/passerelle.py index a2f7d3f5..6552fc65 100644 --- a/passerelle/base/templatetags/passerelle.py +++ b/passerelle/base/templatetags/passerelle.py @@ -27,7 +27,7 @@ from django.contrib.contenttypes.models import ContentType from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator from django.template.defaultfilters import stringfilter from django.utils.html import format_html, mark_safe -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from passerelle.utils import get_trusted_services diff --git a/passerelle/base/views.py b/passerelle/base/views.py index 66079186..af2c52f8 100644 --- a/passerelle/base/views.py +++ b/passerelle/base/views.py @@ -26,7 +26,7 @@ from django.http import Http404, HttpResponse, HttpResponseRedirect from django.shortcuts import get_object_or_404 from django.urls import reverse from django.utils.timezone import make_aware -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.generic import CreateView, DeleteView, DetailView, FormView, ListView, UpdateView, View from ..utils import ImportSiteError, export_site, get_trusted_services, import_site diff --git a/passerelle/contrib/adict/models.py b/passerelle/contrib/adict/models.py index c829a21f..29b0214f 100644 --- a/passerelle/contrib/adict/models.py +++ b/passerelle/contrib/adict/models.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/contrib/caluire_axel/models.py b/passerelle/contrib/caluire_axel/models.py index 796f9b51..821bb273 100644 --- a/passerelle/contrib/caluire_axel/models.py +++ b/passerelle/contrib/caluire_axel/models.py @@ -24,7 +24,7 @@ from django.db import models from django.http import HttpResponse from django.utils import dateformat from django.utils.timezone import localtime -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.contrib.utils import axel diff --git a/passerelle/contrib/caluire_axel/schemas.py b/passerelle/contrib/caluire_axel/schemas.py index 0db3ac7d..ca9c3604 100644 --- a/passerelle/contrib/caluire_axel/schemas.py +++ b/passerelle/contrib/caluire_axel/schemas.py @@ -18,7 +18,7 @@ import copy import os import xmlschema -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.contrib.utils import axel diff --git a/passerelle/contrib/dpark/models.py b/passerelle/contrib/dpark/models.py index 31592098..a45be24c 100644 --- a/passerelle/contrib/dpark/models.py +++ b/passerelle/contrib/dpark/models.py @@ -25,7 +25,7 @@ from django.conf import settings from django.core.cache import cache from django.db import models from django.utils import timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zeep.exceptions import Fault as WebFault from zeep.helpers import serialize_object diff --git a/passerelle/contrib/esirius_swi/models.py b/passerelle/contrib/esirius_swi/models.py index 94be7150..03da2dd3 100644 --- a/passerelle/contrib/esirius_swi/models.py +++ b/passerelle/contrib/esirius_swi/models.py @@ -18,7 +18,7 @@ from urllib.parse import urljoin import zeep from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/contrib/fake_family/models.py b/passerelle/contrib/fake_family/models.py index cfa8953b..48b76aab 100644 --- a/passerelle/contrib/fake_family/models.py +++ b/passerelle/contrib/fake_family/models.py @@ -16,7 +16,7 @@ from django.contrib.postgres.fields import JSONField from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource diff --git a/passerelle/contrib/gdema/models.py b/passerelle/contrib/gdema/models.py index 330eeee3..4dd7da51 100644 --- a/passerelle/contrib/gdema/models.py +++ b/passerelle/contrib/gdema/models.py @@ -21,7 +21,7 @@ import re from django.db import models from django.utils.dateparse import parse_date, parse_datetime from django.utils.timezone import get_fixed_timezone, is_naive, make_aware, utc -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/contrib/grandlyon_streetsections/models.py b/passerelle/contrib/grandlyon_streetsections/models.py index f5d3e0a7..6d6c2d9a 100644 --- a/passerelle/contrib/grandlyon_streetsections/models.py +++ b/passerelle/contrib/grandlyon_streetsections/models.py @@ -20,7 +20,7 @@ import re from django.db import models from django.utils import timezone from django.utils.text import slugify -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/contrib/greco/models.py b/passerelle/contrib/greco/models.py index ebc0a0f9..e1de739a 100644 --- a/passerelle/contrib/greco/models.py +++ b/passerelle/contrib/greco/models.py @@ -23,7 +23,7 @@ from email.mime.text import MIMEText import suds.sudsobject from django.core.cache import cache from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from suds.client import Client from suds.transport import Reply from suds.transport.http import HttpAuthenticated diff --git a/passerelle/contrib/grenoble_gru/models.py b/passerelle/contrib/grenoble_gru/models.py index 50421932..a69888d1 100644 --- a/passerelle/contrib/grenoble_gru/models.py +++ b/passerelle/contrib/grenoble_gru/models.py @@ -23,7 +23,7 @@ from django.db import models from django.utils import dateparse from django.utils.http import urlencode from django.utils.text import slugify -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from lxml import etree from passerelle.base.models import BaseResource diff --git a/passerelle/contrib/isere_ens/models.py b/passerelle/contrib/isere_ens/models.py index aa482c4b..3cf283f2 100644 --- a/passerelle/contrib/isere_ens/models.py +++ b/passerelle/contrib/isere_ens/models.py @@ -21,7 +21,7 @@ from urllib import parse as urlparse from django.core.cache import cache from django.db import models from django.utils.formats import date_format -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource, HTTPResource from passerelle.utils.api import endpoint diff --git a/passerelle/contrib/iws/models.py b/passerelle/contrib/iws/models.py index e7f12e92..59409bd5 100644 --- a/passerelle/contrib/iws/models.py +++ b/passerelle/contrib/iws/models.py @@ -20,7 +20,7 @@ import lxml.etree import pkg_resources from django.db import models from django.utils import dateformat -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/contrib/lille_kimoce/models.py b/passerelle/contrib/lille_kimoce/models.py index c46ee63c..6e5d4a96 100644 --- a/passerelle/contrib/lille_kimoce/models.py +++ b/passerelle/contrib/lille_kimoce/models.py @@ -19,7 +19,7 @@ from urllib.parse import urljoin from django.core.cache import cache from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/contrib/lille_urban_card/models.py b/passerelle/contrib/lille_urban_card/models.py index 0668775b..925069a3 100644 --- a/passerelle/contrib/lille_urban_card/models.py +++ b/passerelle/contrib/lille_urban_card/models.py @@ -21,7 +21,7 @@ import re from urllib.parse import urljoin from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/contrib/mdph13/models.py b/passerelle/contrib/mdph13/models.py index 44ca3f8f..26a5adc0 100644 --- a/passerelle/contrib/mdph13/models.py +++ b/passerelle/contrib/mdph13/models.py @@ -22,7 +22,7 @@ from urllib import parse as urlparse import requests from django.db import models, transaction -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource, HTTPResource from passerelle.utils.api import endpoint diff --git a/passerelle/contrib/nancypoll/models.py b/passerelle/contrib/nancypoll/models.py index 8cb44f1c..8e0b0d72 100644 --- a/passerelle/contrib/nancypoll/models.py +++ b/passerelle/contrib/nancypoll/models.py @@ -2,7 +2,7 @@ import csv from django.db import models from django.utils.encoding import force_text -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/contrib/planitech/models.py b/passerelle/contrib/planitech/models.py index d1e742ac..752978c7 100644 --- a/passerelle/contrib/planitech/models.py +++ b/passerelle/contrib/planitech/models.py @@ -27,7 +27,7 @@ from django.core.cache import cache from django.db import models, transaction from django.utils import dateformat, dateparse from django.utils.encoding import force_bytes -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from requests.exceptions import RequestException from passerelle.base.models import BaseResource diff --git a/passerelle/contrib/rsa13/models.py b/passerelle/contrib/rsa13/models.py index 3c36432c..61d57932 100644 --- a/passerelle/contrib/rsa13/models.py +++ b/passerelle/contrib/rsa13/models.py @@ -25,7 +25,7 @@ from django.http import HttpResponse from django.urls import reverse from django.utils.http import urlencode from django.utils.timezone import now -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource, HTTPResource from passerelle.utils.api import endpoint diff --git a/passerelle/contrib/sigerly/models.py b/passerelle/contrib/sigerly/models.py index 544a90c3..b3b453e4 100644 --- a/passerelle/contrib/sigerly/models.py +++ b/passerelle/contrib/sigerly/models.py @@ -17,7 +17,7 @@ from urllib.parse import urljoin from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource, HTTPResource from passerelle.utils.api import endpoint diff --git a/passerelle/contrib/solis_afi_mss/models.py b/passerelle/contrib/solis_afi_mss/models.py index d14cf4b4..7c7a5010 100644 --- a/passerelle/contrib/solis_afi_mss/models.py +++ b/passerelle/contrib/solis_afi_mss/models.py @@ -17,7 +17,7 @@ import base64 from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource, HTTPResource from passerelle.utils.api import endpoint diff --git a/passerelle/contrib/solis_apa/models.py b/passerelle/contrib/solis_apa/models.py index 290bd35b..6fac2a93 100644 --- a/passerelle/contrib/solis_apa/models.py +++ b/passerelle/contrib/solis_apa/models.py @@ -20,7 +20,7 @@ from urllib import parse as urlparse from django.core.cache import cache from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.contrib.solis_apa import conciliation, integration, suivi diff --git a/passerelle/contrib/solis_apa/views.py b/passerelle/contrib/solis_apa/views.py index 455ee1ff..914be966 100644 --- a/passerelle/contrib/solis_apa/views.py +++ b/passerelle/contrib/solis_apa/views.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from django.utils.decorators import method_decorator -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.decorators.csrf import csrf_exempt from django.views.generic import DetailView as GenericDetailView from django.views.generic import View diff --git a/passerelle/contrib/strasbourg_eu/models.py b/passerelle/contrib/strasbourg_eu/models.py index f8e352a2..8e96532b 100644 --- a/passerelle/contrib/strasbourg_eu/models.py +++ b/passerelle/contrib/strasbourg_eu/models.py @@ -20,7 +20,7 @@ from urllib import parse as urlparse from django.db import models from django.utils.encoding import force_text -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from requests import RequestException from passerelle.base.models import BaseResource diff --git a/passerelle/contrib/stub_invoices/models.py b/passerelle/contrib/stub_invoices/models.py index 4712aa86..488c386e 100644 --- a/passerelle/contrib/stub_invoices/models.py +++ b/passerelle/contrib/stub_invoices/models.py @@ -20,7 +20,7 @@ from decimal import Decimal from django.http import HttpResponse from django.utils import timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/contrib/tcl/models.py b/passerelle/contrib/tcl/models.py index 1a403e9a..cd55477b 100644 --- a/passerelle/contrib/tcl/models.py +++ b/passerelle/contrib/tcl/models.py @@ -19,7 +19,7 @@ import re from django.conf import settings from django.db import models, transaction from django.utils import timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.utils.api import endpoint diff --git a/passerelle/contrib/teamnet_axel/models.py b/passerelle/contrib/teamnet_axel/models.py index b0ee43ec..0098a212 100644 --- a/passerelle/contrib/teamnet_axel/models.py +++ b/passerelle/contrib/teamnet_axel/models.py @@ -24,7 +24,7 @@ from django.contrib.postgres.fields import JSONField from django.db import models from django.http import HttpResponse, HttpResponseNotFound from django.utils.encoding import smart_text -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.soap import client_to_jsondict diff --git a/passerelle/contrib/toulouse_axel/models.py b/passerelle/contrib/toulouse_axel/models.py index e71f9df2..91745636 100644 --- a/passerelle/contrib/toulouse_axel/models.py +++ b/passerelle/contrib/toulouse_axel/models.py @@ -25,7 +25,7 @@ from django.db import models from django.http import HttpResponse from django.utils import dateformat from django.utils.dates import WEEKDAYS as WEEKDAYS_LABELS -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.contrib.utils import axel diff --git a/passerelle/contrib/toulouse_foederis/models.py b/passerelle/contrib/toulouse_foederis/models.py index 4a9ebb35..1f25003d 100644 --- a/passerelle/contrib/toulouse_foederis/models.py +++ b/passerelle/contrib/toulouse_foederis/models.py @@ -24,7 +24,7 @@ from django.db.models import Q from django.http import Http404, HttpResponse from django.urls import reverse from django.utils.timezone import localtime, now -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource, HTTPResource from passerelle.utils.api import endpoint diff --git a/passerelle/contrib/toulouse_smart/models.py b/passerelle/contrib/toulouse_smart/models.py index 3350358a..f175d68d 100644 --- a/passerelle/contrib/toulouse_smart/models.py +++ b/passerelle/contrib/toulouse_smart/models.py @@ -30,7 +30,7 @@ from django.db.transaction import atomic from django.urls import reverse from django.utils.text import slugify from django.utils.timezone import now -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from requests import RequestException from passerelle.base.models import BaseResource, HTTPResource, SkipJob diff --git a/passerelle/forms.py b/passerelle/forms.py index 6c710545..76b71f7c 100644 --- a/passerelle/forms.py +++ b/passerelle/forms.py @@ -16,7 +16,7 @@ from django import forms from django.utils.text import slugify -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class GenericConnectorForm(forms.ModelForm): diff --git a/passerelle/sms/forms.py b/passerelle/sms/forms.py index a5511bc6..6bf9e1ac 100644 --- a/passerelle/sms/forms.py +++ b/passerelle/sms/forms.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 . from django import forms -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.forms import GenericConnectorForm diff --git a/passerelle/sms/models.py b/passerelle/sms/models.py index ae5816a9..41040756 100644 --- a/passerelle/sms/models.py +++ b/passerelle/sms/models.py @@ -22,7 +22,7 @@ from django.core.validators import RegexValidator from django.db import models from django.urls import reverse from django.utils.module_loading import import_string -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from passerelle.base.models import BaseResource from passerelle.sms.forms import SMSConnectorForm diff --git a/passerelle/sms/views.py b/passerelle/sms/views.py index 9ad41d3d..95756f29 100644 --- a/passerelle/sms/views.py +++ b/passerelle/sms/views.py @@ -5,7 +5,7 @@ from django.db.models import Count from django.db.models.functions import TruncDay from django.http import JsonResponse from django.utils.timezone import make_aware -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.generic import FormView, View from passerelle.base.models import SkipJob diff --git a/passerelle/utils/paginator.py b/passerelle/utils/paginator.py index bded428c..097638eb 100644 --- a/passerelle/utils/paginator.py +++ b/passerelle/utils/paginator.py @@ -1,6 +1,6 @@ from django.core.paginator import EmptyPage, Page, Paginator from django.utils.functional import cached_property -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class InfinitePaginator(Paginator): diff --git a/passerelle/utils/sftp.py b/passerelle/utils/sftp.py index 44e72186..707252b8 100644 --- a/passerelle/utils/sftp.py +++ b/passerelle/utils/sftp.py @@ -28,7 +28,7 @@ from django import forms from django.core import validators from django.db import models from django.utils.encoding import force_bytes, force_text -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from paramiko.dsskey import DSSKey from paramiko.ecdsakey import ECDSAKey diff --git a/passerelle/utils/templates.py b/passerelle/utils/templates.py index 8433a48e..1deefad9 100644 --- a/passerelle/utils/templates.py +++ b/passerelle/utils/templates.py @@ -22,7 +22,7 @@ Disable autoescaping. from django.core.exceptions import ValidationError from django.template import TemplateSyntaxError from django.template.backends.django import DjangoTemplates -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ def make_template(template_string): diff --git a/passerelle/views.py b/passerelle/views.py index d21c1a42..64355ca8 100644 --- a/passerelle/views.py +++ b/passerelle/views.py @@ -37,7 +37,7 @@ from django.shortcuts import get_object_or_404, resolve_url from django.urls import reverse from django.utils.encoding import force_bytes, force_text from django.utils.timezone import is_naive, make_aware -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.decorators.csrf import csrf_exempt from django.views.generic import ( CreateView, diff --git a/tests/test_sms.py b/tests/test_sms.py index e1e76e80..06b0df61 100644 --- a/tests/test_sms.py +++ b/tests/test_sms.py @@ -20,7 +20,7 @@ import mock import pytest from django.contrib.contenttypes.models import ContentType from django.urls import reverse -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ import tests.utils from passerelle.apps.choosit.models import ChoositSMSGateway -- 2.37.2