X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/94a4fcc7ab9e1713dc2defc8b35c875fc90f6fa5..c879af9dad38cf87b7c0d4669739ad2cffeff722:/src/catalogue/views.py?ds=sidebyside

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index 817b3ada5..e8808b4de 100644
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.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 collections import OrderedDict
 import random
@@ -14,7 +14,7 @@ from django.urls import reverse
 from django.db.models import Q, QuerySet
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.utils import translation
-from django.utils.translation import gettext as _, gettext_lazy
+from django.utils.translation import gettext_lazy
 from django.views.decorators.cache import never_cache
 from django.views.generic import TemplateView
 
@@ -23,7 +23,6 @@ from club.forms import DonationStep1Form
 from club.models import Club
 from annoy.models import DynamicTextInsert
 from pdcounter import views as pdcounter_views
-from picture.models import Picture, PictureArea
 from wolnelektury.utils import is_ajax
 from catalogue import constants
 from catalogue import forms
@@ -39,7 +38,6 @@ staff_required = user_passes_test(lambda user: user.is_staff)
 def catalogue(request):
     return render(request, 'catalogue/catalogue.html', {
         'books': Book.objects.filter(findable=True, parent=None),
-        'pictures': Picture.objects.all(),
         'collections': Collection.objects.filter(listed=True),
         'active_menu_item': 'all_works',
     })
@@ -51,7 +49,7 @@ def daisy_list(request):
 
 def collection(request, slug):
     coll = get_object_or_404(Collection, slug=slug)
-    template_name = 'catalogue/2022/collection.html'
+    template_name = 'catalogue/collection.html'
     return render(request, template_name, {
         'collection': coll,
         'active_menu_item': 'collections',
@@ -159,16 +157,16 @@ class ObjectListView(TemplateView):
 
 
 class BookList(ObjectListView):
-    title = gettext_lazy('Literature')
+    title = gettext_lazy('Literatura')
     list_type = 'books'
-    template_name = 'catalogue/2022/book_list.html'
-    dynamic_template_name = 'catalogue/2022/dynamic_book_list.html'
-    themed_template_name = 'catalogue/2022/themed_book_list.html'
-    dynamic_themed_template_name = 'catalogue/2022/dynamic_themed_book_list.html'
+    template_name = 'catalogue/book_list.html'
+    dynamic_template_name = 'catalogue/dynamic_book_list.html'
+    themed_template_name = 'catalogue/themed_book_list.html'
+    dynamic_themed_template_name = 'catalogue/dynamic_themed_book_list.html'
 
     orderings = {
-        'pop': ('-popularity__count', 'najpopularniejsze'),
-        'alpha': (None, 'alfabetycznie'),
+        'pop': ('-popularity__count', gettext_lazy('najpopularniejsze')),
+        'alpha': (None, gettext_lazy('alfabetycznie')),
     }
     default_ordering = 'alpha'
 
@@ -195,22 +193,6 @@ class BookList(ObjectListView):
         return qs
 
 
-class ArtList(ObjectListView):
-    template_name = 'catalogue/2022/book_list.html'
-    dynamic_template_name = 'catalogue/2022/dynamic_book_list.html'
-    title = gettext_lazy('Art')
-    list_type = 'gallery'
-
-    def get_queryset(self):
-        return Picture.objects.all()
-
-    def search(self, qs):
-        term = self.request.GET.get('search')
-        if term:
-            qs = qs.filter(Q(title__icontains=term) | Q(tag_relations__tag__name_pl__icontains=term)).distinct()
-        return qs
-    
-
 class LiteratureView(BookList):
     def get_suggested_tags(self, queryset):
         tags = list(get_top_level_related_tags([]))
@@ -221,21 +203,13 @@ class LiteratureView(BookList):
 
 
 class AudiobooksView(LiteratureView):
-    title = gettext_lazy('Audiobooks')
+    title = gettext_lazy('Audiobooki')
     list_type = 'audiobooks'
 
     def get_queryset(self):
         return Book.objects.filter(findable=True, media__type='mp3').distinct()
 
 
-class GalleryView(ArtList):
-    def get_suggested_tags(self, queryset):
-        return Tag.objects.usage_for_queryset(
-            queryset,
-            counts=True
-        ).exclude(pk__in=[t.id for t in self.ctx['tags']]).order_by('-count')
-    
-
 class TaggedObjectList(BookList):
     def analyse(self):
         super().analyse()
@@ -253,6 +227,8 @@ class TaggedObjectList(BookList):
             t for t in self.ctx['tags']
             if t is not self.ctx['main_tag']
         ]
+        if len(self.ctx['tags']) == 1 and self.ctx['main_tag'].category == 'author':
+            self.ctx['translation_list'] = self.ctx['main_tag'].book_set.all()
 
     def get_queryset(self):
         qs = Book.tagged.with_all(self.ctx['work_tags']).filter(findable=True)
@@ -382,9 +358,9 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
     has_theme = any(((theme := x).category == 'theme' for x in tags))
     if has_theme:
         result['main_tag'] = theme
-        template = 'catalogue/2022/theme_detail.html'
+        template = 'catalogue/theme_detail.html'
     else:
-        template = 'catalogue/2022/author_detail.html'
+        template = 'catalogue/author_detail.html'
         
     return render(
         request, template, result,
@@ -501,7 +477,7 @@ def book_fragments(request, slug, theme_slug):
     fragments = Fragment.tagged.with_all([theme]).filter(
         Q(book=book) | Q(book__ancestor=book))
 
-    template_name = 'catalogue/2022/book_fragments.html'
+    template_name = 'catalogue/book_fragments.html'
     return render(
         request,
         template_name,
@@ -522,7 +498,7 @@ def book_detail(request, slug):
 
     return render(
         request,
-        'catalogue/2022/book_detail.html',
+        'catalogue/book_detail.html',
         {
             'book': book,
             'accessible': book.is_accessible_to(request.user),
@@ -546,8 +522,12 @@ def book_text(request, slug):
 
     return render(request, 'catalogue/book_text.html', {
         'book': book,
+        'extra_info': book.get_extra_info_json(),
         'book_text': book_text,
-        'inserts': DynamicTextInsert.get_all(request)
+        'inserts': DynamicTextInsert.get_all(request),
+
+        'club': Club.objects.first(),
+        'donation_form': DonationStep1Form(),
     })
 
 
@@ -570,13 +550,13 @@ def import_book(request):
             exception = pprint.pformat(info[1])
             tb = '\n'.join(traceback.format_tb(info[2]))
             return HttpResponse(
-                _("An error occurred: %(exception)s\n\n%(tb)s") % {
+                "Błąd: %(exception)s\n\n%(tb)s" % {
                     'exception': exception, 'tb': tb
                 },
                 content_type='text/plain'
             )
-        return HttpResponse(_("Book imported successfully"))
-    return HttpResponse(_("Error importing file: %r") % book_import_form.errors)
+        return HttpResponse("Książka zaimportowana")
+    return HttpResponse("Błąd podczas importowania pliku: %r" % book_import_form.errors)
 
 
 # info views for API
@@ -619,8 +599,8 @@ def download_zip(request, file_format=None, media_format=None, slug=None):
 
 class CustomPDFFormView(AjaxableFormView):
     form_class = forms.CustomPDFForm
-    title = gettext_lazy('Download custom PDF')
-    submit = gettext_lazy('Download')
+    title = gettext_lazy('Stwórz własny PDF')
+    submit = gettext_lazy('Pobierz')
     template = 'catalogue/custom_pdf_form.html'
     honeypot = True
 
@@ -661,7 +641,7 @@ def tag_catalogue(request, category):
     else:
         best = described_tags
 
-    template_name = 'catalogue/2022/tag_catalogue.html'
+    template_name = 'catalogue/tag_catalogue.html'
     return render(request, template_name, {
         'tags': tags,
         'best': best,
@@ -679,7 +659,7 @@ def collections(request):
     else:
         best = objects
 
-    template_name = 'catalogue/2022/collections.html'
+    template_name = 'catalogue/collections.html'
     return render(request, template_name, {
         'objects': objects,
         'best': best,