Add grammar to tags. Also: respect custom tag slugs on publishing.

[wolnelektury.git] / src / lesmianator / urls.py

diff --git a/src/lesmianator/urls.py b/src/lesmianator/urls.py
index 37e363f..dbee5f8 100644 (file)
--- a/src/lesmianator/urls.py
+++ b/src/lesmianator/urls.py
@@ -1,14 +1,14 @@
-# -*- coding: utf-8 -*-
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
-from django.conf.urls import url, patterns
+from django.urls import path
+from . import views
 
-urlpatterns = patterns(
-    'lesmianator.views',
-    url(r'^$', 'main_page', name='lesmianator'),
-    url(r'^wiersz/$', 'new_poem', name='new_poem'),
-    url(r'^lektura/(?P<slug>[a-z0-9-]+)/$', 'poem_from_book', name='poem_from_book'),
-    url(r'^polka/(?P<shelf>[a-zA-Z0-9-]+)/$', 'poem_from_set', name='poem_from_set'),
-    url(r'^wiersz/(?P<poem>[a-zA-Z0-9-]+)/$', 'get_poem', name='get_poem'),
-)
+
+urlpatterns = [
+    path('', views.main_page, name='lesmianator'),
+    path('wiersz/', views.new_poem, name='new_poem'),
+    path('lektura/<slug:slug>/', views.poem_from_book, name='poem_from_book'),
+    path('polka/<shelf>/', views.poem_from_set, name='poem_from_set'),
+    path('wiersz/<poem>/', views.get_poem, name='get_poem'),
+]