X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/967eed676fc83d15b26149047f353ac61faa8217..ace92112e99e3f48466e4d230087c3ab40187450:/src/catalogue/templatetags/catalogue_tags.py diff --git a/src/catalogue/templatetags/catalogue_tags.py b/src/catalogue/templatetags/catalogue_tags.py index 70676dd1a..2670e58db 100644 --- a/src/catalogue/templatetags/catalogue_tags.py +++ b/src/catalogue/templatetags/catalogue_tags.py @@ -1,4 +1,3 @@ -# -*- 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. # @@ -19,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() @@ -45,8 +44,8 @@ def html_title_from_tags(tags): if len(tags) < 2: return title_from_tags(tags) template = Template("{{ category }}: {{ tag.name }}") - return capfirst(",
".join( - template.render(Context({'tag': tag, 'category': _(tag.category)})) for tag in tags)) + return mark_safe(capfirst(",
".join( + template.render(Context({'tag': tag, 'category': _(tag.category)})) for tag in tags))) def simple_title(tags): @@ -499,7 +498,7 @@ def strip_tag(html, tag_name): def status(book, user): if not book.preview: return 'open' - elif user_is_subscribed(user): + elif Membership.is_active_for(user): return 'preview' else: return 'closed'