diff options
Diffstat (limited to 'archaeological_context_records')
| -rw-r--r-- | archaeological_context_records/forms.py | 2 | ||||
| -rw-r--r-- | archaeological_context_records/ishtar_menu.py | 2 | ||||
| -rw-r--r-- | archaeological_context_records/models.py | 2 | ||||
| -rw-r--r-- | archaeological_context_records/urls.py | 65 | ||||
| -rw-r--r-- | archaeological_context_records/views.py | 2 | ||||
| -rw-r--r-- | archaeological_context_records/wizards.py | 2 |
6 files changed, 37 insertions, 38 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 11d4cbbb1..4ecb40386 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -29,7 +29,7 @@ from django import forms from django.conf import settings from django.core import validators from django.forms.formsets import formset_factory -from ishtar_common.utils import get_current_profile, ugettext_lazy as _ +from ishtar_common.utils import get_current_profile, gettext_lazy as _ from ishtar_common.models import ( Area, diff --git a/archaeological_context_records/ishtar_menu.py b/archaeological_context_records/ishtar_menu.py index 13fe18db4..820630baf 100644 --- a/archaeological_context_records/ishtar_menu.py +++ b/archaeological_context_records/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_context_records/models.py b/archaeological_context_records/models.py index 21981fc78..29deae5ee 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -30,7 +30,7 @@ from django.db.models import Q from django.db.models.signals import post_delete, post_save, m2m_changed from django.urls import reverse, reverse_lazy -from ishtar_common.utils import ugettext_lazy as _, pgettext_lazy, pgettext +from ishtar_common.utils import gettext_lazy as _, pgettext_lazy, pgettext from django.utils.text import slugify from ishtar_common.utils import ( diff --git a/archaeological_context_records/urls.py b/archaeological_context_records/urls.py index 17c4dc419..bb06e9945 100644 --- a/archaeological_context_records/urls.py +++ b/archaeological_context_records/urls.py @@ -17,8 +17,7 @@ # See the file COPYING for details. -from django.conf.urls import url -from django.urls import path +from django.urls import path, re_path from ishtar_common.utils import check_permissions from ishtar_common.views import QALinkView @@ -29,7 +28,7 @@ from archaeological_context_records import models, views, views_api # forms urlpatterns = [ # Context records - url( + re_path( r"record_search/(?P<step>.+)?$", check_permissions(["archaeological_context_records.view_contextrecord", "archaeological_context_records.view_own_contextrecord"])( @@ -37,7 +36,7 @@ urlpatterns = [ ), name="record_search", ), - url( + re_path( r"contextrecord_search/(?P<step>.+)?$", check_permissions(["archaeological_context_records.view_contextrecord", "archaeological_context_records.view_own_contextrecord"])( @@ -45,14 +44,14 @@ urlpatterns = [ ), name="contextrecord_search", ), - url( + re_path( r"record_creation/(?P<step>.+)?$", check_permissions(["archaeological_context_records.add_contextrecord"])( views.record_creation_wizard ), name="record_creation", ), - url( + re_path( r"record_modification/(?P<step>.+)?$", check_permissions(["archaeological_context_records.change_contextrecord", "archaeological_context_records.change_own_contextrecord"])( @@ -60,8 +59,8 @@ urlpatterns = [ ), name="record_modification", ), - url(r"record_modify/(?P<pk>.+)/$", views.record_modify, name="record_modify"), - url( + re_path(r"record_modify/(?P<pk>.+)/$", views.record_modify, name="record_modify"), + re_path( r"record_deletion/(?P<step>.+)?$", check_permissions(["archaeological_context_records.change_contextrecord", "archaeological_context_records.change_own_contextrecord"])( @@ -69,92 +68,92 @@ urlpatterns = [ ), name="record_deletion", ), - url( + re_path( r"record_delete/(?P<pk>.+)/$", views.record_delete, name="delete-contextrecord" ), - url( + re_path( r"autocomplete-contextrecord/$", views.autocomplete_contextrecord, name="autocomplete-contextrecord", ), - url( + re_path( r"show-contextrecord(?:/(?P<pk>.+))?/(?P<type>.+)?$", views.show_contextrecord, name=models.ContextRecord.SHOW_URL, ), # show-contextrecordrelation is only a view the id point to a context record - url( + re_path( r"show-contextrecord(?:/(?P<pk>.+))?/(?P<type>.+)?$", views.show_contextrecord, name="show-contextrecordrelation", ), - url( + re_path( r"show-historized-contextrecord/(?P<pk>.+)?/(?P<date>.+)?$", views.show_contextrecord, name="show-historized-contextrecord", ), - url( + re_path( r"revert-contextrecord/(?P<pk>.+)/(?P<date>.+)$", views.revert_contextrecord, name="revert-contextrecord", ), - url( + re_path( r"generate-relation-image-contextrecord/(?P<pk>.+)/(" r"?P<type>(below)|(above)|(full))?", views.GenerateRelationImage.as_view(), name="generate-relation-image-contextrecord", ), - url( + re_path( r"get-contextrecord/own/(?P<type>.+)?$", views.get_contextrecord, name="get-own-contextrecord", kwargs={"force_own": True}, ), - url( + re_path( r"get-contextrecord/(?P<type>.+)?$", views.get_contextrecord, name="get-contextrecord", ), - url( + re_path( r"get-contextrecord-for-ope/own/(?P<type>.+)?$", views.get_contextrecord_for_ope, name="get-own-contextrecord-for-ope", kwargs={"force_own": True}, ), - url( + re_path( r"get-contextrecord-for-ope/(?P<type>.+)?$", views.get_contextrecord_for_ope, name="get-contextrecord-for-ope", ), - url( + re_path( r"get-contextrecord-full/own/(?P<type>.+)?$", views.get_contextrecord, name="get-own-contextrecord-full", kwargs={"full": True, "force_own": True}, ), - url( + re_path( r"get-contextrecord-full/(?P<type>.+)?$", views.get_contextrecord, name="get-contextrecord-full", kwargs={"full": True}, ), - url( + re_path( r"get-contextrecord-shortcut/(?P<type>.+)?$", views.get_contextrecord, name="get-contextrecord-shortcut", kwargs={"full": "shortcut"}, ), - url( + re_path( r"get-contextrecordrelation/(?P<type>.+)?$", views.get_contextrecordrelation, name="get-contextrecordrelation", ), - url( + re_path( r"get-contextrecordrelationdetail/(?P<type>.+)?$", views.get_contextrecordrelationdetail, name="get-contextrecordrelationdetail", ), - url( + re_path( r"^context-record-relations-modify/(?P<pk>.+)/$", check_permissions(["archaeological_context_records.change_contextrecord", "archaeological_context_records.change_own_contextrecord"])( @@ -162,26 +161,26 @@ urlpatterns = [ ), name="context-record-relation-modify", ), - url( + re_path( r"^operation-qa-contextrecord/(?P<pks>[0-9]+)/$", check_permissions(["archaeological_context_records.add_contextrecord"])( views.QAOperationContextRecordView.as_view() ), name="operation-qa-contextrecord", ), - url( + re_path( r"^contextrecord-qa-lock/(?P<pks>[0-9-]+)?/$", views.QAContextRecordLockView.as_view(), name="contextrecord-qa-lock", kwargs={"model": models.ContextRecord}, ), - url( + re_path( r"^contextrecord-qa-link/(?P<pks>[0-9-]+)?/$", QALinkView.as_view(), name="contextrecord-qa-link", kwargs={"model": models.ContextRecord, "url": "contextrecord-qa-link"}, ), - url( + re_path( r"^contextrecord-qa-duplicate/(?P<pks>[0-9-]+)?/$", check_permissions(["archaeological_context_records.change_contextrecord", "archaeological_context_records.change_own_contextrecord"])( @@ -189,7 +188,7 @@ urlpatterns = [ ), name="contextrecord-qa-duplicate", ), - url( + re_path( r"^contextrecord-qa-bulk-update/(?P<pks>[0-9-]+)?/$", check_permissions(["archaeological_context_records.change_contextrecord", "archaeological_context_records.change_own_contextrecord"])( @@ -197,7 +196,7 @@ urlpatterns = [ ), name="contextrecord-qa-bulk-update", ), - url( + re_path( r"^contextrecord-qa-bulk-update/(?P<pks>[0-9-]+)?/confirm/$", check_permissions(["archaeological_context_records.change_contextrecord", "archaeological_context_records.change_own_contextrecord"])( @@ -206,11 +205,11 @@ urlpatterns = [ name="contextrecord-qa-bulk-update-confirm", kwargs={"confirm": True}, ), - url( + re_path( r"api/facets/contextrecord/$", views_api.FacetContextRecordAPIView.as_view(), name="api-facets-contextrecord" ), - url( + re_path( r"api/search/context-record/$", views_api.SearchContextRecordAPI.as_view(), name="api-search-contextrecord" ), diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py index 811a9ad2d..d833792b7 100644 --- a/archaeological_context_records/views.py +++ b/archaeological_context_records/views.py @@ -23,7 +23,7 @@ from django.db.models import Q from django.http import HttpResponse, HttpResponseRedirect, Http404 from django.shortcuts import redirect from django.urls import reverse -from ishtar_common.utils import ugettext_lazy as _ +from ishtar_common.utils import gettext_lazy as _ from django.views.generic import RedirectView from ishtar_common.models import QuickAction diff --git a/archaeological_context_records/wizards.py b/archaeological_context_records/wizards.py index 8de29a695..1d7a106ec 100644 --- a/archaeological_context_records/wizards.py +++ b/archaeological_context_records/wizards.py @@ -18,7 +18,7 @@ # See the file COPYING for details. from django.core.exceptions import ObjectDoesNotExist -from ishtar_common.utils import ugettext_lazy as _ +from ishtar_common.utils import gettext_lazy as _ from . import models from ishtar_common.forms import reverse_lazy |