Projet

Général

Profil

0001-django4-replaced-ugettext-calls-with-corresponding-g.patch

A. Berriot, 31 août 2022 11:02

Télécharger (65,3 ko)

Voir les différences:

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(-)
passerelle/address/models.py
19 19
from django.conf import settings
20 20
from django.db import models
21 21
from django.db.models import Q
22
from django.utils.translation import ugettext_lazy as _
22
from django.utils.translation import gettext_lazy as _
23 23

  
24 24
from passerelle.apps.sector.models import (
25 25
    MAX_HOUSENUMBER,
passerelle/apps/actesweb/models.py
26 26
from django.utils.dateparse import parse_date
27 27
from django.utils.encoding import force_bytes
28 28
from django.utils.timezone import now
29
from django.utils.translation import ugettext_lazy as _
29
from django.utils.translation import gettext_lazy as _
30 30

  
31 31
from passerelle.base.models import BaseResource
32 32
from passerelle.utils.api import endpoint
passerelle/apps/airquality/models.py
19 19

  
20 20
from django.db import models
21 21
from django.http import Http404
22
from django.utils.translation import ugettext_lazy as _
22
from django.utils.translation import gettext_lazy as _
23 23

  
24 24
from passerelle.base.models import BaseResource
25 25
from passerelle.utils.api import endpoint
passerelle/apps/api_entreprise/models.py
26 26
from django.http import Http404, HttpResponse
27 27
from django.urls import reverse
28 28
from django.utils.timezone import datetime, make_aware, timedelta
29
from django.utils.translation import ugettext_lazy as _
29
from django.utils.translation import gettext_lazy as _
30 30

  
31 31
from passerelle.base.models import BaseResource
32 32
from passerelle.utils.api import endpoint
passerelle/apps/api_particulier/models.py
32 32
from django.contrib.postgres.fields import ArrayField
33 33
from django.core.cache import cache
34 34
from django.db import models
35
from django.utils.translation import ugettext_lazy as _
35
from django.utils.translation import gettext_lazy as _
36 36

  
37 37
from passerelle.base.models import BaseResource
38 38
from passerelle.utils.api import endpoint
passerelle/apps/arcgis/models.py
23 23
from django.shortcuts import get_object_or_404
24 24
from django.urls import reverse
25 25
from django.utils.text import slugify
26
from django.utils.translation import ugettext_lazy as _
26
from django.utils.translation import gettext_lazy as _
27 27

  
28 28
from passerelle.base.models import BaseQuery, BaseResource, HTTPResource
29 29
from passerelle.utils import mark_safe_lazy
passerelle/apps/arpege_ecp/models.py
20 20
from django.db import models
21 21
from django.utils import timezone
22 22
from django.utils.dateparse import parse_date, parse_time
23
from django.utils.translation import ugettext_lazy as _
23
from django.utils.translation import gettext_lazy as _
24 24
from requests import RequestException
25 25

  
26 26
from passerelle.base.models import BaseResource
passerelle/apps/astech/models.py
20 20

  
21 21
from django.core.cache import cache
22 22
from django.db import models
23
from django.utils.translation import ugettext_lazy as _
23
from django.utils.translation import gettext_lazy as _
24 24
from requests.exceptions import ConnectionError
25 25

  
26 26
from passerelle.base.models import BaseResource, HTTPResource
passerelle/apps/astre_rest/models.py
20 20

  
21 21
import requests
22 22
from django.db import models
23
from django.utils.translation import ugettext_lazy as _
23
from django.utils.translation import gettext_lazy as _
24 24

  
25 25
from passerelle.base.models import BaseResource
26 26
from passerelle.utils.api import endpoint
passerelle/apps/astregs/models.py
20 20
import zeep
21 21
from django.db import models
22 22
from django.http import Http404
23
from django.utils.translation import ugettext_lazy as _
23
from django.utils.translation import gettext_lazy as _
24 24
from zeep.helpers import serialize_object
25 25

  
26 26
from passerelle.base.models import BaseResource
passerelle/apps/atal/models.py
22 22
from django.db import models
23 23
from django.utils import dateformat, dateparse
24 24
from django.utils.encoding import force_text
25
from django.utils.translation import ugettext_lazy as _
25
from django.utils.translation import gettext_lazy as _
26 26
from zeep import helpers
27 27
from zeep.exceptions import Fault
28 28

  
passerelle/apps/atos_genesys/models.py
21 21
import requests
22 22
from django.contrib.postgres.fields import JSONField
23 23
from django.db import models
24
from django.utils.translation import ugettext_lazy as _
24
from django.utils.translation import gettext_lazy as _
25 25

  
26 26
from passerelle.base.models import BaseResource, HTTPResource
27 27
from passerelle.utils import xml as xmlutils
passerelle/apps/base_adresse/models.py
10 10
from django.db.models import Q
11 11
from django.utils import timezone
12 12
from django.utils.http import urlencode
13
from django.utils.translation import ugettext_lazy as _
13
from django.utils.translation import gettext_lazy as _
14 14
from requests import RequestException
15 15

  
16 16
from passerelle.address.models import AddressResource
passerelle/apps/bdp/models.py
1 1
import json
2 2

  
3 3
from django.db import models
4
from django.utils.translation import ugettext_lazy as _
4
from django.utils.translation import gettext_lazy as _
5 5
from requests.auth import HTTPBasicAuth
6 6

  
7 7
from passerelle.base.models import BaseResource
passerelle/apps/cartads_cs/models.py
40 40
from django.urls import reverse
41 41
from django.utils.encoding import force_text
42 42
from django.utils.timezone import now
43
from django.utils.translation import ugettext_lazy as _
43
from django.utils.translation import gettext_lazy as _
44 44

  
45 45
from passerelle.base.models import BaseResource
46 46
from passerelle.base.signature import sign_url
passerelle/apps/choosit/models.py
3 3

  
4 4
import requests
5 5
from django.db import models
6
from django.utils.translation import ugettext_lazy as _
6
from django.utils.translation import gettext_lazy as _
7 7

  
8 8
from passerelle.sms.models import SMSResource
9 9
from passerelle.utils.jsonresponse import APIError
passerelle/apps/cityweb/models.py
18 18
import os
19 19

  
20 20
from django.core.files.storage import default_storage
21
from django.utils.translation import ugettext_lazy as _
21
from django.utils.translation import gettext_lazy as _
22 22

  
23 23
from passerelle.base.models import BaseResource
24 24
from passerelle.utils.api import endpoint
passerelle/apps/clicrdv/models.py
11 11
from django.utils.dateformat import format as date_format
12 12
from django.utils.dateformat import time_format
13 13
from django.utils.http import urlquote
14
from django.utils.translation import ugettext_lazy as _
14
from django.utils.translation import gettext_lazy as _
15 15

  
16 16
from passerelle.base.models import BaseResource
17 17
from passerelle.utils.api import endpoint
passerelle/apps/cmis/models.py
33 33
)
34 34
from django.db import models
35 35
from django.utils.functional import cached_property
36
from django.utils.translation import ugettext_lazy as _
36
from django.utils.translation import gettext_lazy as _
37 37

  
38 38
from passerelle.base.models import BaseResource
39 39
from passerelle.utils.api import endpoint
passerelle/apps/cmis/views.py
16 16

  
17 17
from cmislib.exceptions import ObjectNotFoundException
18 18
from django.http import Http404
19
from django.utils.translation import ugettext_lazy as _
19
from django.utils.translation import gettext_lazy as _
20 20
from django.views.generic import TemplateView
21 21

  
22 22
from .models import CmisConnector
passerelle/apps/cryptor/models.py
29 29
from django.core.files.storage import default_storage
30 30
from django.db import models
31 31
from django.http import HttpResponse
32
from django.utils.translation import ugettext_lazy as _
32
from django.utils.translation import gettext_lazy as _
33 33

  
34 34
from passerelle.base.models import BaseResource
35 35
from passerelle.utils.api import endpoint
passerelle/apps/csvdatasource/forms.py
16 16

  
17 17
from django import forms
18 18
from django.core.exceptions import ValidationError
19
from django.utils.translation import ugettext_lazy as _
19
from django.utils.translation import gettext_lazy as _
20 20

  
21 21
from .models import Query, get_code, identifier_re
22 22

  
passerelle/apps/csvdatasource/models.py
33 33
from django.urls import reverse
34 34
from django.utils.encoding import force_str, force_text, smart_text
35 35
from django.utils.timezone import make_aware, now
36
from django.utils.translation import ugettext_lazy as _
36
from django.utils.translation import gettext_lazy as _
37 37

  
38 38
from passerelle.base.models import BaseResource
39 39
from passerelle.utils import batch
passerelle/apps/esabora/models.py
3 3
import requests
4 4
from django.db import models
5 5
from django.utils.text import slugify
6
from django.utils.translation import ugettext_lazy as _
6
from django.utils.translation import gettext_lazy as _
7 7

  
8 8
from passerelle.base.models import BaseResource, HTTPResource
9 9
from passerelle.utils.api import endpoint
passerelle/apps/esirius/models.py
25 25
from django.core.exceptions import ValidationError
26 26
from django.db import models
27 27
from django.utils.encoding import force_bytes
28
from django.utils.translation import ugettext_lazy as _
28
from django.utils.translation import gettext_lazy as _
29 29

  
30 30
from passerelle.base.models import BaseResource, HTTPResource
31 31
from passerelle.utils.api import endpoint
passerelle/apps/family/loaders/concerto_fondettes.py
21 21

  
22 22
from django.core.exceptions import ValidationError
23 23
from django.utils.encoding import force_text
24
from django.utils.translation import ugettext_lazy as _
24
from django.utils.translation import gettext_lazy as _
25 25

  
26 26
from ..models import Invoice
27 27

  
passerelle/apps/family/loaders/concerto_orleans.py
23 23
from django.core.files.storage import DefaultStorage
24 24
from django.utils import timezone
25 25
from django.utils.encoding import force_text
26
from django.utils.translation import ugettext_lazy as _
26
from django.utils.translation import gettext_lazy as _
27 27

  
28 28
from ..models import Adult, Child, Family, Invoice, dict_cherry_pick, get_date, get_datetime
29 29

  
passerelle/apps/family/loaders/egee_thonon.py
18 18
from xml.etree import ElementTree as ET
19 19

  
20 20
from django.core.exceptions import ValidationError
21
from django.utils.translation import ugettext_lazy as _
21
from django.utils.translation import gettext_lazy as _
22 22

  
23 23
from ..models import Invoice
24 24

  
passerelle/apps/family/loaders/opus_fondettes.py
21 21

  
22 22
from django.core.exceptions import ValidationError
23 23
from django.utils.encoding import force_text
24
from django.utils.translation import ugettext_lazy as _
24
from django.utils.translation import gettext_lazy as _
25 25

  
26 26
from ..models import Invoice
27 27

  
passerelle/apps/family/management/commands/update_families_from_zip.py
15 15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16

  
17 17
from django.core.management.base import BaseCommand
18
from django.utils.translation import ugettext_lazy as _
18
from django.utils.translation import gettext_lazy as _
19 19

  
20 20
from ...models import GenericFamily
21 21

  
passerelle/apps/family/models.py
29 29
from django.db import models, transaction
30 30
from django.http import Http404, HttpResponse
31 31
from django.utils.timezone import datetime, make_aware, now
32
from django.utils.translation import ugettext_lazy as _
32
from django.utils.translation import gettext_lazy as _
33 33

  
34 34
from passerelle.base.models import BaseResource
35 35
from passerelle.utils.api import endpoint
passerelle/apps/feeds/models.py
16 16

  
17 17
import feedparser
18 18
from django.db import models
19
from django.utils.translation import ugettext_lazy as _
19
from django.utils.translation import gettext_lazy as _
20 20

  
21 21
from passerelle.base.models import BaseResource
22 22
from passerelle.utils.api import endpoint
passerelle/apps/franceconnect_data/fc.py
21 21
import uuid
22 22

  
23 23
import requests
24
from django.utils.translation import ugettext_lazy as _
24
from django.utils.translation import gettext_lazy as _
25 25

  
26 26

  
27 27
class FranceConnectError(Exception):
passerelle/apps/franceconnect_data/models.py
27 27
from django.urls import reverse
28 28
from django.utils.http import urlencode
29 29
from django.utils.timezone import now
30
from django.utils.translation import ugettext_lazy as _
30
from django.utils.translation import gettext_lazy as _
31 31

  
32 32
from passerelle.base.models import BaseResource
33 33
from passerelle.utils import get_trusted_services
passerelle/apps/gdc/models.py
23 23

  
24 24
from django.db import models
25 25
from django.utils.encoding import force_text
26
from django.utils.translation import ugettext_lazy as _
26
from django.utils.translation import gettext_lazy as _
27 27

  
28 28
from passerelle.base.models import BaseResource
29 29
from passerelle.utils.api import endpoint
passerelle/apps/gesbac/models.py
21 21
from django.contrib.postgres.fields import JSONField
22 22
from django.db import IntegrityError, models, transaction
23 23
from django.http import Http404
24
from django.utils.translation import ugettext_lazy as _
24
from django.utils.translation import gettext_lazy as _
25 25

  
26 26
from passerelle.base.models import BaseResource
27 27
from passerelle.utils import SFTPField
passerelle/apps/holidays/forms.py
14 14
# You should have received a copy of the GNU Affero General Public License
15 15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16
from django import forms
17
from django.utils.translation import ugettext_lazy as _
17
from django.utils.translation import gettext_lazy as _
18 18

  
19 19
from passerelle.forms import GenericConnectorForm
20 20

  
passerelle/apps/holidays/models.py
19 19
from django.contrib.postgres.fields import ArrayField
20 20
from django.db import models
21 21
from django.http import HttpResponse
22
from django.utils.translation import ugettext_lazy as _
22
from django.utils.translation import gettext_lazy as _
23 23

  
24 24
from passerelle.base.models import BaseResource
25 25
from passerelle.utils.api import endpoint
passerelle/apps/jsondatastore/models.py
20 20
from django.contrib.postgres.fields import JSONField
21 21
from django.db import models
22 22
from django.template import Context, Template
23
from django.utils.translation import ugettext_lazy as _
23
from django.utils.translation import gettext_lazy as _
24 24

  
25 25
from passerelle.base.models import BaseResource
26 26
from passerelle.utils.api import APIError, endpoint
passerelle/apps/maelis/models.py
22 22
from django.db import models
23 23
from django.utils import timezone
24 24
from django.utils.dateparse import parse_date
25
from django.utils.translation import ugettext_lazy as _
25
from django.utils.translation import gettext_lazy as _
26 26
from zeep.helpers import serialize_object
27 27
from zeep.wsse.username import UsernameToken
28 28

  
passerelle/apps/mdel/models.py
19 19
import os
20 20

  
21 21
from django.db import models
22
from django.utils.translation import ugettext_lazy as _
22
from django.utils.translation import gettext_lazy as _
23 23

  
24 24
from passerelle.base.models import BaseResource
25 25
from passerelle.utils import SFTPField
passerelle/apps/mdel_ddpacs/abstract.py
29 29
from django.http import HttpResponse
30 30
from django.urls import reverse
31 31
from django.utils import functional
32
from django.utils.translation import ugettext_lazy as _
32
from django.utils.translation import gettext_lazy as _
33 33

  
34 34
from passerelle.base.models import BaseResource, SkipJob
35 35
from passerelle.utils import sftp, xml
passerelle/apps/mdel_ddpacs/models.py
19 19

  
20 20
import xmlschema
21 21
from django.db import models
22
from django.utils.translation import ugettext_lazy as _
22
from django.utils.translation import gettext_lazy as _
23 23

  
24 24
from passerelle.utils.api import endpoint
25 25
from passerelle.utils.xml import JSONSchemaFromXMLSchema
passerelle/apps/mobyt/models.py
1 1
import requests
2 2
from django.db import models
3
from django.utils.translation import ugettext_lazy as _
3
from django.utils.translation import gettext_lazy as _
4 4

  
5 5
from passerelle.sms.models import SMSResource
6 6
from passerelle.utils.jsonresponse import APIError
passerelle/apps/okina/models.py
19 19
from django.db import models
20 20
from django.http import HttpResponse
21 21
from django.utils.http import urlencode
22
from django.utils.translation import ugettext_lazy as _
22
from django.utils.translation import gettext_lazy as _
23 23

  
24 24
from passerelle.base.models import BaseResource
25 25
from passerelle.utils.api import endpoint
passerelle/apps/opendatasoft/models.py
20 20
from django.db import models
21 21
from django.shortcuts import get_object_or_404
22 22
from django.urls import reverse
23
from django.utils.translation import ugettext_lazy as _
23
from django.utils.translation import gettext_lazy as _
24 24
from requests import RequestException
25 25

  
26 26
from passerelle.base.models import BaseQuery, BaseResource
passerelle/apps/opengis/forms.py
18 18

  
19 19
from django import forms
20 20
from django.forms import formset_factory
21
from django.utils.translation import ugettext_lazy as _
21
from django.utils.translation import gettext_lazy as _
22 22

  
23 23
from passerelle.base.forms import BaseQueryFormMixin
24 24

  
passerelle/apps/opengis/models.py
28 28
from django.template import Context, Template, TemplateSyntaxError
29 29
from django.urls import reverse
30 30
from django.utils.text import slugify
31
from django.utils.translation import ugettext_lazy as _
31
from django.utils.translation import gettext_lazy as _
32 32

  
33 33
from passerelle.base.models import BaseQuery, BaseResource
34 34
from passerelle.utils.api import endpoint
passerelle/apps/orange/models.py
20 20
# You should have received a copy of the GNU Affero General Public License
21 21
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
22 22
from django.db import models
23
from django.utils.translation import ugettext_lazy as _
23
from django.utils.translation import gettext_lazy as _
24 24

  
25 25
from passerelle.sms.models import SMSResource
26 26
from passerelle.utils.jsonresponse import APIError
passerelle/apps/ovh/models.py
13 13
from django.template.loader import render_to_string
14 14
from django.utils import timezone
15 15
from django.utils.encoding import force_text
16
from django.utils.translation import ugettext_lazy as _
16
from django.utils.translation import gettext_lazy as _
17 17

  
18 18
from passerelle.base.models import SkipJob
19 19
from passerelle.sms.models import SMSResource
passerelle/apps/ovh/views.py
2 2

  
3 3
from django.contrib import messages
4 4
from django.shortcuts import reverse
5
from django.utils.translation import ugettext_lazy as _
5
from django.utils.translation import gettext_lazy as _
6 6
from django.views.generic.base import RedirectView
7 7
from requests import RequestException
8 8

  
passerelle/apps/oxyd/models.py
1 1
import requests
2 2
from django.db import models
3 3
from django.utils.encoding import force_text
4
from django.utils.translation import ugettext_lazy as _
4
from django.utils.translation import gettext_lazy as _
5 5

  
6 6
from passerelle.sms.models import SMSResource
7 7
from passerelle.utils.jsonresponse import APIError
passerelle/apps/phonecalls/models.py
20 20
from django.shortcuts import render
21 21
from django.utils.http import urlencode
22 22
from django.utils.timezone import make_naive, now, timedelta
23
from django.utils.translation import ugettext_lazy as _
23
from django.utils.translation import gettext_lazy as _
24 24

  
25 25
from passerelle.base.models import BaseResource
26 26
from passerelle.utils.api import endpoint
passerelle/apps/photon/models.py
22 22
from django.db import models
23 23
from django.utils.encoding import force_bytes
24 24
from django.utils.http import urlencode
25
from django.utils.translation import ugettext_lazy as _
25
from django.utils.translation import gettext_lazy as _
26 26
from requests import RequestException
27 27

  
28 28
from passerelle.base.models import BaseResource
passerelle/apps/plone_restapi/models.py
21 21
from django.db import models
22 22
from django.shortcuts import get_object_or_404
23 23
from django.urls import reverse
24
from django.utils.translation import ugettext_lazy as _
24
from django.utils.translation import gettext_lazy as _
25 25
from requests import RequestException
26 26

  
27 27
from passerelle.base.models import BaseQuery, BaseResource, HTTPResource
passerelle/apps/sector/models.py
27 27
from django.http import HttpResponse
28 28
from django.utils.encoding import force_bytes, force_str, smart_text
29 29
from django.utils.timezone import now
30
from django.utils.translation import ugettext_lazy as _
30
from django.utils.translation import gettext_lazy as _
31 31

  
32 32
from passerelle.base.models import BaseResource
33 33
from passerelle.utils.api import endpoint
passerelle/apps/sfr_dmc/models.py
16 16
import json
17 17

  
18 18
from django.db import models
19
from django.utils.translation import ugettext_lazy as _
19
from django.utils.translation import gettext_lazy as _
20 20

  
21 21
from passerelle.sms.models import SMSResource
22 22
from passerelle.utils.jsonresponse import APIError
passerelle/apps/signal_arretes/models.py
24 24
from django.db import models
25 25
from django.http import HttpResponse
26 26
from django.utils.text import slugify
27
from django.utils.translation import ugettext_lazy as _
27
from django.utils.translation import gettext_lazy as _
28 28
from requests import RequestException
29 29

  
30 30
from passerelle.base.models import BaseResource, HTTPResource
passerelle/apps/sivin/models.py
19 19

  
20 20
from django.core.cache import cache
21 21
from django.db import models
22
from django.utils.translation import ugettext_lazy as _
22
from django.utils.translation import gettext_lazy as _
23 23
from requests import RequestException
24 24

  
25 25
from passerelle.base.models import BaseResource
passerelle/apps/soap/models.py
23 23
from django.db import models
24 24
from django.forms import ValidationError
25 25
from django.utils.functional import cached_property
26
from django.utils.translation import ugettext_lazy as _
26
from django.utils.translation import gettext_lazy as _
27 27
from zeep.wsse.username import UsernameToken
28 28

  
29 29
from passerelle.base.models import BaseResource, HTTPResource
passerelle/apps/solis/models.py
22 22
from django.template.loader import get_template
23 23
from django.utils.encoding import force_text
24 24
from django.utils.http import urlencode
25
from django.utils.translation import ugettext_lazy as _
25
from django.utils.translation import gettext_lazy as _
26 26

  
27 27
from passerelle.base.models import BaseResource
28 28
from passerelle.utils.api import endpoint
passerelle/apps/sp_fr/models.py
28 28
from django.db import models, transaction
29 29
from django.template import engines
30 30
from django.urls import reverse
31
from django.utils.translation import ugettext
32
from django.utils.translation import ugettext_lazy as _
31
from django.utils.translation import gettext
32
from django.utils.translation import gettext_lazy as _
33 33
from lxml import etree as ET
34 34

  
35 35
from passerelle.base.models import BaseResource
......
628 628
        yield 'convention_specifique'
629 629

  
630 630
    def __str__(self):
631
        return ugettext('Mapping from "{procedure}" to formdef "{formdef}"').format(
631
        return gettext('Mapping from "{procedure}" to formdef "{formdef}"').format(
632 632
            procedure=self.get_procedure_display(), formdef=self.formdef.title if self.formdef else '-'
633 633
        )
634 634

  
passerelle/apps/twilio/models.py
15 15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16
import requests
17 17
from django.db import models
18
from django.utils.translation import ugettext_lazy as _
18
from django.utils.translation import gettext_lazy as _
19 19
from requests.auth import HTTPBasicAuth
20 20

  
21 21
from passerelle.sms.models import SMSResource
passerelle/apps/vivaticket/models.py
19 19

  
20 20
from django.core.cache import cache
21 21
from django.db import models
22
from django.utils.translation import ugettext_lazy as _
22
from django.utils.translation import gettext_lazy as _
23 23

  
24 24
from passerelle.base.models import BaseResource
25 25
from passerelle.utils.api import endpoint
passerelle/base/forms.py
1 1
from django import forms
2
from django.utils.translation import ugettext_lazy as _
2
from django.utils.translation import gettext_lazy as _
3 3

  
4 4
from .models import AccessRight, ApiUser, AvailabilityParameters
5 5

  
passerelle/base/models.py
31 31
from django.utils.log import AdminEmailHandler
32 32
from django.utils.text import slugify
33 33
from django.utils.timezone import now
34
from django.utils.translation import ugettext_lazy as _
34
from django.utils.translation import gettext_lazy as _
35 35
from model_utils.managers import InheritanceManager as ModelUtilsInheritanceManager
36 36

  
37 37
import passerelle
passerelle/base/templatetags/passerelle.py
27 27
from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
28 28
from django.template.defaultfilters import stringfilter
29 29
from django.utils.html import format_html, mark_safe
30
from django.utils.translation import ugettext as _
30
from django.utils.translation import gettext as _
31 31

  
32 32
from passerelle.utils import get_trusted_services
33 33

  
passerelle/base/views.py
26 26
from django.shortcuts import get_object_or_404
27 27
from django.urls import reverse
28 28
from django.utils.timezone import make_aware
29
from django.utils.translation import ugettext_lazy as _
29
from django.utils.translation import gettext_lazy as _
30 30
from django.views.generic import CreateView, DeleteView, DetailView, FormView, ListView, UpdateView, View
31 31

  
32 32
from ..utils import ImportSiteError, export_site, get_trusted_services, import_site
passerelle/contrib/adict/models.py
15 15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16

  
17 17
from django.db import models
18
from django.utils.translation import ugettext_lazy as _
18
from django.utils.translation import gettext_lazy as _
19 19

  
20 20
from passerelle.base.models import BaseResource
21 21
from passerelle.utils.api import endpoint
passerelle/contrib/caluire_axel/models.py
24 24
from django.http import HttpResponse
25 25
from django.utils import dateformat
26 26
from django.utils.timezone import localtime
27
from django.utils.translation import ugettext_lazy as _
27
from django.utils.translation import gettext_lazy as _
28 28

  
29 29
from passerelle.base.models import BaseResource
30 30
from passerelle.contrib.utils import axel
passerelle/contrib/caluire_axel/schemas.py
18 18
import os
19 19

  
20 20
import xmlschema
21
from django.utils.translation import ugettext_lazy as _
21
from django.utils.translation import gettext_lazy as _
22 22

  
23 23
from passerelle.contrib.utils import axel
24 24

  
passerelle/contrib/dpark/models.py
25 25
from django.core.cache import cache
26 26
from django.db import models
27 27
from django.utils import timezone
28
from django.utils.translation import ugettext_lazy as _
28
from django.utils.translation import gettext_lazy as _
29 29
from zeep.exceptions import Fault as WebFault
30 30
from zeep.helpers import serialize_object
31 31

  
passerelle/contrib/esirius_swi/models.py
18 18

  
19 19
import zeep
20 20
from django.db import models
21
from django.utils.translation import ugettext_lazy as _
21
from django.utils.translation import gettext_lazy as _
22 22

  
23 23
from passerelle.base.models import BaseResource
24 24
from passerelle.utils.api import endpoint
passerelle/contrib/fake_family/models.py
16 16

  
17 17
from django.contrib.postgres.fields import JSONField
18 18
from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
19
from django.utils.translation import ugettext_lazy as _
19
from django.utils.translation import gettext_lazy as _
20 20

  
21 21
from passerelle.base.models import BaseResource
22 22

  
passerelle/contrib/gdema/models.py
21 21
from django.db import models
22 22
from django.utils.dateparse import parse_date, parse_datetime
23 23
from django.utils.timezone import get_fixed_timezone, is_naive, make_aware, utc
24
from django.utils.translation import ugettext_lazy as _
24
from django.utils.translation import gettext_lazy as _
25 25

  
26 26
from passerelle.base.models import BaseResource
27 27
from passerelle.utils.api import endpoint
passerelle/contrib/grandlyon_streetsections/models.py
20 20
from django.db import models
21 21
from django.utils import timezone
22 22
from django.utils.text import slugify
23
from django.utils.translation import ugettext_lazy as _
23
from django.utils.translation import gettext_lazy as _
24 24

  
25 25
from passerelle.base.models import BaseResource
26 26
from passerelle.utils.api import endpoint
passerelle/contrib/greco/models.py
23 23
import suds.sudsobject
24 24
from django.core.cache import cache
25 25
from django.db import models
26
from django.utils.translation import ugettext_lazy as _
26
from django.utils.translation import gettext_lazy as _
27 27
from suds.client import Client
28 28
from suds.transport import Reply
29 29
from suds.transport.http import HttpAuthenticated
passerelle/contrib/grenoble_gru/models.py
23 23
from django.utils import dateparse
24 24
from django.utils.http import urlencode
25 25
from django.utils.text import slugify
26
from django.utils.translation import ugettext_lazy as _
26
from django.utils.translation import gettext_lazy as _
27 27
from lxml import etree
28 28

  
29 29
from passerelle.base.models import BaseResource
passerelle/contrib/isere_ens/models.py
21 21
from django.core.cache import cache
22 22
from django.db import models
23 23
from django.utils.formats import date_format
24
from django.utils.translation import ugettext_lazy as _
24
from django.utils.translation import gettext_lazy as _
25 25

  
26 26
from passerelle.base.models import BaseResource, HTTPResource
27 27
from passerelle.utils.api import endpoint
passerelle/contrib/iws/models.py
20 20
import pkg_resources
21 21
from django.db import models
22 22
from django.utils import dateformat
23
from django.utils.translation import ugettext_lazy as _
23
from django.utils.translation import gettext_lazy as _
24 24

  
25 25
from passerelle.base.models import BaseResource
26 26
from passerelle.utils.api import endpoint
passerelle/contrib/lille_kimoce/models.py
19 19

  
20 20
from django.core.cache import cache
21 21
from django.db import models
22
from django.utils.translation import ugettext_lazy as _
22
from django.utils.translation import gettext_lazy as _
23 23

  
24 24
from passerelle.base.models import BaseResource
25 25
from passerelle.utils.api import endpoint
passerelle/contrib/lille_urban_card/models.py
21 21
from urllib.parse import urljoin
22 22

  
23 23
from django.db import models
24
from django.utils.translation import ugettext_lazy as _
24
from django.utils.translation import gettext_lazy as _
25 25

  
26 26
from passerelle.base.models import BaseResource
27 27
from passerelle.utils.api import endpoint
passerelle/contrib/mdph13/models.py
22 22

  
23 23
import requests
24 24
from django.db import models, transaction
25
from django.utils.translation import ugettext_lazy as _
25
from django.utils.translation import gettext_lazy as _
26 26

  
27 27
from passerelle.base.models import BaseResource, HTTPResource
28 28
from passerelle.utils.api import endpoint
passerelle/contrib/nancypoll/models.py
2 2

  
3 3
from django.db import models
4 4
from django.utils.encoding import force_text
5
from django.utils.translation import ugettext_lazy as _
5
from django.utils.translation import gettext_lazy as _
6 6

  
7 7
from passerelle.base.models import BaseResource
8 8
from passerelle.utils.api import endpoint
passerelle/contrib/planitech/models.py
27 27
from django.db import models, transaction
28 28
from django.utils import dateformat, dateparse
29 29
from django.utils.encoding import force_bytes
30
from django.utils.translation import ugettext_lazy as _
30
from django.utils.translation import gettext_lazy as _
31 31
from requests.exceptions import RequestException
32 32

  
33 33
from passerelle.base.models import BaseResource
passerelle/contrib/rsa13/models.py
25 25
from django.urls import reverse
26 26
from django.utils.http import urlencode
27 27
from django.utils.timezone import now
28
from django.utils.translation import ugettext_lazy as _
28
from django.utils.translation import gettext_lazy as _
29 29

  
30 30
from passerelle.base.models import BaseResource, HTTPResource
31 31
from passerelle.utils.api import endpoint
passerelle/contrib/sigerly/models.py
17 17
from urllib.parse import urljoin
18 18

  
19 19
from django.db import models
20
from django.utils.translation import ugettext_lazy as _
20
from django.utils.translation import gettext_lazy as _
21 21

  
22 22
from passerelle.base.models import BaseResource, HTTPResource
23 23
from passerelle.utils.api import endpoint
passerelle/contrib/solis_afi_mss/models.py
17 17
import base64
18 18

  
19 19
from django.db import models
20
from django.utils.translation import ugettext_lazy as _
20
from django.utils.translation import gettext_lazy as _
21 21

  
22 22
from passerelle.base.models import BaseResource, HTTPResource
23 23
from passerelle.utils.api import endpoint
passerelle/contrib/solis_apa/models.py
20 20

  
21 21
from django.core.cache import cache
22 22
from django.db import models
23
from django.utils.translation import ugettext_lazy as _
23
from django.utils.translation import gettext_lazy as _
24 24

  
25 25
from passerelle.base.models import BaseResource
26 26
from passerelle.contrib.solis_apa import conciliation, integration, suivi
passerelle/contrib/solis_apa/views.py
15 15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16

  
17 17
from django.utils.decorators import method_decorator
18
from django.utils.translation import ugettext_lazy as _
18
from django.utils.translation import gettext_lazy as _
19 19
from django.views.decorators.csrf import csrf_exempt
20 20
from django.views.generic import DetailView as GenericDetailView
21 21
from django.views.generic import View
passerelle/contrib/strasbourg_eu/models.py
20 20

  
21 21
from django.db import models
22 22
from django.utils.encoding import force_text
23
from django.utils.translation import ugettext_lazy as _
23
from django.utils.translation import gettext_lazy as _
24 24
from requests import RequestException
25 25

  
26 26
from passerelle.base.models import BaseResource
passerelle/contrib/stub_invoices/models.py
20 20

  
21 21
from django.http import HttpResponse
22 22
from django.utils import timezone
23
from django.utils.translation import ugettext_lazy as _
23
from django.utils.translation import gettext_lazy as _
24 24

  
25 25
from passerelle.base.models import BaseResource
26 26
from passerelle.utils.api import endpoint
passerelle/contrib/tcl/models.py
19 19
from django.conf import settings
20 20
from django.db import models, transaction
21 21
from django.utils import timezone
22
from django.utils.translation import ugettext_lazy as _
22
from django.utils.translation import gettext_lazy as _
23 23

  
24 24
from passerelle.base.models import BaseResource
25 25
from passerelle.utils.api import endpoint
passerelle/contrib/teamnet_axel/models.py
24 24
from django.db import models
25 25
from django.http import HttpResponse, HttpResponseNotFound
26 26
from django.utils.encoding import smart_text
27
from django.utils.translation import ugettext_lazy as _
27
from django.utils.translation import gettext_lazy as _
28 28

  
29 29
from passerelle.base.models import BaseResource
30 30
from passerelle.soap import client_to_jsondict
passerelle/contrib/toulouse_axel/models.py
25 25
from django.http import HttpResponse
26 26
from django.utils import dateformat
27 27
from django.utils.dates import WEEKDAYS as WEEKDAYS_LABELS
28
from django.utils.translation import ugettext_lazy as _
28
from django.utils.translation import gettext_lazy as _
29 29

  
30 30
from passerelle.base.models import BaseResource
31 31
from passerelle.contrib.utils import axel
passerelle/contrib/toulouse_foederis/models.py
24 24
from django.http import Http404, HttpResponse
25 25
from django.urls import reverse
26 26
from django.utils.timezone import localtime, now
27
from django.utils.translation import ugettext_lazy as _
27
from django.utils.translation import gettext_lazy as _
28 28

  
29 29
from passerelle.base.models import BaseResource, HTTPResource
30 30
from passerelle.utils.api import endpoint
passerelle/contrib/toulouse_smart/models.py
30 30
from django.urls import reverse
31 31
from django.utils.text import slugify
32 32
from django.utils.timezone import now
33
from django.utils.translation import ugettext_lazy as _
33
from django.utils.translation import gettext_lazy as _
34 34
from requests import RequestException
35 35

  
36 36
from passerelle.base.models import BaseResource, HTTPResource, SkipJob
passerelle/forms.py
16 16

  
17 17
from django import forms
18 18
from django.utils.text import slugify
19
from django.utils.translation import ugettext_lazy as _
19
from django.utils.translation import gettext_lazy as _
20 20

  
21 21

  
22 22
class GenericConnectorForm(forms.ModelForm):
passerelle/sms/forms.py
14 14
# You should have received a copy of the GNU Affero General Public License
15 15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16
from django import forms
17
from django.utils.translation import ugettext_lazy as _
17
from django.utils.translation import gettext_lazy as _
18 18

  
19 19
from passerelle.forms import GenericConnectorForm
20 20

  
passerelle/sms/models.py
22 22
from django.db import models
23 23
from django.urls import reverse
24 24
from django.utils.module_loading import import_string
25
from django.utils.translation import ugettext_lazy as _
25
from django.utils.translation import gettext_lazy as _
26 26

  
27 27
from passerelle.base.models import BaseResource
28 28
from passerelle.sms.forms import SMSConnectorForm
passerelle/sms/views.py
5 5
from django.db.models.functions import TruncDay
6 6
from django.http import JsonResponse
7 7
from django.utils.timezone import make_aware
8
from django.utils.translation import ugettext_lazy as _
8
from django.utils.translation import gettext_lazy as _
9 9
from django.views.generic import FormView, View
10 10

  
11 11
from passerelle.base.models import SkipJob
passerelle/utils/paginator.py
1 1
from django.core.paginator import EmptyPage, Page, Paginator
2 2
from django.utils.functional import cached_property
3
from django.utils.translation import ugettext_lazy as _
3
from django.utils.translation import gettext_lazy as _
4 4

  
5 5

  
6 6
class InfinitePaginator(Paginator):
passerelle/utils/sftp.py
28 28
from django.core import validators
29 29
from django.db import models
30 30
from django.utils.encoding import force_bytes, force_text
31
from django.utils.translation import ugettext_lazy as _
31
from django.utils.translation import gettext_lazy as _
32 32
from paramiko.dsskey import DSSKey
33 33
from paramiko.ecdsakey import ECDSAKey
34 34

  
passerelle/utils/templates.py
22 22
from django.core.exceptions import ValidationError
23 23
from django.template import TemplateSyntaxError
24 24
from django.template.backends.django import DjangoTemplates
25
from django.utils.translation import ugettext as _
25
from django.utils.translation import gettext as _
26 26

  
27 27

  
28 28
def make_template(template_string):
passerelle/views.py
37 37
from django.urls import reverse
38 38
from django.utils.encoding import force_bytes, force_text
39 39
from django.utils.timezone import is_naive, make_aware
40
from django.utils.translation import ugettext_lazy as _
40
from django.utils.translation import gettext_lazy as _
41 41
from django.views.decorators.csrf import csrf_exempt
42 42
from django.views.generic import (
43 43
    CreateView,
tests/test_sms.py
20 20
import pytest
21 21
from django.contrib.contenttypes.models import ContentType
22 22
from django.urls import reverse
23
from django.utils.translation import ugettext as _
23
from django.utils.translation import gettext as _
24 24

  
25 25
import tests.utils
26 26
from passerelle.apps.choosit.models import ChoositSMSGateway
27
-