♻️ django 3.2 deprecation: url -> re_path ; ugettext_lazy -> gettext_lazy

8 files changed, 119 insertions, 120 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 35c6ba6fb..0cabfd53a 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -30,7 +30,7 @@ from django.core import validators
 from django.core.exceptions import PermissionDenied
 from django.db.models import Q
 from django.forms.formsets import formset_factory
-from ishtar_common.utils import ugettext_lazy as _
+from ishtar_common.utils import gettext_lazy as _
 
 from . import models
 from archaeological_operations.models import CulturalAttributionType, RemainType
diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py
index 8122f75ad..34cec6eb3 100644
--- a/archaeological_finds/forms_treatments.py
+++ b/archaeological_finds/forms_treatments.py
@@ -24,7 +24,7 @@ from collections import OrderedDict
 from bootstrap_datepicker.widgets import DateField
 from django import forms
 from django.core import validators
-from ishtar_common.utils import ugettext_lazy as _
+from ishtar_common.utils import gettext_lazy as _
 from ishtar_common.forms import FormHeader
 
 from archaeological_finds import models
diff --git a/archaeological_finds/ishtar_menu.py b/archaeological_finds/ishtar_menu.py
index c76bea061..4521c4077 100644
--- a/archaeological_finds/ishtar_menu.py
+++ b/archaeological_finds/ishtar_menu.py
@@ -17,7 +17,7 @@
 
 # See the file COPYING for details.
 
-from ishtar_common.utils import ugettext_lazy as _
+from ishtar_common.utils import gettext_lazy as _
 
 from ishtar_common.menu_base import SectionItem, MenuItem
 
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 7f345efd8..c3241afa3 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -38,7 +38,7 @@ from ishtar_common.utils import (
     pgettext_lazy,
     post_save_geo,
     SearchAltName,
-    ugettext_lazy as _
+    gettext_lazy as _
 )
 
 from ishtar_common.alternative_configs import ALTERNATE_CONFIGS
diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py
index faf448b63..2675e3ec6 100644
--- a/archaeological_finds/models_treatments.py
+++ b/archaeological_finds/models_treatments.py
@@ -32,7 +32,7 @@ from django.db.models import Max, Q
 from django.db.models.signals import post_save, post_delete, pre_delete, m2m_changed
 from django.template.defaultfilters import slugify
 from django.urls import reverse
-from ishtar_common.utils import ugettext_lazy as _, pgettext_lazy, SheetItem
+from ishtar_common.utils import gettext_lazy as _, pgettext_lazy, SheetItem
 
 from archaeological_finds.models_finds import Find, FindBasket, TreatmentType, \
                                               FindTreatment
diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py
index af6b5285a..a690b8698 100644
--- a/archaeological_finds/urls.py
+++ b/archaeological_finds/urls.py
@@ -17,8 +17,7 @@
 
 # See the file COPYING for details.
 
-from django.conf.urls import url
-from django.urls import path, register_converter
+from django.urls import path, re_path, register_converter
 
 from ishtar_common.utils import check_permissions, get_urls_for_model
 
@@ -35,21 +34,21 @@ register_converter(urls_converters.DateTimeConverter, "datetime")
 
 # forms
 urlpatterns = [
-    url(
+    re_path(
         r"find_search/(?P<step>.+)?$",
         check_permissions(
             ["archaeological_finds.view_find", "archaeological_finds.view_own_find"]
         )(views.find_search_wizard),
         name="find_search",
     ),
-    url(
+    re_path(
         r"find_creation/(?P<step>.+)?$",
         check_permissions(
             ["archaeological_finds.add_find"]
         )(views.find_creation_wizard),
         name="find_creation",
     ),
-    url(
+    re_path(
         r"find_modification/(?P<step>.+)?$",
         check_permissions(
             ["archaeological_finds.change_find",
@@ -57,9 +56,9 @@ urlpatterns = [
         )(views.find_modification_wizard),
         name="find_modification",
     ),
-    url(r"find_modify/(?P<pk>.+)/$", views.find_modify, name="find_modify"),
-    url(r"find_create/(?P<pk>.+)/$", views.find_create, name="find_create"),
-    url(
+    re_path(r"find_modify/(?P<pk>.+)/$", views.find_modify, name="find_modify"),
+    re_path(r"find_create/(?P<pk>.+)/$", views.find_create, name="find_create"),
+    re_path(
         r"find_deletion/(?P<step>.+)?$",
         check_permissions(
             ["archaeological_finds.delete_find",
@@ -67,8 +66,8 @@ urlpatterns = [
         )(views.find_deletion_wizard),
         name="find_deletion",
     ),
-    url(r"find_delete/(?P<pk>.+)/$", views.find_delete, name="delete-find"),
-    url(
+    re_path(r"find_delete/(?P<pk>.+)/$", views.find_delete, name="delete-find"),
+    re_path(
         r"^find-qa-duplicate/(?P<pks>[0-9-]+)?/$",
         check_permissions(
             ["archaeological_finds.change_find",
@@ -76,13 +75,13 @@ urlpatterns = [
         )(views.QAFindDuplicateFormView.as_view()),
         name="find-qa-duplicate",
     ),
-    url(r"get-findbasket/$", views.get_find_basket, name="get-findbasket"),
-    url(
+    re_path(r"get-findbasket/$", views.get_find_basket, name="get-findbasket"),
+    re_path(
         r"get-findbasket-write/$",
         views.get_find_basket_for_write,
         name="get-findbasket-write",
     ),
-    url(
+    re_path(
         r"find_basket_search/(?P<step>.+)?$",
         check_permissions(
             ["archaeological_finds.view_find",
@@ -90,7 +89,7 @@ urlpatterns = [
         )(views.basket_search_wizard),
         name="find_basket_search",
     ),
-    url(
+    re_path(
         r"^find_basket_creation/$",
         check_permissions(
             ["archaeological_finds.view_find",
@@ -98,7 +97,7 @@ urlpatterns = [
         )(views.NewFindBasketView.as_view()),
         name="new_findbasket",
     ),
-    url(
+    re_path(
         r"^find_basket_modification/(?P<step>.+)?$",
         check_permissions(
             ["archaeological_finds.view_find",
@@ -106,12 +105,12 @@ urlpatterns = [
         )(views.basket_modify_wizard),
         name="find_basket_modification",
     ),
-    url(
+    re_path(
         r"find_basket_modify/(?P<pk>.+)/$",
         views.find_basket_modify,
         name="find_basket_modify",
     ),
-    url(
+    re_path(
         r"^find_basket_modification_add/$",
         check_permissions(
             ["archaeological_finds.view_find",
@@ -119,7 +118,7 @@ urlpatterns = [
         )(views.SelectBasketForManagement.as_view()),
         name="select_findbasketforadd",
     ),
-    url(
+    re_path(
         r"^find_basket_modification_add/(?P<pk>[0-9]+)?/$",
         check_permissions(
             ["archaeological_finds.view_find",
@@ -127,7 +126,7 @@ urlpatterns = [
         )(views.SelectItemsInBasket.as_view()),
         name="select_itemsinbasket",
     ),
-    url(
+    re_path(
         r"^find_basket_modification_add_item/$",
         check_permissions(
             ["archaeological_finds.view_find",
@@ -135,7 +134,7 @@ urlpatterns = [
         )(views.FindBasketAddItemView.as_view()),
         name="add_iteminbasket",
     ),
-    url(
+    re_path(
         r"^find_basket_modification_delete_item/(?P<basket>[0-9]+)?"
         r"/(?P<find_pk>[0-9]+)?/$",
         check_permissions(
@@ -144,7 +143,7 @@ urlpatterns = [
         )(views.FindBasketDeleteItemView.as_view()),
         name="delete_iteminbasket",
     ),
-    url(
+    re_path(
         r"^find_basket_list/(?P<pk>[0-9]+)?/$",
         check_permissions(
             ["archaeological_finds.view_find",
@@ -152,7 +151,7 @@ urlpatterns = [
         )(views.FindBasketListView.as_view()),
         name="list_iteminbasket",
     ),
-    url(
+    re_path(
         r"^find_basket_deletion/(?P<step>.+)?$",
         check_permissions(
             ["archaeological_finds.view_find",
@@ -160,7 +159,7 @@ urlpatterns = [
         )(views.basket_delete_wizard),
         name="find_basket_deletion",
     ),
-    url(
+    re_path(
         r"^findbasket-qa-duplicate/(?P<pks>[0-9-]+)?/$",
         check_permissions(
             ["archaeological_finds.view_find",
@@ -168,63 +167,63 @@ urlpatterns = [
         )(views.QAFindbasketDuplicateFormView.as_view()),
         name="findbasket-qa-duplicate",
     ),
-    url(
+    re_path(
         r"^findbasket-add-treatment/(?P<pk>[0-9-]+)/$",
         check_permissions(
             ["archaeological_finds.add_treatment"]
         )(views.findbasket_treatment_add),
         name="findbasket-add-treatment",
     ),
-    url(
+    re_path(
         r"^findbasket-add-treatmentfile/(?P<pk>[0-9-]+)/$",
         check_permissions(
             ["archaeological_finds.add_treatmentfile"]
         )(views.findbasket_treatmentfile_add),
         name="findbasket-add-treatmentfile",
     ),
-    url(
+    re_path(
         r"^findbasket-add-exhibition/(?P<pk>[0-9-]+)/$",
         check_permissions(
             ["archaeological_finds.add_exhibition"]
         )(views.findbasket_exhibition_add),
         name="findbasket-add-exhibition",
     ),
-    url(
+    re_path(
         r"^find-add-treatment/(?P<pk>[0-9-]+)/$",
         check_permissions(
             ["archaeological_finds.add_treatment"]
         )(views.find_treatment_add),
         name="find-add-treatment",
     ),
-    url(
+    re_path(
         r"^find-add-divide-treatment/(?P<pk>[0-9-]+)/$",
         check_permissions(
             ["archaeological_finds.add_treatment"]
         )(views.find_divide_treatment_add),
         name="find-add-divide-treatment",
     ),
-    url(
+    re_path(
         r"^treatmentfile-add-treatment/(?P<pk>[0-9-]+)/$",
         check_permissions(
             ["archaeological_finds.add_treatment"]
         )(views.treatmentfile_treatment_add),
         name="treatmentfile-add-treatment",
     ),
-    url(
+    re_path(
         r"^treatment-add-adminact/(?P<pk>[0-9-]+)/$",
         check_permissions(
             ["archaeological_operations.add_administrativeact"]
         )(views.treatment_adminact_add),
         name="treatment-add-adminact",
     ),
-    url(
+    re_path(
         r"^treatmentfile-add-adminact/(?P<pk>[0-9-]+)/$",
         check_permissions(
             ["archaeological_operations.add_administrativeact"]
         )(views.treatmentfile_adminact_add),
         name="treatmentfile-add-adminact",
     ),
-    url(
+    re_path(
         r"^find-qa-bulk-update/(?P<pks>[0-9-]+)?/$",
         check_permissions(
             ["archaeological_finds.change_find",
@@ -232,7 +231,7 @@ urlpatterns = [
         )(views.QAFindForm.as_view()),
         name="find-qa-bulk-update",
     ),
-    url(
+    re_path(
         r"^find-qa-bulk-update/(?P<pks>[0-9-]+)?/confirm/$",
         check_permissions(
             ["archaeological_finds.change_find",
@@ -241,7 +240,7 @@ urlpatterns = [
         name="find-qa-bulk-update-confirm",
         kwargs={"confirm": True},
     ),
-    url(
+    re_path(
         r"^find-qa-basket/(?P<pks>[0-9-]+)?/$",
         check_permissions(
             ["archaeological_finds.change_find",
@@ -249,7 +248,7 @@ urlpatterns = [
         )(views.QAFindBasketFormView.as_view()),
         name="find-qa-basket",
     ),
-    url(
+    re_path(
         r"findbasket-qa-bulk-update/(?P<pks>[0-9-]+)?/$",
         check_permissions([
             "archaeological_finds.change_find",
@@ -257,7 +256,7 @@ urlpatterns = [
         ])(views.QAFindBasketModifyView.as_view()),
         name="findbasket-qa-bulk-update",
     ),
-    url(
+    re_path(
         r"findbasket-qa-bulk-update/(?P<pks>[0-9-]+)?/confirm/$",
         check_permissions([
             "archaeological_finds.change_find",
@@ -266,7 +265,7 @@ urlpatterns = [
         name="findbasket-qa-bulk-update-confirm",
         kwargs={"confirm": True},
     ),
-    url(
+    re_path(
         r"^find-qa-packaging/(?P<pks>[0-9-]+)?/$",
         check_permissions(
             ["archaeological_finds.change_find",
@@ -274,45 +273,45 @@ urlpatterns = [
             )(views.QAFindTreatmentFormView.as_view()),
         name="find-qa-packaging",
     ),
-    url(
+    re_path(
         r"^find-qa-lock/(?P<pks>[0-9-]+)?/$",
         views.QAFindLockView.as_view(),
         name="find-qa-lock",
         kwargs={"model": models.Find},
     ),
-    url(
+    re_path(
         r"^find-qa-link/(?P<pks>[0-9-]+)?/$",
         QALinkView.as_view(),
         name="find-qa-link",
         kwargs={"model": models.Find, "url": "find-qa-link"},
     ),
-    url(
+    re_path(
         r"^treatment_creation/(?P<step>.+)?$",
         check_permissions(
             ["archaeological_finds.add_treatment"]
             )(views.treatment_creation_wizard),
         name="treatment_creation",
     ),
-    url(
+    re_path(
         r"^treatment_creation_n1/(?P<step>.+)?$",
         check_permissions(
             ["archaeological_finds.add_treatment"]
         )(views.treatment_creation_n1_wizard),
         name="treatment_creation_n1",
     ),
-    url(
+    re_path(
         r"treatment_n1_create/(?P<pks>[-0-9]+)/$",
         views.treatment_n1_create,
         name="treatment-n1-create",
     ),
-    url(
+    re_path(
         r"^treatment_creation_1n/(?P<step>.+)?$",
         check_permissions(
             ["archaeological_finds.add_treatment"]
         )(views.treatment_creation_1n_wizard),
         name="treatment_creation_1n",
     ),
-    url(
+    re_path(
         r"^treatment_modification/(?P<step>.+)?$",
         check_permissions(
             ["archaeological_finds.change_treatment",
@@ -320,12 +319,12 @@ urlpatterns = [
         )(views.treatment_modification_wizard),
         name="treatment_modification",
     ),
-    url(
+    re_path(
         r"^treatment_modify/(?P<pk>.+)/$",
         views.treatment_modify,
         name="treatment_modify",
     ),
-    url(
+    re_path(
         r"^treatment_search/(?P<step>.+)?$",
         check_permissions(
             ["archaeological_finds.view_treatment",
@@ -333,7 +332,7 @@ urlpatterns = [
         )(views.treatment_search_wizard),
         name="treatment_search",
     ),
-    url(
+    re_path(
         r"^treatment_deletion/(?P<step>.+)?$",
         check_permissions(
             ["archaeological_finds.delete_treatment",
@@ -341,12 +340,12 @@ urlpatterns = [
         )(views.treatment_deletion_wizard),
         name="treatment_deletion",
     ),
-    url(
+    re_path(
         r"^treatment_delete/(?P<pk>.+)/$",
         views.treatment_delete,
         name="delete-treatment",
     ),
-    url(
+    re_path(
         r"^treatment_admacttreatment_search/(?P<step>.+)?$",
         check_permissions([
             "archaeological_operations.view_administrativeact",
@@ -355,7 +354,7 @@ urlpatterns = [
         ),
         name="treatment_admacttreatment_search",
     ),
-    url(
+    re_path(
         r"^treatment_admacttreatment/(?P<step>.+)?$",
         check_permissions([
             "archaeological_operations.add_administrativeact"])(
@@ -363,7 +362,7 @@ urlpatterns = [
         ),
         name="treatment_admacttreatment",
     ),
-    url(
+    re_path(
         r"^treatment_admacttreatment_modification/(?P<step>.+)?$",
         check_permissions([
             "archaeological_operations.change_administrativeact",
@@ -373,12 +372,12 @@ urlpatterns = [
         ),
         name="treatment_admacttreatment_modification",
     ),
-    url(
+    re_path(
         r"^treatment_administrativeacttreatment_modify/(?P<pk>.+)/$",
         views.treatment_administrativeacttreatment_modify,
         name="treatment_administrativeacttreatment_modify",
     ),
-    url(
+    re_path(
         r"^treatment_admacttreatment_deletion/(?P<step>.+)?$",
         check_permissions([
             "archaeological_operations.delete_administrativeact",
@@ -387,17 +386,17 @@ urlpatterns = [
         ),
         name="treatment_admacttreatment_deletion",
     ),
-    url(
+    re_path(
         r"^get-administrativeacttreatment/(?P<type>.+)?$",
         views.get_administrativeacttreatment,
         name="get-administrativeacttreatment",
     ),
-    url(
+    re_path(
         r"^treatment_administrativeacttreatment_delete/(?P<pk>.+)/$",
         views.treatment_administrativeacttreatment_delete,
         name="delete-administrativeact-treatment",
     ),
-    url(
+    re_path(
         r"^treatmentfle_admacttreatmentfle_search/(?P<step>.+)?$",
         check_permissions([
             "archaeological_operations.view_administrativeact",
@@ -407,7 +406,7 @@ urlpatterns = [
         ),
         name="treatmentfle_admacttreatmentfle_search",
     ),
-    url(
+    re_path(
         r"^treatmentfle_admacttreatmentfle_modification/(?P<step>.+)?$",
         check_permissions([
             "archaeological_operations.change_administrativeact",
@@ -416,19 +415,19 @@ urlpatterns = [
         ),
         name="treatmentfle_admacttreatmentfle_modification",
     ),
-    url(
+    re_path(
         r"^treatmentfle_admacttreatmentfle/(?P<step>.+)?$",
         check_permissions(["archaeological_operations.add_administrativeact"])(
             views.treatmentfile_admacttreatmentfile_wizard
         ),
         name="treatmentfle_admacttreatmentfle",
     ),
-    url(
+    re_path(
         r"^treatmentfile_administrativeacttreatmentfile_modify/(?P<pk>.+)/$",
         views.treatmentfile_administrativeacttreatmentfile_modify,
         name="treatmentfile_administrativeacttreatmentfile_modify",
     ),
-    url(
+    re_path(
         r"^treatmentfle_admacttreatmentfle_deletion/(?P<step>.+)?$",
         check_permissions([
             "archaeological_operations.delete_administrativeact",
@@ -437,7 +436,7 @@ urlpatterns = [
         ),
         name="treatmentfle_admacttreatmentfle_deletion",
     ),
-    url(
+    re_path(
         r"^treatmentfile_administrativeacttreatmentfile_delete/(?P<pk>.+)/$",
         views.treatmentfile_administrativeacttreatmentfile_delete,
         name="delete-administrativeact-treatmentfile",
@@ -516,7 +515,7 @@ urlpatterns = [
          views.show_exhibition, name="show-exhibition"),
     path("display-exhibition/<int:pk>/",
          views.display_exhibition, name="display-exhibition"),
-    url(
+    re_path(
         r"^treatmentfle_search/(?P<step>.+)?$",
         check_permissions(
             ["archaeological_finds.view_treatmentfile",
@@ -524,14 +523,14 @@ urlpatterns = [
         )(views.treatmentfile_search_wizard),
         name="treatmentfile_search",
     ),
-    url(
+    re_path(
         r"treatmentfle_creation/(?P<step>.+)?$",
         check_permissions(
             ["archaeological_finds.add_treatmentfile"]
         )(views.treatmentfile_creation_wizard),
         name="treatmentfile_creation",
     ),
-    url(
+    re_path(
         r"treatmentfle_modification/(?P<step>.+)?$",
         check_permissions(
             ["archaeological_finds.change_treatmentfile",
@@ -539,12 +538,12 @@ urlpatterns = [
         )(views.treatmentfile_modification_wizard),
         name="treatmentfile_modification",
     ),
-    url(
+    re_path(
         r"^treatmentfile_modify/(?P<pk>.+)/$",
         views.treatmentfile_modify,
         name="treatmentfile_modify",
     ),
-    url(
+    re_path(
         r"^treatmentfle_deletion/(?P<step>.+)?$",
         check_permissions(
             ["archaeological_finds.delete_treatmentfile",
@@ -552,214 +551,214 @@ urlpatterns = [
             )(views.treatmentfile_deletion_wizard),
         name="treatmentfile_deletion",
     ),
-    url(
+    re_path(
         r"^treatmentfle_delete/(?P<pk>.+)/$",
         views.treatmentfile_delete,
         name="delete-treatmentfile",
     ),
-    url(
+    re_path(
         r"get-administrativeacttreatmentfile/(?P<type>.+)?$",
         views.get_administrativeacttreatmentfile,
         name="get-administrativeacttreatmentfile",
     ),
-    url(
+    re_path(
         r"get-upstreamtreatment/(?P<type>.+)?$",
         views.get_upstreamtreatment,
         name="get-upstreamtreatment",
     ),
-    url(
+    re_path(
         r"get-downstreamtreatment/(?P<type>.+)?$",
         views.get_downstreamtreatment,
         name="get-downstreamtreatment",
     ),
-    url(
+    re_path(
         r"autocomplete-objecttype/$",
         views.autocomplete_objecttype,
         name="autocomplete-objecttype",
     ),
-    url(
+    re_path(
         r"autocomplete-functionalarea/$",
         views.autocomplete_functionalarea,
         name="autocomplete-functionalarea",
     ),
-    url(
+    re_path(
         r"autocomplete-technicalarea/$",
         views.autocomplete_technicalarea,
         name="autocomplete-technicalarea",
     ),
-    url(
+    re_path(
         r"autocomplete-technicalprocess/$",
         views.autocomplete_technicalprocess,
         name="autocomplete-technicalprocess",
     ),
-    url(
+    re_path(
         r"autocomplete-materialtype/$",
         views.autocomplete_materialtype,
         name="autocomplete-materialtype",
     ),
-    url(
+    re_path(
         r"autocomplete-treatmenttype/$",
         views.autocomplete_treatmenttype,
         name="autocomplete-treatmenttype",
     ),
-    url(
+    re_path(
         r"autocomplete-integritytype/$",
         views.autocomplete_integritytype,
         name="autocomplete-integritytype",
     ),
-    url(
+    re_path(
         r"autocomplete-treatmentfile/$",
         views.autocomplete_treatmentfile,
         name="autocomplete-treatmentfile",
     ),
-    url(
+    re_path(
         r"autocomplete-exhibition/$",
         views.autocomplete_exhibition,
         name="autocomplete-exhibition",
     ),
-    url(
+    re_path(
         r"get-find-for-ope/own/(?P<type>.+)?$",
         views.get_find_for_ope,
         name="get-own-find-for-ope",
         kwargs={"force_own": True},
     ),
-    url(
+    re_path(
         r"get-find-for-ope/(?P<type>.+)?$",
         views.get_find_for_ope,
         name="get-find-for-ope",
     ),
-    url(
+    re_path(
         r"get-find-for-cr/cr/(?P<type>.+)?$",
         views.get_find_for_cr,
         name="get-own-find-for-cr",
         kwargs={"force_own": True},
     ),
-    url(
+    re_path(
         r"get-find-for-cr/(?P<type>.+)?$", views.get_find_for_cr, name="get-find-for-cr"
     ),
-    url(
+    re_path(
         r"get-find-for-treatment/own/(?P<type>.+)?$",
         views.get_find_for_treatment,
         name="get-own-find-for-treatment",
         kwargs={"force_own": True},
     ),
-    url(
+    re_path(
         r"get-find-for-treatment/(?P<type>.+)?$",
         views.get_find_for_treatment,
         name="get-find-for-treatment",
     ),
-    url(
+    re_path(
         r"get-find-inside-container/own/(?P<type>.+)?$",
         views.get_find_inside_container,
         name="get-find-inside-container",
         kwargs={"force_own": True},
     ),
-    url(
+    re_path(
         r"get-find-inside-container/(?P<type>.+)?$",
         views.get_find_inside_container,
         name="get-find-inside-container",
     ),
-    url(
+    re_path(
         r"get-find-full/own/(?P<type>.+)?$",
         views.get_find,
         name="get-own-find-full",
         kwargs={"full": True, "force_own": True},
     ),
-    url(
+    re_path(
         r"get-find-full/(?P<type>.+)?$",
         views.get_find,
         name="get-find-full",
         kwargs={"full": True},
     ),
-    url(
+    re_path(
         r"get-find-shortcut/(?P<type>.+)?$",
         views.get_find,
         name="get-find-shortcut",
         kwargs={"full": "shortcut"},
     ),
-    url(
+    re_path(
         r"^show-findbasket/(?:(?P<pk>.+)/(?P<type>.+)?)?$",
         views.show_findbasket,
         name="show-findbasket",
     ),
-    url(
+    re_path(
         r"^show-basefind/(?:(?P<pk>.+)/(?P<type>.+)?)?$",
         views.show_basefind,
         name="show-basefind",
     ),
-    url(
+    re_path(
         r"^display-find/basket-(?P<pk>.+)/$",
         views.display_findbasket,
         name="display-findbasket",
     ),
-    url(
+    re_path(
         r"^show-historized-find/(?P<pk>.+)?/(?P<date>.+)?$",
         views.show_find,
         name="show-historized-find",
     ),
-    url(
+    re_path(
         r"^revert-find/(?P<pk>.+)/(?P<date>.+)$", views.revert_find, name="revert-find"
     ),
-    url(
+    re_path(
         r"get-treatment-shortcut/(?P<type>.+)?$",
         views.get_treatment,
         name="get-treatment-shortcut",
         kwargs={"full": "shortcut"},
     ),
-    url(
+    re_path(
         r"show-historized-treatment/(?P<pk>.+)?/(?P<date>.+)?$",
         views.show_treatment,
         name="show-historized-treatment",
     ),
-    url(
+    re_path(
         r"^revert-treatment/(?P<pk>.+)/(?P<date>.+)$",
         views.revert_treatment,
         name="revert-treatment",
     ),
-    url(
+    re_path(
         r"get-treatmentfile/(?P<type>.+)?$",
         views.get_treatmentfile,
         name="get-treatmentfile",
     ),
-    url(
+    re_path(
         r"get-exhibition/(?P<type>.+)?$",
         views.get_exhibition,
         name="get-exhibition",
     ),
-    url(
+    re_path(
         r"get-treatmentfile-shortcut/(?P<type>.+)?$",
         views.get_treatmentfile,
         name="get-treatmentfile-shortcut",
         kwargs={"full": "shortcut"},
     ),
-    url(
+    re_path(
         r"^show-treatmentfile(?:/(?P<pk>.+))?/(?P<type>.+)?$",
         views.show_treatmentfile,
         name=models.TreatmentFile.SHOW_URL,
     ),
-    url(
+    re_path(
         r"show-historized-treatmentfile/(?P<pk>.+)?/(?P<date>.+)?$",
         views.show_treatmentfile,
         name="show-historized-treatmentfile",
     ),
-    url(
+    re_path(
         r"^revert-treatmentfile/(?P<pk>.+)/(?P<date>.+)$",
         views.revert_treatmentfile,
         name="revert-treatmentfile",
     ),
-    url(
+    re_path(
         r"^treatment_administrativeact_document/$",
         administrativeactfile_document,
         name="treatment-administrativeact-document",
         kwargs={"treatment": True},
     ),
-    url(
+    re_path(
         r"^treatmentfle_administrativeact_document/$",
         administrativeactfile_document,
         name="treatmentfle-administrativeact-document",
         kwargs={"treatment_file": True},
     ),
-    url(
+    re_path(
         r"autocomplete-findbasket/$",
         check_permissions(
             ["archaeological_finds.change_find",
@@ -767,7 +766,7 @@ urlpatterns = [
         )(views.autocomplete_findbasket),
         name="autocomplete-findbasket",
     ),
-    url(
+    re_path(
         r"autocomplete-findbasket-write/$",
         check_permissions(
             ["archaeological_finds.change_find",
@@ -775,10 +774,10 @@ urlpatterns = [
         )(views.autocomplete_findbasket_write),
         name="autocomplete-findbasket-write",
     ),
-    url(
+    re_path(
         r"api/public/find/$", views_api.PublicFindAPI.as_view(), name="api-public-find"
     ),
-    url(
+    re_path(
         r"api/ishtar/base-finds/get-geo$",
         check_permissions(
             ["archaeological_finds.view_find",
@@ -786,11 +785,11 @@ urlpatterns = [
         )(views.get_geo_items),
         name="api-get-geo",
     ),
-    url(
+    re_path(
         r"api/facets/find/$", views_api.FacetFindAPIView.as_view(),
         name="api-facets-find"
     ),
-    url(
+    re_path(
         r"api/search/find/$", views_api.SearchFindAPI.as_view(),
         name="api-search-find"
     ),
@@ -803,7 +802,7 @@ urlpatterns = [
         "api/get/find/<int:pk>/", views_api.GetFindAPI.as_view(),
         name="api-get-find"
     ),
-    url(
+    re_path(
         r"autocomplete-basefind/$",
         check_permissions(
             ["archaeological_finds.view_basefind",
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index d8b5a3c64..751a6d973 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -27,7 +27,7 @@ from django.http import HttpResponseRedirect, HttpResponse, Http404
 from django.shortcuts import redirect, render
 from django.urls import reverse
 
-from ishtar_common.utils import ugettext_lazy as _, BSMessage
+from ishtar_common.utils import gettext_lazy as _, BSMessage
 from django.views.generic import TemplateView
 from django.views.generic.edit import CreateView, FormView, UpdateView
 
diff --git a/archaeological_finds/wizards.py b/archaeological_finds/wizards.py
index 34e9e9ca4..51768cc9a 100644
--- a/archaeological_finds/wizards.py
+++ b/archaeological_finds/wizards.py
@@ -19,7 +19,7 @@
 
 from django.contrib import messages
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
-from ishtar_common.utils import ugettext_lazy as _, pgettext, get_current_profile
+from ishtar_common.utils import gettext_lazy as _, pgettext, get_current_profile
 
 from ishtar_common.forms import reverse_lazy
 from ishtar_common.wizards import (