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

[wolnelektury.git] / src / pdcounter / views.py

diff --git a/src/pdcounter/views.py b/src/pdcounter/views.py
index b8a685e..c782c0b 100644 (file)
--- a/src/pdcounter/views.py
+++ b/src/pdcounter/views.py
@@ -1,10 +1,8 @@
-# -*- 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 datetime import datetime
-from django.template import RequestContext
-from django.shortcuts import render_to_response, get_object_or_404
+from django.shortcuts import render, get_object_or_404
 from django.views.decorators import cache
 from suggest.forms import PublishingSuggestForm
 from . import models
@@ -18,13 +16,18 @@ def book_stub_detail(request, slug):
     else:
         pd_counter = None
 
-    form = PublishingSuggestForm(initial={"books": u"%s — %s, \n" % (book.author, book.title)})
+    form = PublishingSuggestForm(initial={"books": "%s — %s, \n" % (book.author, book.title)})
 
-    return render_to_response('pdcounter/book_stub_detail.html', {
+    if request.EXPERIMENTS['layout'].value:
+        template_name = 'pdcounter/2022/book_detail.html'
+    else:
+        template_name = 'pdcounter/book_detail.html'
+
+    return render(request, template_name, {
         'book': book,
         'pd_counter': pd_counter,
         'form': form,
-    }, context_instance=RequestContext(request))
+    })
 
 
 @cache.never_cache
@@ -37,8 +40,13 @@ def author_detail(request, slug):
 
     form = PublishingSuggestForm(initial={"books": author.name + ", \n"})
 
-    return render_to_response('pdcounter/author_detail.html', {
+    if request.EXPERIMENTS['layout'].value:
+        template_name = 'pdcounter/2022/author_detail.html'
+    else:
+        template_name = 'pdcounter/author_detail.html'
+
+    return render(request, template_name, {
         'author': author,
         'pd_counter': pd_counter,
         'form': form,
-    }, context_instance=RequestContext(request))
+    })