fixes

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

diff --git a/src/picture/views.py b/src/picture/views.py
index 43601a1..27f9050 100644 (file)
--- a/src/picture/views.py
+++ b/src/picture/views.py
@@ -17,7 +17,7 @@ def picture_list_thumb(request, filter=None, get_filter=None, template_name='pic
         pictures = pictures.filter(filter)
     if get_filter:
         pictures = pictures.filter(get_filter())
         pictures = pictures.filter(filter)
     if get_filter:
         pictures = pictures.filter(get_filter())

-    return render(request, template_name, {'book_list': list(pictures)})
+    return render(request, template_name, {'picture_list': list(pictures)})

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


@@ -81,7 +81,7 @@ 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 ugettext as _
+    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():


@@ -95,7 +95,7 @@ def import_picture(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") %
             exception = pprint.pformat(info[1])
             tb = '\n'.join(traceback.format_tb(info[2]))
             return HttpResponse(_("An error occurred: %(exception)s\n\n%(tb)s") %

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

         return HttpResponse(_("Picture imported successfully"))
     else:
         return HttpResponse(_("Error importing file: %r") % import_form.errors)
         return HttpResponse(_("Picture imported successfully"))
     else:
         return HttpResponse(_("Error importing file: %r") % import_form.errors)