X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/d2199704c75d29ba98e0f92d27cb63743183e906..7fdf8249c9c016e397edc3112184e74b0f3f9778:/apps/catalogue/templatetags/catalogue_tags.py?ds=inline
diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index 2020d9097..6ff60a3fb 100644
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -14,7 +14,7 @@ from django.core.urlresolvers import reverse
from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
from django.utils.translation import ugettext as _
-from catalogue.utils import split_tags, related_tag_name as _related_tag_name
+from catalogue.utils import related_tag_name as _related_tag_name
from catalogue.models import Book, BookMedia, Fragment, Tag
from catalogue.constants import LICENSES
@@ -55,7 +55,7 @@ def html_title_from_tags(tags):
template = Template("{{ category }}: {{ tag.name }}")
return capfirst(",
".join(
template.render(Context({'tag': tag, 'category': _(tag.category)})) for tag in tags))
-
+
def simple_title(tags):
title = []
@@ -186,12 +186,12 @@ def book_tree_csv(author, book_list, books_by_parent, depth=1, max_depth=3, deli
return '"%s"' % s
except ValueError:
return s
-
+
return "".join("""%(author)s%(d)s%(preindent)s%(title)s%(d)s%(postindent)s%(audiences)s%(d)s%(audiobook)s
%(children)s""" % {
"d": delimeter,
"preindent": delimeter * (depth - 1),
- "postindent": delimeter * (max_depth - depth),
+ "postindent": delimeter * (max_depth - depth),
"depth": depth,
"author": quote_if_necessary(author.name),
"title": quote_if_necessary(book.title),
@@ -284,8 +284,8 @@ def latest_blog_posts(feed_url, posts_to_show=5):
feed = feedparser.parse(str(feed_url))
posts = []
for i in range(posts_to_show):
- pub_date = feed['entries'][i].updated_parsed
- published = datetime.date(pub_date[0], pub_date[1], pub_date[2] )
+ pub_date = feed['entries'][i].published_parsed
+ published = datetime.date(pub_date[0], pub_date[1], pub_date[2])
posts.append({
'title': feed['entries'][i].title,
'summary': feed['entries'][i].summary,
@@ -335,6 +335,7 @@ def book_wide(context, book):
'hide_about': hide_about,
'themes': book_themes,
'request': context.get('request'),
+ 'show_lang': book.language_code() != settings.LANGUAGE_CODE,
}
@@ -345,16 +346,19 @@ def book_short(context, book):
'main_link': book.get_absolute_url(),
'related': book.related_info(),
'request': context.get('request'),
+ 'show_lang': book.language_code() != settings.LANGUAGE_CODE,
}
@register.inclusion_tag('catalogue/book_mini_box.html')
-def book_mini(book):
+def book_mini(book, with_link=True):
author_str = ", ".join(related_tag_name(tag)
for tag in book.related_info()['tags'].get('author', ()))
return {
'book': book,
'author_str': author_str,
+ 'with_link': with_link,
+ 'show_lang': book.language_code() != settings.LANGUAGE_CODE,
}
@@ -362,7 +366,7 @@ def book_mini(book):
def work_list(context, object_list):
request = context.get('request')
for obj in object_list:
- obj.object_type = type(object_list[0]).__name__
+ obj.object_type = type(obj).__name__
return locals()
@@ -384,17 +388,14 @@ def fragment_promo(arg=None):
@register.inclusion_tag('catalogue/related_books.html')
-def related_books(book, limit=6, random=1):
+def related_books(book, limit=6, random=1, taken=0):
+ limit = limit - taken
cache_key = "catalogue.related_books.%d.%d" % (book.id, limit - random)
related = cache.get(cache_key)
if related is None:
- related = list(Book.objects.filter(
- common_slug=book.common_slug).exclude(pk=book.pk)[:limit])
- limit -= len(related)
- if limit > random:
- related += Book.tagged.related_to(book,
- Book.objects.exclude(common_slug=book.common_slug),
- ignore_by_tag=book.book_tag())[:limit-random]
+ related = Book.tagged.related_to(book,
+ Book.objects.exclude(common_slug=book.common_slug),
+ ignore_by_tag=book.book_tag())[:limit-random]
cache.set(cache_key, related, 1800)
if random:
random_books = Book.objects.exclude(
@@ -417,7 +418,7 @@ def catalogue_menu():
('genre', _('Genres'), 'gatunki'),
('kind', _('Kinds'), 'rodzaje'),
('epoch', _('Epochs'), 'epoki'),
- ('theme', _('Themes'), 'autorzy'),
+ ('theme', _('Themes'), 'motywy'),
]}