MP3 in OPDS

[wolnelektury.git] / src / picture / views.py

diff --git a/src/picture/views.py b/src/picture/views.py
index 6bf513d..72d1e37 100644 (file)
--- a/src/picture/views.py
+++ b/src/picture/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 Counter
 from django.conf import settings
 #
 from collections import Counter
 from django.conf import settings


@@ -16,27 +16,24 @@ from catalogue.helpers import get_top_level_related_tags
 def picture_list_thumb(request):
     pictures = Picture.objects.all()
         
 def picture_list_thumb(request):
     pictures = Picture.objects.all()
         

-    if request.EXPERIMENTS['layout'].value:
-        related_tags = Tag.objects.usage_for_model(Picture, counts=True)
-        related_tags = sorted(related_tags, key=lambda t: -t.count)
-        suggestion_categories = Counter()
-        suggestions = []
-        for t in related_tags:
-            if suggestion_categories[t.category] < 3:
-                suggestion_categories[t.category] += 1
-                suggestions.append(t)
-                if sum(suggestion_categories.values()) == 10:
-                    break
-        template_name = 'catalogue/2022/author_detail.html'
-        return render(request, template_name, {
-            'object_list': pictures,
-            'title': 'Galeria',
-            'tags': [],
-            'suggest': suggestions,
-            'list_type': 'gallery',
-        })
-    else:
-        return render(request, template_name, {'picture_list': list(pictures)})
+    related_tags = Tag.objects.usage_for_model(Picture, counts=True)
+    related_tags = sorted(related_tags, key=lambda t: -t.count)
+    suggestion_categories = Counter()
+    suggestions = []
+    for t in related_tags:
+        if suggestion_categories[t.category] < 3:
+            suggestion_categories[t.category] += 1
+            suggestions.append(t)
+            if sum(suggestion_categories.values()) == 10:
+                break
+    template_name = 'catalogue/author_detail.html'
+    return render(request, template_name, {
+        'object_list': pictures,
+        'title': 'Galeria',
+        'tags': [],
+        'suggest': suggestions,
+        'list_type': 'gallery',
+    })

 
 
 def picture_detail(request, slug):
 
 
 def picture_detail(request, slug):


@@ -44,10 +41,7 @@ def picture_detail(request, slug):
 
     theme_things = split_tags(picture.related_themes())
 
 
     theme_things = split_tags(picture.related_themes())
 

-    if request.EXPERIMENTS['layout'].value:
-        template_name = 'picture/2022/picture_detail.html'
-    else:
-        template_name = 'picture/picture_detail.html'
+    template_name = 'picture/picture_detail.html'

     
     return render(request, template_name, {
         'picture': picture,
     
     return render(request, template_name, {
         'picture': picture,


@@ -105,7 +99,6 @@ def import_picture(request):
     """docstring for import_book"""
     from django.http import HttpResponse
     from picture.forms import PictureImportForm
     """docstring for import_book"""
     from django.http import HttpResponse
     from picture.forms import PictureImportForm

-    from django.utils.translation import gettext as _

 
     import_form = PictureImportForm(request.POST, request.FILES)
     if import_form.is_valid():
 
     import_form = PictureImportForm(request.POST, request.FILES)
     if import_form.is_valid():


@@ -118,8 +111,8 @@ def import_picture(request):
             info = sys.exc_info()
             exception = pprint.pformat(info[1])
             tb = '\n'.join(traceback.format_tb(info[2]))
             info = sys.exc_info()
             exception = pprint.pformat(info[1])
             tb = '\n'.join(traceback.format_tb(info[2]))

-            return HttpResponse(_("An error occurred: %(exception)s\n\n%(tb)s") %
+            return HttpResponse("Wystąpił błąd: %(exception)s\n\n%(tb)s" %

                                 {'exception': exception, 'tb': tb}, content_type='text/plain')
                                 {'exception': exception, 'tb': tb}, content_type='text/plain')

-        return HttpResponse(_("Picture imported successfully"))
+        return HttpResponse('Obraz został zimportowany')

     else:
     else:

-        return HttpResponse(_("Error importing file: %r") % import_form.errors)
+        return HttpResponse('Błąd importu pliku: %r' % import_form.errors)