X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/5ac6f14db010bbfbcf39190d0b639a47ab1c89d3..e24e657ebf536f55c1bde66bd41563fae30a98b0:/src/catalogue/templatetags/catalogue_tags.py
diff --git a/src/catalogue/templatetags/catalogue_tags.py b/src/catalogue/templatetags/catalogue_tags.py
index b582f89c3..14f310d77 100644
--- a/src/catalogue/templatetags/catalogue_tags.py
+++ b/src/catalogue/templatetags/catalogue_tags.py
@@ -11,7 +11,7 @@ from django.template import Node, Variable, Template, Context
from django.urls 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 django.utils.translation import gettext as _
from catalogue.helpers import get_audiobook_tags
from catalogue.models import Book, BookMedia, Fragment, Tag, Source
@@ -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))
@@ -65,66 +65,78 @@ def book_title_html(book):
@register.simple_tag
def title_from_tags(tags):
+ # TODO: Remove this after adding flection mechanism
+ return simple_title(tags)
+
+
+@register.simple_tag
+def nice_title_from_tags(tags, related_tags):
def split_tags(tags):
result = {}
for tag in tags:
- result[tag.category] = tag
+ result.setdefault(tag.category, []).append(tag)
return result
- # TODO: Remove this after adding flection mechanism
- return simple_title(tags)
-
- class Flection(object):
- def get_case(self, name, flection):
- return name
- flection = Flection()
-
self = split_tags(tags)
- title = ''
-
- # Specjalny przypadek oglÄ
dania wszystkich lektur na danej póÅce
- if len(self) == 1 and 'set' in self:
- return 'PóÅka %s' % self['set']
-
- # Specjalny przypadek "TwórczoÅÄ w pozytywizmie", wtedy gdy tylko epoka
- # jest wybrana przez użytkownika
- if 'epoch' in self and len(self) == 1:
- text = 'TwórczoÅÄ w %s' % flection.get_case(str(self['epoch']), '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 = '%s w twórczoÅci %s' % (
- str(self['kind']), flection.get_case(str(self['author']), 'dopeÅniacz'))
- return capfirst(text)
-
- # Przypadki ogólniejsze
- if 'theme' in self:
- title += 'Motyw %s' % str(self['theme'])
+ pieces = []
+ plural = True
+ epoch_reduntant = False
if 'genre' in self:
- if 'theme' in self:
- title += ' w %s' % flection.get_case(str(self['genre']), 'miejscownik')
+ pieces.append([
+ t.plural or t.name for t in self['genre']
+ ])
+ epoch_reduntant = self['genre'][-1].genre_epoch_specific
+ else:
+ # If we don't have genre,
+ # look if maybe we only have one genre in this context?
+ if 'genre' in related_tags and len(related_tags['genre']) == 1:
+ pieces.append([
+ t.plural or t.name for t in related_tags['genre']
+ ])
+ epoch_reduntant = related_tags['genre'][-1].genre_epoch_specific
+ elif 'kind' in self:
+ # Only use kind if not talking about genre.
+ pieces.append([
+ t.collective_noun or t.name for t in self['kind']
+ ])
+ plural = False
+ elif 'kind' in related_tags and len(related_tags['kind']) == 1:
+ # No info on genre, but there's only one kind related.
+ subpieces = []
+ pieces.append([
+ t.collective_noun or t.name for t in related_tags['kind']
+ ])
+ plural = False
else:
- title += str(self['genre'])
+ # We can't say anything about genre or kind.
+ pieces.append(['TwórczoÅÄ'])
+ plural = False
- 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 += ' w %s ' % flection.get_case(str(self['kind']), 'miejscownik')
- else:
- title += ' w twórczoÅci '
+ if not epoch_reduntant and 'epoch' in self:
+ if plural:
+ form = lambda t: t.adjective_nonmasculine_plural or t.name
else:
- title += '%s ' % str(self.get('kind', 'twórczoÅÄ'))
+ form = lambda t: t.adjective_feminine_singular or t.name
+ pieces.append([
+ form(t) for t in self['epoch']
+ ])
if 'author' in self:
- title += flection.get_case(str(self['author']), 'dopeÅniacz')
- elif 'epoch' in self:
- title += flection.get_case(str(self['epoch']), 'dopeÅniacz')
+ pieces.append([
+ t.genitive or t.name for t in self['author']
+ ])
+
+ p = []
+ for sublist in pieces:
+ for item in sublist[:-2]:
+ p.append(item + ',')
+ for item in sublist[-2:-1]:
+ p.append(item + ' i')
+ p.append(sublist[-1])
- return capfirst(title)
+ return ' '.join(p)
@register.simple_tag
@@ -139,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("