django_lostplaces/django_lostplaces/urls.py

@@ -21,7 +21,8 @@ from django.contrib import admin
 from django.conf import settings
 from django.views.static import serve
 from django.conf.urls.static import static
-from django.urls import path, include, re_path
+from django.conf.urls import url
+from django.urls import path, include
 from django.views.generic.base import TemplateView
 
 from lostplaces.views import SignUpView
@@ -31,6 +32,6 @@ urlpatterns = [
     path('signup/', SignUpView.as_view(), name='signup'),
     path('explorer/', include('django.contrib.auth.urls')),
     path('', include('lostplaces.urls')),
-    re_path(r'^static/(?P<path>.*)$', serve,{'document_root': settings.STATIC_ROOT}),
-    re_path(r'^uploads/(?P<path>.*)$', serve,{'document_root': settings.MEDIA_ROOT})
+    url(r'^static/(?P<path>.*)$', serve,{'document_root': settings.STATIC_ROOT}),
+    url(r'^uploads/(?P<path>.*)$', serve,{'document_root': settings.MEDIA_ROOT})
 ]

django_lostplaces/lostplaces/forms.py

@@ -7,7 +7,7 @@ from django import forms
 from django.db import models
 from django.contrib.auth.forms import UserCreationForm, UserChangeForm
 from django.contrib.auth.models import User
-from django.utils.translation import gettext as _
+from django.utils.translation import ugettext_lazy as _
 
 from lostplaces import widgets
 from lostplaces.models import Place, PlaceImage, Voucher, Explorer

django_lostplaces/lostplaces/models/abstract_models.py

@@ -1,7 +1,7 @@
 
 from django.utils import timezone
 from django.db import models
-from django.utils.translation import gettext as _
+from django.utils.translation import ugettext_lazy as _
 from django.core.validators import MaxValueValidator, MinValueValidator
 
 from taggit.managers import TaggableManager

django_lostplaces/lostplaces/models/external_links.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import gettext as _
+from django.utils.translation import ugettext_lazy as _
 
 from lostplaces.models.place import PlaceAsset
 

django_lostplaces/lostplaces/models/models.py

@@ -13,7 +13,7 @@ from django.db import models
 from django.contrib.auth.models import User
 from django.db.models.signals import post_save, pre_save
 from django.dispatch import receiver
-from django.utils.translation import gettext as _
+from django.utils.translation import ugettext_lazy as _
 
 from lostplaces.models.abstract_models import Expireable
 from lostplaces.models.place import Place

django_lostplaces/lostplaces/models/place.py

@@ -5,7 +5,7 @@ from django.db import models
 from django.urls import reverse
 from django.dispatch import receiver
 from django.db.models.signals import post_delete, pre_save
-from django.utils.translation import gettext as _
+from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
 
 from lostplaces.models.abstract_models import Submittable, Taggable, Mapable, Expireable

django_lostplaces/lostplaces/tests/views/test_place_views.py

@@ -9,7 +9,7 @@ from django.urls import reverse
 from django.contrib.auth.models import User
 from django.utils import timezone
 from django.conf import settings
-from django.utils.translation import gettext as _
+from django.utils.translation import ugettext_lazy as _
 
 
 from lostplaces.models import Place

django_lostplaces/lostplaces/views/base_views.py

@@ -12,7 +12,7 @@ from django.contrib.messages.views import SuccessMessageMixin
 
 from django.shortcuts import redirect, get_object_or_404
 from django.urls import reverse_lazy, reverse
-from django.utils.translation import gettext as _
+from django.utils.translation import ugettext_lazy as _
 
 from lostplaces.models import Place
 from lostplaces.common import redirect_referer_or

django_lostplaces/lostplaces/views/explorer_views.py

@@ -3,7 +3,7 @@
 
 from django.views import View
 
-from django.utils.translation import gettext as _
+from django.utils.translation import ugettext_lazy as _
 
 from django.shortcuts import render, redirect, get_object_or_404
 from django.urls import reverse_lazy

django_lostplaces/lostplaces/views/place_image_views.py

@@ -1,6 +1,6 @@
 from django.views import View
 from django.shortcuts import get_object_or_404, redirect
-from django.utils.translation import gettext as _
+from django.utils.translation import ugettext_lazy as _
 
 from lostplaces.views.base_views import PlaceAssetCreateView, PlaceAssetDeleteView
 from lostplaces.models import PlaceImage, Place

django_lostplaces/lostplaces/views/place_views.py

@@ -10,7 +10,7 @@ from django.views.generic.detail import SingleObjectMixin
 
 from django.contrib import messages
 from django.contrib.messages.views import SuccessMessageMixin
-from django.utils.translation import gettext as _
+from django.utils.translation import ugettext_lazy as _
 from django.utils import timezone
 
 from django.shortcuts import render, redirect, get_object_or_404

django_lostplaces/lostplaces/views/views.py

@@ -9,7 +9,7 @@ from django.contrib import messages
 from django.urls import reverse_lazy, reverse
 from django.shortcuts import render, redirect, get_object_or_404
 from django.http import HttpResponseForbidden
-from django.utils.translation import gettext as _
+from django.utils.translation import ugettext_lazy as _
 
 from lostplaces.forms import SignupVoucherForm, TagSubmitForm
 from lostplaces.models import Place, PhotoAlbum