X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/6bbfe08e5d5ea8c966355d3545505dcd76353426..80d3980873a2c07121f466c187de92be1cea8415:/apps/catalogue/templatetags/catalogue_tags.py

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index c1d318afd..c931e4880 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,44 +47,15 @@ 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):
-    try:
-        names = list(book.tags.filter(category='author'))
-    except AttributeError:
-        return book_stub_title(book)
-
-    books = []
-    while book:
-        books.append(book)
-        book = book.parent
-    names.extend(reversed(books))
-
-    if html_links:
-        names = ['<a href="%s">%s</a>' % (tag.get_absolute_url(), tag.name) for tag in names]
-    else:
-        names = [tag.name for tag in names]
-
-    return ', '.join(names)
+    return book.pretty_title(html_links)
 
 
 @register.simple_tag
@@ -167,6 +139,23 @@ def book_tree(book_list, books_by_parent):
         return ''
 
 
+@register.simple_tag
+def all_editors(extra_info):
+    editors = []
+    if 'editors' in extra_info:
+        editors += extra_info['editors']
+    if 'technical_editors' in extra_info:
+        editors += extra_info['technical_editors']
+    # support for extra_info-s from librarian<1.2
+    if 'editor' in extra_info:
+        editors.append(extra_info['editor'])
+    if 'technical_editor' in extra_info:
+        editors.append(extra_info['technical_editor'])
+    return ', '.join(
+                     ' '.join(p.strip() for p in person.rsplit(',', 1)[::-1])
+                     for person in sorted(set(editors)))
+
+
 @register.simple_tag
 def user_creation_form():
     return RegistrationForm(prefix='registration').as_ul()
@@ -271,7 +260,7 @@ def tag_list(tags, choices=None):
 
 
 @register.inclusion_tag('catalogue/folded_tag_list.html')
-def folded_tag_list(tags, choices=None):
+def folded_tag_list(tags, title='', choices=None):
     tags = [tag for tag in tags if tag.count]
     if choices is None:
         choices = []
@@ -286,3 +275,7 @@ def folded_tag_list(tags, choices=None):
             some_tags_hidden = True
     return locals()
 
+
+@register.inclusion_tag('catalogue/book_info.html')
+def book_info(book):
+    return locals()