diff --git a/allianceauth/authentication/forms.py b/allianceauth/authentication/forms.py index ea0379ca..d24ddabd 100644 --- a/allianceauth/authentication/forms.py +++ b/allianceauth/authentication/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 allianceauth.authentication.models import User class RegistrationForm(forms.Form): email = forms.EmailField(label=_('Email'), max_length=254, required=True) diff --git a/allianceauth/authentication/models.py b/allianceauth/authentication/models.py index 9dc2df64..dd4b674f 100755 --- a/allianceauth/authentication/models.py +++ b/allianceauth/authentication/models.py @@ -2,7 +2,7 @@ import logging from django.contrib.auth.models import User, Permission from django.db import models, transaction -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo, EveAllianceInfo, EveFactionInfo from allianceauth.notifications import notify diff --git a/allianceauth/corputils/auth_hooks.py b/allianceauth/corputils/auth_hooks.py index e8afc8b6..d90d7f3c 100644 --- a/allianceauth/corputils/auth_hooks.py +++ b/allianceauth/corputils/auth_hooks.py @@ -1,5 +1,5 @@ from allianceauth.services.hooks import MenuItemHook, UrlHook -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from allianceauth import hooks from allianceauth.corputils import urls diff --git a/allianceauth/corputils/views.py b/allianceauth/corputils/views.py index fd818896..98367aef 100644 --- a/allianceauth/corputils/views.py +++ b/allianceauth/corputils/views.py @@ -6,7 +6,7 @@ from django.contrib.auth.decorators import login_required, permission_required, from django.core.exceptions import PermissionDenied, ObjectDoesNotExist from django.db import IntegrityError from django.shortcuts import render, redirect, get_object_or_404 -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from esi.decorators import token_required from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo diff --git a/allianceauth/fleetactivitytracking/auth_hooks.py b/allianceauth/fleetactivitytracking/auth_hooks.py index b54b63cd..8d71fc13 100644 --- a/allianceauth/fleetactivitytracking/auth_hooks.py +++ b/allianceauth/fleetactivitytracking/auth_hooks.py @@ -1,5 +1,5 @@ from . import urls -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from allianceauth import hooks from allianceauth.services.hooks import MenuItemHook, UrlHook diff --git a/allianceauth/fleetactivitytracking/forms.py b/allianceauth/fleetactivitytracking/forms.py index 7ef820c2..0bbf560c 100644 --- a/allianceauth/fleetactivitytracking/forms.py +++ b/allianceauth/fleetactivitytracking/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 _ class FatlinkForm(forms.Form): diff --git a/allianceauth/fleetactivitytracking/views.py b/allianceauth/fleetactivitytracking/views.py index 246842e8..f95451c3 100644 --- a/allianceauth/fleetactivitytracking/views.py +++ b/allianceauth/fleetactivitytracking/views.py @@ -10,7 +10,7 @@ from django.contrib.auth.models import User from django.core.exceptions import ValidationError, ObjectDoesNotExist from django.shortcuts import render, redirect, get_object_or_404, Http404 from django.utils import timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from esi.decorators import token_required from allianceauth.eveonline.providers import provider from .forms import FatlinkForm diff --git a/allianceauth/groupmanagement/auth_hooks.py b/allianceauth/groupmanagement/auth_hooks.py index e077110b..45a90e25 100644 --- a/allianceauth/groupmanagement/auth_hooks.py +++ b/allianceauth/groupmanagement/auth_hooks.py @@ -1,4 +1,4 @@ -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from allianceauth.services.hooks import MenuItemHook, UrlHook from allianceauth import hooks diff --git a/allianceauth/groupmanagement/views.py b/allianceauth/groupmanagement/views.py index e8d68157..d47de33c 100755 --- a/allianceauth/groupmanagement/views.py +++ b/allianceauth/groupmanagement/views.py @@ -9,7 +9,7 @@ from django.core.exceptions import ObjectDoesNotExist, PermissionDenied from django.db.models import Count from django.http import Http404 from django.shortcuts import render, redirect, get_object_or_404 -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from allianceauth.notifications import notify diff --git a/allianceauth/hrapplications/auth_hooks.py b/allianceauth/hrapplications/auth_hooks.py index e1a71f02..9f32f8fc 100644 --- a/allianceauth/hrapplications/auth_hooks.py +++ b/allianceauth/hrapplications/auth_hooks.py @@ -1,4 +1,4 @@ -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from allianceauth import hooks from allianceauth.services.hooks import MenuItemHook, UrlHook diff --git a/allianceauth/hrapplications/forms.py b/allianceauth/hrapplications/forms.py index 73ffd5c4..9a6d96f4 100755 --- a/allianceauth/hrapplications/forms.py +++ b/allianceauth/hrapplications/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 _ class HRApplicationCommentForm(forms.Form): diff --git a/allianceauth/optimer/auth_hooks.py b/allianceauth/optimer/auth_hooks.py index 23231e75..0570db0f 100644 --- a/allianceauth/optimer/auth_hooks.py +++ b/allianceauth/optimer/auth_hooks.py @@ -1,5 +1,5 @@ from allianceauth.services.hooks import MenuItemHook, UrlHook -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from allianceauth import hooks from . import urls diff --git a/allianceauth/optimer/form.py b/allianceauth/optimer/form.py index 8fb97c91..3a870a08 100644 --- a/allianceauth/optimer/form.py +++ b/allianceauth/optimer/form.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 allianceauth.optimer.form_widgets import DataListWidget diff --git a/allianceauth/optimer/views.py b/allianceauth/optimer/views.py index ae492d03..b16549f8 100644 --- a/allianceauth/optimer/views.py +++ b/allianceauth/optimer/views.py @@ -6,7 +6,7 @@ from django.contrib.auth.decorators import permission_required from django.shortcuts import get_object_or_404 from django.shortcuts import render, redirect from django.utils import timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from .form import OpForm from .models import OpTimer, OpTimerType diff --git a/allianceauth/services/forms.py b/allianceauth/services/forms.py index 1eda557e..0dc59111 100644 --- a/allianceauth/services/forms.py +++ b/allianceauth/services/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 _ class FleetFormatterForm(forms.Form): diff --git a/allianceauth/services/hooks.py b/allianceauth/services/hooks.py index b91aca26..59595a84 100644 --- a/allianceauth/services/hooks.py +++ b/allianceauth/services/hooks.py @@ -1,4 +1,5 @@ -from django.conf.urls import include, url +from django.conf.urls import include +from django.urls import re_path from django.core.exceptions import ObjectDoesNotExist from django.template.loader import render_to_string from django.utils.functional import cached_property @@ -9,7 +10,6 @@ from allianceauth.hooks import get_hooks from .models import NameFormatConfig - def get_extension_logger(name): """ Takes the name of a plugin/extension and generates a child logger of the extensions logger @@ -157,7 +157,7 @@ class MenuItemHook: class UrlHook: def __init__(self, urls, namespace, base_url): - self.include_pattern = url(base_url, include(urls, namespace=namespace)) + self.include_pattern = re_path(base_url, include(urls, namespace=namespace)) class NameFormatter: diff --git a/allianceauth/services/modules/openfire/forms.py b/allianceauth/services/modules/openfire/forms.py index 9fbe4cd6..8497a024 100644 --- a/allianceauth/services/modules/openfire/forms.py +++ b/allianceauth/services/modules/openfire/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 _ class JabberBroadcastForm(forms.Form): diff --git a/allianceauth/services/modules/teamspeak3/forms.py b/allianceauth/services/modules/teamspeak3/forms.py index 8e41ca59..1ef735ae 100644 --- a/allianceauth/services/modules/teamspeak3/forms.py +++ b/allianceauth/services/modules/teamspeak3/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 .manager import Teamspeak3Manager diff --git a/allianceauth/srp/auth_hooks.py b/allianceauth/srp/auth_hooks.py index c59b3f18..f6a920c8 100644 --- a/allianceauth/srp/auth_hooks.py +++ b/allianceauth/srp/auth_hooks.py @@ -1,4 +1,4 @@ -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from allianceauth import hooks from allianceauth.services.hooks import MenuItemHook, UrlHook diff --git a/allianceauth/srp/form.py b/allianceauth/srp/form.py index a7e80663..e13ed922 100755 --- a/allianceauth/srp/form.py +++ b/allianceauth/srp/form.py @@ -1,7 +1,7 @@ import re from django import forms -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class SrpFleetMainForm(forms.Form): diff --git a/allianceauth/timerboard/form.py b/allianceauth/timerboard/form.py index 3a42179b..121d4ff3 100755 --- a/allianceauth/timerboard/form.py +++ b/allianceauth/timerboard/form.py @@ -3,7 +3,7 @@ import datetime from django import forms from django.utils import timezone from django.core.validators import MaxValueValidator, MinValueValidator -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from .models import Timer, TimerType diff --git a/allianceauth/timerboard/views.py b/allianceauth/timerboard/views.py index ebc4715b..9da84b1e 100755 --- a/allianceauth/timerboard/views.py +++ b/allianceauth/timerboard/views.py @@ -9,7 +9,7 @@ from django.urls import reverse_lazy from django.views.generic import CreateView, UpdateView, DeleteView from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin from django.utils import timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from .form import TimerForm from .models import Timer