diff --git a/frapp/urls.py b/frapp/urls.py index 96c24ba63ce35562d6ab8bd74540006f08929f54..2ebd92e7e5d8633be4be4ca145b2023ae1c61ac9 100644 --- a/frapp/urls.py +++ b/frapp/urls.py @@ -17,10 +17,10 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from django.conf.urls import url +from django.urls import path from .views import json_frapp urlpatterns = [ - url(r'^frapp/$', json_frapp), + path('frapp/', json_frapp), ] diff --git a/frapp/views.py b/frapp/views.py index 178dc494b15b423f579f65a1146969eef134b7f4..bc45cbf467c2e2ba546de404c9346e82123f6675 100644 --- a/frapp/views.py +++ b/frapp/views.py @@ -24,7 +24,7 @@ from django.contrib.sites.shortcuts import get_current_site from django.core.exceptions import ObjectDoesNotExist from django.db.models import Q from django.http import HttpResponse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from program.models import Note, Category, TimeSlot, Schedule