X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f1ec080b394326e35074c57e682789176cd3f244..e09a81b73f95737858d03d0506b91395ffe462e5:/apps/catalogue/templatetags/catalogue_tags.py

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index 25376f8c3..6ad83a045 100644
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -12,6 +12,7 @@ from django.core.urlresolvers import reverse
 from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
 from django.db.models import Q
 from django.conf import settings
+from django.utils.translation import ugettext as _
 
 
 register = template.Library()
@@ -46,24 +47,22 @@ def capfirst(text):
 
 
 def simple_title(tags):
-    mapping = {
-        'author': u'Autor',
-        'theme': u'motyw',
-        'epoch': u'epoka',
-        'genre': u'gatunek',
-        'kind': u'rodzaj',
-        'set': u'półka',
-    }
-
     title = []
     for tag in tags:
-        title.append("%s: %s" % (mapping[tag.category], tag.name))
+        title.append("%s: %s" % (_(tag.category), tag.name))
     return capfirst(', '.join(title))
 
 
+def book_stub_title(book):
+    return ', '.join((book.author, book.title))
+
+
 @register.simple_tag
 def book_title(book, html_links=False):
-    names = list(book.tags.filter(category='author'))
+    try:
+        names = list(book.tags.filter(category='author'))
+    except AttributeError:
+        return book_stub_title(book)
 
     books = []
     while book:
@@ -148,6 +147,18 @@ def title_from_tags(tags):
     return capfirst(title)
 
 
+@register.simple_tag
+def book_tree(book_list, books_by_parent):
+    text = "".join("<li><a href='%s'>%s</a>%s</li>" % (
+        book.get_absolute_url(), book.title, book_tree(books_by_parent.get(book, ()), books_by_parent)
+        ) for book in book_list)
+
+    if text:
+        return "<ol>%s</ol>" % text
+    else:
+        return ''
+
+
 @register.simple_tag
 def user_creation_form():
     return RegistrationForm(prefix='registration').as_ul()