diff --git a/program/admin.py b/program/admin.py index 01d4c4934cf27daf35225f9ad8d0f696c5ed669d..0e265009fdbfb793edc81569dd144372aab40765 100644 --- a/program/admin.py +++ b/program/admin.py @@ -20,7 +20,7 @@ from django.contrib import admin from django.utils import timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from .models import Language, Type, MusicFocus, Category, Topic, FundingCategory, Host diff --git a/program/models.py b/program/models.py index a404bb8d4b02838e54313201be62b3bb1233d0f8..d6c730960c2ffa0d2fd8c1fb64125f4f664a40e4 100644 --- a/program/models.py +++ b/program/models.py @@ -31,7 +31,7 @@ from django.db.models import Q from django.forms.models import model_to_dict from django.urls import reverse from django.utils import timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from versatileimagefield.fields import VersatileImageField, PPOIField from steering.settings import THUMBNAIL_SIZES, AUTO_SET_UNTIL_DATE_TO_END_OF_YEAR, AUTO_SET_UNTIL_DATE_TO_DAYS_IN_FUTURE diff --git a/program/urls.py b/program/urls.py index ab21bb1adfc31fc07e830c88f7afea12d0f6216e..26118e22c49c89f15c12f23af43fccd8eadd3351 100644 --- a/program/urls.py +++ b/program/urls.py @@ -21,12 +21,12 @@ import os from django.conf import settings -from django.conf.urls import url +from django.urls import path from django.views.static import serve PROGRAM_SITE_MEDIA = os.path.join(os.path.dirname(__file__), '../site_media') if settings.DEBUG: - urlpatterns = [url(r'^static/(?P<path>.*)$', serve, {'document_root': PROGRAM_SITE_MEDIA})] + urlpatterns = [path('static/<path>', serve, {'document_root': PROGRAM_SITE_MEDIA})] else: urlpatterns = [] diff --git a/program/views.py b/program/views.py index 194fdd5949968e6c16370ed0a378411648561755..3fde8e1c33a54b63d01a211c1ab455ca4ab9e2c9 100644 --- a/program/views.py +++ b/program/views.py @@ -27,7 +27,7 @@ from django.db.models import Q from django.http import HttpResponse from django.shortcuts import get_object_or_404 from django.utils import timezone -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from rest_framework import permissions, status, viewsets from rest_framework.pagination import LimitOffsetPagination from rest_framework.response import Response