X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/94a4fcc7ab9e1713dc2defc8b35c875fc90f6fa5..HEAD:/src/catalogue/templatetags/catalogue_tags.py diff --git a/src/catalogue/templatetags/catalogue_tags.py b/src/catalogue/templatetags/catalogue_tags.py index dd0d4026f..c9e776c8f 100644 --- a/src/catalogue/templatetags/catalogue_tags.py +++ b/src/catalogue/templatetags/catalogue_tags.py @@ -1,5 +1,5 @@ -# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # from random import randint, random from urllib.parse import urlparse @@ -43,13 +43,13 @@ def html_title_from_tags(tags): return title_from_tags(tags) template = Template("{{ category }}: {{ tag.name }}") return mark_safe(capfirst(",
".join( - template.render(Context({'tag': tag, 'category': _(tag.category)})) for tag in tags))) + template.render(Context({'tag': tag, 'category': tag.get_category_display()})) for tag in tags))) def simple_title(tags): title = [] for tag in tags: - title.append("%s: %s" % (_(tag.category), tag.name)) + title.append("%s: %s" % (tag.get_category_display(), tag.name)) return capfirst(', '.join(title)) @@ -151,19 +151,6 @@ def book_tree(book_list, books_by_parent): return '' -@register.simple_tag -def audiobook_tree(book_list, books_by_parent): - text = "".join("
  • %s%s
  • " % ( - reverse("book_player", args=[book.slug]), book.title, - audiobook_tree(books_by_parent.get(book, ()), books_by_parent) - ) for book in book_list) - - if text: - return mark_safe("
      %s
    " % text) - else: - return '' - - @register.simple_tag def book_tree_texml(book_list, books_by_parent, depth=1): return mark_safe("".join(""" @@ -322,16 +309,6 @@ def tag_list(tags, choices=None, category=None, list_type='books'): } -@register.inclusion_tag('catalogue/inline_tag_list.html') -def inline_tag_list(tags, choices=None, category=None, list_type='books'): - return tag_list(tags, choices, category, list_type) - - -@register.inclusion_tag('catalogue/collection_list.html') -def collection_list(collections): - return {'collections': collections} - - @register.inclusion_tag('catalogue/book_info.html') def book_info(book): return { @@ -535,7 +512,7 @@ def status(book, user): @register.inclusion_tag('catalogue/snippets/content_warning.html') def content_warning(book): warnings_def = { - 'wulgaryzmy': _('vulgar language'), + 'wulgaryzmy': _('wulgaryzmy'), } warnings = book.get_extra_info_json().get('content_warnings', []) warnings = sorted(