diff options
Diffstat (limited to 'example_project')
| -rw-r--r-- | example_project/__init__.py.base.sample | 2 | ||||
| -rw-r--r-- | example_project/__init__.py.celery.sample | 2 | ||||
| -rw-r--r-- | example_project/urls.py | 13 |
3 files changed, 9 insertions, 8 deletions
diff --git a/example_project/__init__.py.base.sample b/example_project/__init__.py.base.sample index 6631c46d5..7a9846b1b 100644 --- a/example_project/__init__.py.base.sample +++ b/example_project/__init__.py.base.sample @@ -1,5 +1,5 @@ # force the retranslation of generated strings and external module -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ _("username") _("email address") diff --git a/example_project/__init__.py.celery.sample b/example_project/__init__.py.celery.sample index 3cda63729..357afe22a 100644 --- a/example_project/__init__.py.celery.sample +++ b/example_project/__init__.py.celery.sample @@ -1,5 +1,5 @@ # force the retranslation of generated strings and external module -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from .celery_app import app as celery_app diff --git a/example_project/urls.py b/example_project/urls.py index 9615afd5b..528d47259 100644 --- a/example_project/urls.py +++ b/example_project/urls.py @@ -1,5 +1,6 @@ from django.conf import settings -from django.conf.urls import include, url +from django.conf.urls import include +from django.urls import re_path from django.contrib import admin from ishtar_common.apps import admin_site @@ -16,13 +17,13 @@ APP_LIST = ['archaeological_files', 'archaeological_warehouse', 'archaeological_finds'] for app in APP_LIST: urlpatterns += [ - url('', include(app + '.urls')), + re_path('', include(app + '.urls')), ] urlpatterns += [ - url(r'^admin/', include(admin_site.urls[:2])), - url(r'', include('ishtar_common.urls')), - url(r'^$', index, name='start'), + re_path(r'^admin/', include(admin_site.urls[:2])), + re_path(r'', include('ishtar_common.urls')), + re_path(r'^$', index, name='start'), ] if settings.DEBUG: @@ -35,6 +36,6 @@ if settings.DEBUG: if settings.DEBUG_TOOLBAR: import debug_toolbar urlpatterns = [ - url(r'^__debug__/', include(debug_toolbar.urls)), + re_path(r'^__debug__/', include(debug_toolbar.urls)), ] + urlpatterns |