X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/d5e836566b0bbff5242de33acc264ca94ad11f49..3fceb197b7f492cf5cfcb4034b6e045638f128d4:/src/catalogue/templatetags/catalogue_tags.py diff --git a/src/catalogue/templatetags/catalogue_tags.py b/src/catalogue/templatetags/catalogue_tags.py index 5efdb05e6..ef0ea5dcc 100644 --- a/src/catalogue/templatetags/catalogue_tags.py +++ b/src/catalogue/templatetags/catalogue_tags.py @@ -1,9 +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 random import randint, random -from urlparse import urlparse +from urllib.parse import urlparse from django.contrib.contenttypes.models import ContentType from django.conf import settings @@ -11,6 +10,7 @@ from django import template from django.template import Node, Variable, Template, Context from django.core.urlresolvers import reverse from django.utils.cache import add_never_cache_headers +from django.utils.safestring import mark_safe from django.utils.translation import ugettext as _ from ssify import ssi_variable @@ -18,7 +18,7 @@ from ssify import ssi_variable from catalogue.helpers import get_audiobook_tags from catalogue.models import Book, BookMedia, Fragment, Tag, Source from catalogue.constants import LICENSES -from paypal.rest import user_is_subscribed +from club.models import Membership from picture.models import Picture register = template.Library() @@ -57,7 +57,7 @@ def simple_title(tags): @register.simple_tag def book_title(book, html_links=False): - return book.pretty_title(html_links) + return mark_safe(book.pretty_title(html_links)) @register.simple_tag @@ -92,39 +92,39 @@ def title_from_tags(tags): # Specjalny przypadek "TwórczoÅÄ w pozytywizmie", wtedy gdy tylko epoka # jest wybrana przez użytkownika if 'epoch' in self and len(self) == 1: - text = u'TwórczoÅÄ w %s' % flection.get_case(unicode(self['epoch']), u'miejscownik') + text = u'TwórczoÅÄ w %s' % flection.get_case(str(self['epoch']), u'miejscownik') return capfirst(text) # Specjalny przypadek "Dramat w twórczoÅci Sofoklesa", wtedy gdy podane # sÄ tylko rodzaj literacki i autor if 'kind' in self and 'author' in self and len(self) == 2: text = u'%s w twórczoÅci %s' % ( - unicode(self['kind']), flection.get_case(unicode(self['author']), u'dopeÅniacz')) + str(self['kind']), flection.get_case(str(self['author']), u'dopeÅniacz')) return capfirst(text) # Przypadki ogólniejsze if 'theme' in self: - title += u'Motyw %s' % unicode(self['theme']) + title += u'Motyw %s' % str(self['theme']) if 'genre' in self: if 'theme' in self: - title += u' w %s' % flection.get_case(unicode(self['genre']), u'miejscownik') + title += u' w %s' % flection.get_case(str(self['genre']), u'miejscownik') else: - title += unicode(self['genre']) + title += str(self['genre']) if 'kind' in self or 'author' in self or 'epoch' in self: if 'genre' in self or 'theme' in self: if 'kind' in self: - title += u' w %s ' % flection.get_case(unicode(self['kind']), u'miejscownik') + title += u' w %s ' % flection.get_case(str(self['kind']), u'miejscownik') else: title += u' w twórczoÅci ' else: - title += u'%s ' % unicode(self.get('kind', u'twórczoÅÄ')) + title += u'%s ' % str(self.get('kind', u'twórczoÅÄ')) if 'author' in self: - title += flection.get_case(unicode(self['author']), u'dopeÅniacz') + title += flection.get_case(str(self['author']), u'dopeÅniacz') elif 'epoch' in self: - title += flection.get_case(unicode(self['epoch']), u'dopeÅniacz') + title += flection.get_case(str(self['epoch']), u'dopeÅniacz') return capfirst(title) @@ -136,7 +136,7 @@ def book_tree(book_list, books_by_parent): ) for book in book_list) if text: - return "