Projet

Général

Profil

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

A. Berriot, 01 septembre 2022 12:22

Télécharger (41,3 ko)

Voir les différences:

Subject: [PATCH 1/6] django4: replaced ugettext* calls with corresponding
 gettext* calls (#68607)

 debian/multitenant/debian_config.py                   |  2 +-
 src/authentic2/a2_rbac/management.py                  | 10 +++++-----
 src/authentic2/a2_rbac/signal_handlers.py             |  2 +-
 src/authentic2/apps/authenticators/forms.py           |  2 +-
 src/authentic2/apps/authenticators/models.py          |  2 +-
 src/authentic2/apps/authenticators/views.py           |  2 +-
 src/authentic2/apps/journal/forms.py                  |  2 +-
 src/authentic2/apps/journal/search_engine.py          |  2 +-
 src/authentic2/attributes_ng/engine.py                |  2 +-
 src/authentic2/attributes_ng/sources/django_user.py   |  2 +-
 src/authentic2/attributes_ng/sources/service_roles.py |  2 +-
 src/authentic2/backends/ldap_backend.py               |  2 +-
 src/authentic2/csv_import.py                          |  2 +-
 src/authentic2/custom_user/apps.py                    |  2 +-
 src/authentic2/data_transfer.py                       |  2 +-
 src/authentic2/disco_service/disco_responder.py       |  2 +-
 src/authentic2/forms/authentication.py                |  8 ++++----
 src/authentic2/forms/fields.py                        |  2 +-
 src/authentic2/forms/mixins.py                        |  2 +-
 src/authentic2/forms/passwords.py                     |  2 +-
 src/authentic2/forms/registration.py                  |  6 +++---
 src/authentic2/forms/widgets.py                       |  2 +-
 src/authentic2/hashers.py                             |  2 +-
 src/authentic2/idp/saml/backend.py                    |  2 +-
 src/authentic2/idp/saml/saml2_endpoints.py            |  4 ++--
 src/authentic2/idp/saml/views.py                      |  2 +-
 src/authentic2/journal_event_types.py                 |  2 +-
 src/authentic2/manager/forms.py                       |  7 ++++---
 src/authentic2/manager/journal_views.py               |  2 +-
 src/authentic2/manager/ou_views.py                    |  2 +-
 src/authentic2/manager/role_views.py                  |  2 +-
 src/authentic2/manager/service_views.py               |  2 +-
 src/authentic2/manager/tables.py                      |  8 ++++----
 src/authentic2/manager/user_import.py                 |  2 +-
 src/authentic2/manager/user_views.py                  | 11 ++++++-----
 src/authentic2/manager/views.py                       |  2 +-
 src/authentic2/middleware.py                          |  2 +-
 src/authentic2/passwords.py                           |  2 +-
 src/authentic2/saml/admin.py                          |  2 +-
 src/authentic2/saml/forms.py                          |  2 +-
 src/authentic2/saml/management/commands/mapping.py    |  2 +-
 src/authentic2/urls.py                                |  2 +-
 src/authentic2/utils/evaluate.py                      |  2 +-
 src/authentic2/utils/template.py                      |  2 +-
 src/authentic2/views.py                               |  2 +-
 src/authentic2_auth_fc/forms.py                       |  2 +-
 src/authentic2_auth_fc/utils.py                       |  2 +-
 src/authentic2_auth_fc/views.py                       |  2 +-
 src/authentic2_auth_oidc/admin.py                     |  2 +-
 src/authentic2_auth_oidc/utils.py                     |  2 +-
 src/authentic2_auth_oidc/views.py                     |  2 +-
 src/authentic2_auth_saml/adapters.py                  |  2 +-
 .../migrations/0003_auto_20220726_1713.py             |  2 +-
 src/authentic2_idp_cas/admin.py                       |  2 +-
 src/authentic2_idp_oidc/manager/views.py              |  2 +-
 src/authentic2_idp_oidc/views.py                      |  2 +-
 src/django_rbac/models.py                             |  2 +-
 tests/test_all.py                                     |  2 +-
 58 files changed, 79 insertions(+), 77 deletions(-)
debian/multitenant/debian_config.py
1 1
import os
2 2

  
3
from django.utils.translation import ugettext_lazy as _
3
from django.utils.translation import gettext_lazy as _
4 4

  
5 5
# Debian defaults
6 6
DEBUG = False
src/authentic2/a2_rbac/management.py
16 16

  
17 17
from django.contrib.contenttypes.models import ContentType
18 18
from django.utils.text import slugify
19
from django.utils.translation import ugettext
20
from django.utils.translation import ugettext_lazy as _
19
from django.utils.translation import gettext
20
from django.utils.translation import gettext_lazy as _
21 21

  
22 22
from authentic2.a2_rbac.models import OrganizationalUnit, Role
23 23
from authentic2.utils.misc import get_fk_model
......
106 106
    if app_settings.MANAGED_CONTENT_TYPES == ():
107 107
        Role.objects.filter(slug=slug).delete()
108 108
    else:
109
        admin_role, created = Role.objects.get_or_create(slug=slug, defaults=dict(name=ugettext('Manager')))
109
        admin_role, created = Role.objects.get_or_create(slug=slug, defaults=dict(name=gettext('Manager')))
110 110
        admin_role.add_self_administration()
111
        if not created and admin_role.name != ugettext('Manager'):
112
            admin_role.name = ugettext('Manager')
111
        if not created and admin_role.name != gettext('Manager'):
112
            admin_role.name = gettext('Manager')
113 113
            admin_role.save()
114 114

  
115 115
    for ct in cts:
src/authentic2/a2_rbac/signal_handlers.py
17 17
from django.apps import apps
18 18
from django.conf import settings
19 19
from django.db import DEFAULT_DB_ALIAS, router, transaction
20
from django.utils.translation import gettext as _
20 21
from django.utils.translation import override
21
from django.utils.translation import ugettext as _
22 22

  
23 23
from authentic2.a2_rbac.models import OrganizationalUnit, Role
24 24
from authentic2.utils.misc import get_fk_model
src/authentic2/apps/authenticators/forms.py
16 16

  
17 17
from django import forms
18 18
from django.db.models import Max
19
from django.utils.translation import ugettext as _
19
from django.utils.translation import gettext as _
20 20

  
21 21
from authentic2.forms.mixins import SlugMixin
22 22

  
src/authentic2/apps/authenticators/models.py
23 23
from django.shortcuts import render, reverse
24 24
from django.utils.formats import date_format
25 25
from django.utils.text import capfirst
26
from django.utils.translation import gettext_lazy as _
26 27
from django.utils.translation import pgettext_lazy
27
from django.utils.translation import ugettext_lazy as _
28 28

  
29 29
from authentic2 import views
30 30
from authentic2.utils.evaluate import condition_validator, evaluate_condition
src/authentic2/apps/authenticators/views.py
20 20
from django.shortcuts import get_object_or_404
21 21
from django.urls import reverse, reverse_lazy
22 22
from django.utils.functional import cached_property
23
from django.utils.translation import ugettext as _
23
from django.utils.translation import gettext as _
24 24
from django.views.generic import CreateView, DeleteView, DetailView, FormView, UpdateView
25 25
from django.views.generic.list import ListView
26 26

  
src/authentic2/apps/journal/forms.py
20 20
from django.http import QueryDict
21 21
from django.utils.formats import date_format
22 22
from django.utils.functional import cached_property
23
from django.utils.translation import ugettext_lazy as _
23
from django.utils.translation import gettext_lazy as _
24 24

  
25 25
from . import models, search_engine
26 26

  
src/authentic2/apps/journal/search_engine.py
19 19

  
20 20
from django.contrib.auth import get_user_model
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 . import models
25 25

  
src/authentic2/attributes_ng/engine.py
16 16

  
17 17
import logging
18 18

  
19
from django.utils.translation import ugettext as _
19
from django.utils.translation import gettext as _
20 20

  
21 21
from .. import app_settings, plugins
22 22
from ..decorators import to_iter, to_list
src/authentic2/attributes_ng/sources/django_user.py
15 15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16

  
17 17
from django.contrib.auth import get_user_model
18
from django.utils.translation import ugettext_lazy as _
18
from django.utils.translation import gettext_lazy as _
19 19

  
20 20
from authentic2.a2_rbac.models import Role
21 21

  
src/authentic2/attributes_ng/sources/service_roles.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

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

  
19 19
from authentic2.a2_rbac.models import Role
20 20

  
src/authentic2/backends/ldap_backend.py
39 39
from django.db.models import Q
40 40
from django.db.transaction import atomic
41 41
from django.utils.encoding import force_bytes, force_text
42
from django.utils.translation import gettext as _
42 43
from django.utils.translation import ngettext
43
from django.utils.translation import ugettext as _
44 44
from ldap.controls import DecodeControlTuples, SimplePagedResultsControl, ppolicy
45 45
from ldap.dn import escape_dn_chars
46 46
from ldap.filter import filter_format
src/authentic2/csv_import.py
27 27
from django.db import IntegrityError, models
28 28
from django.db.transaction import atomic
29 29
from django.utils.encoding import force_bytes, force_text
30
from django.utils.translation import ugettext as _
30
from django.utils.translation import gettext as _
31 31

  
32 32
from authentic2 import app_settings
33 33
from authentic2.a2_rbac.models import Role
src/authentic2/custom_user/apps.py
34 34
        from django.contrib.auth import get_user_model
35 35
        from django.contrib.contenttypes.models import ContentType
36 36
        from django.utils import translation
37
        from django.utils.translation import ugettext_lazy as _
37
        from django.utils.translation import gettext_lazy as _
38 38

  
39 39
        from authentic2.attribute_kinds import get_kind
40 40
        from authentic2.models import Attribute, AttributeValue
src/authentic2/data_transfer.py
22 22
from django.core.exceptions import NON_FIELD_ERRORS, ValidationError
23 23
from django.core.validators import validate_slug
24 24
from django.utils.text import format_lazy
25
from django.utils.translation import ugettext_lazy as _
25
from django.utils.translation import gettext_lazy as _
26 26

  
27 27
from authentic2.a2_rbac.models import OrganizationalUnit, Permission, Role, RoleAttribute, RoleParenting
28 28
from authentic2.a2_rbac.utils import get_default_ou
src/authentic2/disco_service/disco_responder.py
30 30
from django.http import HttpResponseRedirect
31 31
from django.urls import reverse
32 32
from django.utils.http import urlquote
33
from django.utils.translation import ugettext as _
33
from django.utils.translation import gettext as _
34 34

  
35 35
from authentic2 import settings
36 36
from authentic2.saml.common import error_page as base_error_page
src/authentic2/forms/authentication.py
23 23
from django.forms.widgets import Media
24 24
from django.utils import html
25 25
from django.utils.encoding import force_text
26
from django.utils.translation import ugettext
27
from django.utils.translation import ugettext_lazy as _
26
from django.utils.translation import gettext
27
from django.utils.translation import gettext_lazy as _
28 28

  
29 29
from authentic2.forms.fields import PasswordField
30 30
from authentic2.utils.lazy import lazy_label
......
70 70
            if preferred_ous:
71 71
                choices = self.fields['ou'].choices
72 72
                new_choices = list(choices)[:1] + [
73
                    (ugettext('Preferred organizational units'), [(ou.pk, ou.name) for ou in preferred_ous]),
74
                    (ugettext('All organizational units'), list(choices)[1:]),
73
                    (gettext('Preferred organizational units'), [(ou.pk, ou.name) for ou in preferred_ous]),
74
                    (gettext('All organizational units'), list(choices)[1:]),
75 75
                ]
76 76
                self.fields['ou'].choices = new_choices
77 77

  
src/authentic2/forms/fields.py
21 21
from django.core.files import File
22 22
from django.forms import CharField, EmailField, FileField, ValidationError
23 23
from django.forms.fields import FILE_INPUT_CONTRADICTION
24
from django.utils.translation import ugettext_lazy as _
24
from django.utils.translation import gettext_lazy as _
25 25

  
26 26
from authentic2 import app_settings
27 27
from authentic2.forms.widgets import (
src/authentic2/forms/mixins.py
19 19

  
20 20
from django import forms
21 21
from django.utils.text import slugify
22
from django.utils.translation import ugettext as _
22
from django.utils.translation import gettext as _
23 23

  
24 24

  
25 25
class LockedFieldFormMixin:
src/authentic2/forms/passwords.py
22 22
from django.contrib.auth import forms as auth_forms
23 23
from django.core.exceptions import ValidationError
24 24
from django.forms import Form
25
from django.utils.translation import ugettext_lazy as _
25
from django.utils.translation import gettext_lazy as _
26 26

  
27 27
from authentic2.backends.ldap_backend import LDAPUser
28 28
from authentic2.journal import journal
src/authentic2/forms/registration.py
20 20
from django.contrib.auth.models import BaseUserManager, Group
21 21
from django.core.exceptions import ValidationError
22 22
from django.core.validators import RegexValidator
23
from django.utils.translation import ugettext
24
from django.utils.translation import ugettext_lazy as _
23
from django.utils.translation import gettext
24
from django.utils.translation import gettext_lazy as _
25 25

  
26 26
from authentic2.a2_rbac.models import OrganizationalUnit
27 27
from authentic2.forms.fields import CheckPasswordField, NewPasswordField
......
58 58
            if not email_pattern.endswith('$'):
59 59
                email_pattern += '$'
60 60
            if re.match(email_pattern, email):
61
                raise ValidationError(ugettext('You cannot register with this email.'))
61
                raise ValidationError(gettext('You cannot register with this email.'))
62 62
        return email
63 63

  
64 64

  
src/authentic2/forms/widgets.py
37 37
from django.utils.encoding import force_text
38 38
from django.utils.formats import get_format, get_language
39 39
from django.utils.safestring import mark_safe
40
from django.utils.translation import ugettext_lazy as _
40
from django.utils.translation import gettext_lazy as _
41 41
from gadjo.templatetags.gadjo import xstatic
42 42

  
43 43
from authentic2 import app_settings
src/authentic2/hashers.py
24 24
from django.contrib.auth.hashers import make_password
25 25
from django.utils.crypto import constant_time_compare
26 26
from django.utils.encoding import force_bytes, force_text
27
from django.utils.translation import ugettext_noop as _
27
from django.utils.translation import gettext_noop as _
28 28

  
29 29

  
30 30
class Drupal7PasswordHasher(hashers.BasePasswordHasher):
src/authentic2/idp/saml/backend.py
23 23
from django.db.models import Q
24 24
from django.template.loader import render_to_string
25 25
from django.urls import reverse
26
from django.utils.translation import ugettext as _
26
from django.utils.translation import gettext as _
27 27

  
28 28
from authentic2.decorators import to_list
29 29
from authentic2.idp.saml import saml2_endpoints
src/authentic2/idp/saml/saml2_endpoints.py
52 52
from django.urls import reverse
53 53
from django.utils.encoding import force_bytes, force_str, force_text
54 54
from django.utils.timezone import utc
55
from django.utils.translation import ugettext as _
56
from django.utils.translation import ugettext_noop as N_
55
from django.utils.translation import gettext as _
56
from django.utils.translation import gettext_noop as N_
57 57
from django.views.decorators.cache import never_cache
58 58
from django.views.decorators.csrf import csrf_exempt
59 59
from django.views.decorators.http import require_POST
src/authentic2/idp/saml/views.py
18 18
from django.contrib.auth import REDIRECT_FIELD_NAME
19 19
from django.http import HttpResponseRedirect
20 20
from django.urls import reverse
21
from django.utils.translation import ugettext as _
21
from django.utils.translation import gettext as _
22 22
from django.views.generic import DeleteView, View
23 23

  
24 24
from authentic2.saml.models import LibertyFederation
src/authentic2/journal_event_types.py
15 15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16

  
17 17
from django.utils.translation import gettext_lazy as _
18
from django.utils.translation import ugettext_noop as N_
18
from django.utils.translation import gettext_noop as N_
19 19

  
20 20
from authentic2.a2_rbac.models import OrganizationalUnit as OU
21 21
from authentic2.apps.journal.models import EventTypeDefinition
src/authentic2/manager/forms.py
26 26
from django.contrib.contenttypes.models import ContentType
27 27
from django.core.exceptions import ValidationError
28 28
from django.urls import reverse
29
from django.utils.translation import pgettext, ugettext
30
from django.utils.translation import ugettext_lazy as _
29
from django.utils.translation import gettext
30
from django.utils.translation import gettext_lazy as _
31
from django.utils.translation import pgettext
31 32
from django_select2.forms import HeavySelect2Widget
32 33

  
33 34
from authentic2.a2_rbac.models import OrganizationalUnit, Permission, Role
......
712 713

  
713 714
    @staticmethod
714 715
    def raise_validation_error(error_message):
715
        message_prefix = ugettext('Invalid import file')
716
        message_prefix = gettext('Invalid import file')
716 717
        raise forms.ValidationError('%s : %s' % (message_prefix, str(error_message)))
717 718

  
718 719

  
src/authentic2/manager/journal_views.py
24 24
from django.core.validators import EmailValidator
25 25
from django.db.models import Q
26 26
from django.urls import reverse
27
from django.utils.translation import gettext_lazy as _
27 28
from django.utils.translation import pgettext_lazy
28
from django.utils.translation import ugettext_lazy as _
29 29
from django.views.generic.list import ListView
30 30

  
31 31
from authentic2.apps.journal.forms import JournalForm as BaseJournalForm
src/authentic2/manager/ou_views.py
21 21
from django.db import transaction
22 22
from django.http import HttpResponseRedirect
23 23
from django.urls import reverse
24
from django.utils.translation import ugettext as _
24
from django.utils.translation import gettext as _
25 25
from django.views.generic import FormView
26 26

  
27 27
from authentic2 import data_transfer
src/authentic2/manager/role_views.py
29 29
from django.shortcuts import get_object_or_404
30 30
from django.urls import reverse
31 31
from django.utils.functional import cached_property
32
from django.utils.translation import ugettext_lazy as _
32
from django.utils.translation import gettext_lazy as _
33 33
from django.views.generic import DetailView, FormView, TemplateView
34 34
from django.views.generic.detail import SingleObjectMixin
35 35

  
src/authentic2/manager/service_views.py
15 15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16

  
17 17
from django.contrib import messages
18
from django.utils.translation import ugettext as _
18
from django.utils.translation import gettext as _
19 19

  
20 20
from authentic2.models import Service
21 21

  
src/authentic2/manager/tables.py
20 20
from django.contrib.auth import get_user_model
21 21
from django.utils import html
22 22
from django.utils.safestring import SafeText
23
from django.utils.translation import ugettext_lazy as _
24
from django.utils.translation import ugettext_noop
23
from django.utils.translation import gettext_lazy as _
24
from django.utils.translation import gettext_noop
25 25
from django_tables2.utils import A
26 26

  
27 27
from authentic2.a2_rbac.models import OrganizationalUnit, Permission, Role
......
235 235
        ' %%}checked{%% endif %%} {%% if not record.has_perm %%}disabled title="{%% trans "%s" %%}"{%% endif'
236 236
        ' %%} {%% if not record.can_manage_members %%}disabled title="{%% trans "%s" %%}"{%% endif %%}/>'
237 237
        % (
238
            ugettext_noop('You are not authorized to manage this role'),
239
            ugettext_noop('This role is synchronised from LDAP, changing members is not allowed.'),
238
            gettext_noop('You are not authorized to manage this role'),
239
            gettext_noop('This role is synchronised from LDAP, changing members is not allowed.'),
240 240
        ),
241 241
        verbose_name=_('Member'),
242 242
        order_by=('member', 'via', 'name'),
src/authentic2/manager/user_import.py
31 31
from django.db import connection
32 32
from django.utils.functional import cached_property
33 33
from django.utils.timezone import utc
34
from django.utils.translation import ugettext_lazy as _
34
from django.utils.translation import gettext_lazy as _
35 35

  
36 36
from authentic2.utils.misc import gettid
37 37

  
src/authentic2/manager/user_views.py
30 30
from django.utils import timezone
31 31
from django.utils.functional import cached_property
32 32
from django.utils.html import format_html
33
from django.utils.translation import pgettext_lazy, ugettext
34
from django.utils.translation import ugettext_lazy as _
33
from django.utils.translation import gettext
34
from django.utils.translation import gettext_lazy as _
35
from django.utils.translation import pgettext_lazy
35 36
from django.views.generic import DetailView, FormView, TemplateView, View
36 37
from django.views.generic.detail import SingleObjectMixin
37 38
from django.views.generic.edit import BaseFormView
......
564 565

  
565 566
    def get_success_message(self, cleaned_data):
566 567
        if cleaned_data.get('send_mail'):
567
            return ugettext('New password sent to %s') % self.object.email
568
            return gettext('New password sent to %s') % self.object.email
568 569
        else:
569
            return ugettext('New password set')
570
            return gettext('New password set')
570 571

  
571 572
    def form_valid(self, form):
572 573
        response = super().form_valid(form)
......
591 592

  
592 593
    def get_success_message(self, cleaned_data):
593 594
        if cleaned_data['new_email'] != self.object.email:
594
            return ugettext('A mail was sent to %s to verify it.') % cleaned_data['new_email']
595
            return gettext('A mail was sent to %s to verify it.') % cleaned_data['new_email']
595 596
        return None
596 597

  
597 598
    def form_valid(self, form):
src/authentic2/manager/views.py
30 30
from django.utils.encoding import force_text
31 31
from django.utils.functional import cached_property
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 django.views.generic import CreateView, DeleteView, DetailView, FormView, TemplateView, UpdateView, View
35 35
from django.views.generic.base import ContextMixin
36 36
from django.views.generic.detail import SingleObjectMixin
src/authentic2/middleware.py
29 29
from django.contrib import messages
30 30
from django.db.models import Model
31 31
from django.utils.deprecation import MiddlewareMixin
32
from django.utils.translation import ugettext as _
32
from django.utils.translation import gettext as _
33 33

  
34 34
from . import app_settings, plugins
35 35
from .utils import misc as utils_misc
src/authentic2/passwords.py
22 22
from django.core.exceptions import ValidationError
23 23
from django.utils.functional import lazy
24 24
from django.utils.module_loading import import_string
25
from django.utils.translation import ugettext as _
25
from django.utils.translation import gettext as _
26 26

  
27 27
from . import app_settings
28 28

  
src/authentic2/saml/admin.py
22 22
from django.contrib import admin, messages
23 23
from django.core.exceptions import ValidationError
24 24
from django.forms import ModelForm
25
from django.utils.translation import ugettext as _
25
from django.utils.translation import gettext as _
26 26

  
27 27
try:
28 28
    from django.contrib.contenttypes.admin import GenericTabularInline
src/authentic2/saml/forms.py
21 21
from django.conf import settings
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 authentic2.a2_rbac.models import OrganizationalUnit
27 27
from authentic2.a2_rbac.utils import get_default_ou
src/authentic2/saml/management/commands/mapping.py
33 33
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
34 34
'''
35 35

  
36
from django.utils.translation import ugettext as _
36
from django.utils.translation import gettext as _
37 37

  
38 38

  
39 39
def get_def_name_from_oid(oid):
src/authentic2/urls.py
20 20
from django.contrib.auth import views as dj_auth_views
21 21
from django.contrib.auth.decorators import login_required
22 22
from django.contrib.staticfiles.views import serve
23
from django.utils.translation import ugettext_lazy as _
23
from django.utils.translation import gettext_lazy as _
24 24
from django.views.decorators.clickjacking import xframe_options_deny
25 25
from django.views.generic import RedirectView
26 26
from django.views.generic.base import TemplateView
src/authentic2/utils/evaluate.py
29 29
except ImportError:
30 30
    from django.utils.lru_cache import lru_cache
31 31

  
32
from django.utils.translation import ugettext as _
32
from django.utils.translation import gettext as _
33 33

  
34 34
logger = logging.getLogger(__name__)
35 35

  
src/authentic2/utils/template.py
17 17
from django.core.exceptions import ValidationError
18 18
from django.template import TemplateSyntaxError, VariableDoesNotExist, engines
19 19
from django.utils.encoding import force_str
20
from django.utils.translation import ugettext_lazy as _
20
from django.utils.translation import gettext_lazy as _
21 21

  
22 22

  
23 23
class TemplateError(Exception):
src/authentic2/views.py
44 44
from django.template.loader import render_to_string
45 45
from django.urls import reverse, reverse_lazy
46 46
from django.utils import timezone
47
from django.utils.translation import ugettext as _
47
from django.utils.translation import gettext as _
48 48
from django.views.decorators.cache import never_cache
49 49
from django.views.decorators.csrf import csrf_exempt, ensure_csrf_cookie
50 50
from django.views.generic import ListView, TemplateView
src/authentic2_auth_fc/forms.py
15 15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16

  
17 17
from django import forms
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 SCOPE_CHOICES, FcAuthenticator
21 21

  
src/authentic2_auth_fc/utils.py
32 32
from django.utils.encoding import force_bytes, force_text
33 33
from django.utils.http import urlencode
34 34
from django.utils.timezone import now
35
from django.utils.translation import ugettext_lazy as _
35
from django.utils.translation import gettext_lazy as _
36 36
from requests.adapters import HTTPAdapter
37 37
from requests.packages.urllib3.util.retry import Retry  # pylint: disable=import-error
38 38

  
src/authentic2_auth_fc/views.py
32 32
from django.template.response import TemplateResponse
33 33
from django.urls import reverse
34 34
from django.utils.http import urlencode
35
from django.utils.translation import ugettext as _
35
from django.utils.translation import gettext as _
36 36
from django.views.generic import FormView, View
37 37
from requests_oauthlib import OAuth2Session
38 38

  
src/authentic2_auth_oidc/admin.py
18 18

  
19 19
from django import forms
20 20
from django.contrib import admin
21
from django.utils.translation import ugettext as _
21
from django.utils.translation import gettext as _
22 22

  
23 23
from authentic2.custom_user.models import User
24 24
from authentic2.forms.widgets import DatalistTextInput
src/authentic2_auth_oidc/utils.py
20 20
import requests
21 21
from django.shortcuts import get_object_or_404
22 22
from django.utils.timezone import utc
23
from django.utils.translation import ugettext as _
23
from django.utils.translation import gettext as _
24 24
from jwcrypto.common import JWException, base64url_encode, json_decode
25 25
from jwcrypto.jwk import JWK
26 26
from jwcrypto.jwt import JWT
src/authentic2_auth_oidc/views.py
26 26
from django.http import HttpResponseBadRequest
27 27
from django.urls import reverse
28 28
from django.utils.translation import get_language
29
from django.utils.translation import ugettext as _
29
from django.utils.translation import gettext as _
30 30
from django.views.generic.base import View
31 31

  
32 32
from authentic2.utils import crypto
src/authentic2_auth_saml/adapters.py
19 19

  
20 20
from django.contrib import messages
21 21
from django.db.transaction import atomic
22
from django.utils.translation import ugettext as _
22
from django.utils.translation import gettext as _
23 23
from mellon.adapters import DefaultAdapter, UserCreationError
24 24

  
25 25
from authentic2.a2_rbac.utils import get_default_ou
src/authentic2_auth_saml/migrations/0003_auto_20220726_1713.py
3 3
from django.conf import settings
4 4
from django.db import migrations
5 5
from django.utils import translation
6
from django.utils.translation import ugettext as _
6
from django.utils.translation import gettext as _
7 7

  
8 8

  
9 9
def set_default_button_label(apps, schema_editor):
src/authentic2_idp_cas/admin.py
16 16

  
17 17
from django import forms
18 18
from django.contrib import admin
19
from django.utils.translation import ugettext as _
19
from django.utils.translation import gettext as _
20 20

  
21 21
from authentic2.admin import CleanupAdminMixin
22 22
from authentic2.attributes_ng.engine import get_attribute_names
src/authentic2_idp_oidc/manager/views.py
15 15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16

  
17 17
from django.urls import reverse
18
from django.utils.translation import ugettext_lazy as _
18
from django.utils.translation import gettext_lazy as _
19 19

  
20 20
from authentic2.manager import views
21 21
from authentic2_idp_oidc import app_settings
src/authentic2_idp_oidc/views.py
31 31
from django.utils.encoding import force_text
32 32
from django.utils.http import urlencode
33 33
from django.utils.timezone import now, utc
34
from django.utils.translation import ugettext as _
34
from django.utils.translation import gettext as _
35 35
from django.views.decorators.csrf import csrf_exempt
36 36
from ratelimit.utils import is_ratelimited
37 37

  
src/django_rbac/models.py
23 23
from django.db import models
24 24
from django.db.models.query import Prefetch, Q
25 25
from django.utils.translation import gettext
26
from django.utils.translation import ugettext_lazy as _
26
from django.utils.translation import gettext_lazy as _
27 27
from model_utils.managers import QueryManager
28 28

  
29 29
from . import backends, constants, managers, utils
tests/test_all.py
29 29
from django.test.utils import override_settings
30 30
from django.urls import reverse
31 31
from django.utils.encoding import force_text
32
from django.utils.translation import ugettext as _
32
from django.utils.translation import gettext as _
33 33
from rest_framework import status, test
34 34

  
35 35
from authentic2 import attribute_kinds, models
36
-