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

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

diff --git a/src/libraries/urls.py b/src/libraries/urls.py
index 754b17e..9753b77 100644 (file)
--- a/src/libraries/urls.py
+++ b/src/libraries/urls.py
@@ -1,12 +1,12 @@
-# -*- 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.
 #
 # 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 patterns, url
+from django.urls import path
+from . import views

 
 
 
 

-urlpatterns = patterns('libraries.views',
-    url(r'^$', 'main_view', name='libraries_main_view'),
-    url(r'^(?P<slug>[a-zA-Z0-9_-]+)$', 'catalog_view', name='libraries_catalog_view'),
-    url(r'^(?P<catalog_slug>[a-zA-Z0-9_-]+)/(?P<slug>[a-zA-Z0-9_-]+)$', 'library_view', name='libraries_library_view'),
-)
+urlpatterns = [
+    path('', views.main_view, name='libraries_main_view'),
+    path('<slug:slug>', views.catalog_view, name='libraries_catalog_view'),
+    path('<slug:catalog_slug>/<slug:slug>', views.library_view, name='libraries_library_view'),
+]