X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/652e2d66d7f88cc6b857edc4aaac7e14a654eb36..HEAD:/src/catalogue/forms.py diff --git a/src/catalogue/forms.py b/src/catalogue/forms.py index c1348a1e4..919ff3a62 100644 --- a/src/catalogue/forms.py +++ b/src/catalogue/forms.py @@ -1,9 +1,8 @@ -# -*- coding: utf-8 -*- -# 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 django import forms -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from catalogue.models import Book from waiter.models import WaitedFile @@ -16,6 +15,11 @@ class BookImportForm(forms.Form): book_xml_file = forms.FileField(required=False) book_xml = forms.CharField(required=False) gallery_url = forms.CharField(required=False) + days = forms.IntegerField(required=False) + hidden = forms.BooleanField(required=False) + logo = forms.CharField(required=False) + logo_mono = forms.CharField(required=False) + logo_alt = forms.CharField(required=False) def clean(self): from django.core.files.base import ContentFile @@ -25,12 +29,18 @@ class BookImportForm(forms.Form): self.cleaned_data['book_xml_file'] = \ ContentFile(self.cleaned_data['book_xml'].encode('utf-8')) else: - raise forms.ValidationError(_("Please supply an XML.")) + raise forms.ValidationError("Proszę podać XML.") return super(BookImportForm, self).clean() def save(self, **kwargs): return Book.from_xml_file(self.cleaned_data['book_xml_file'], overwrite=True, - remote_gallery_url=self.cleaned_data['gallery_url'], **kwargs) + remote_gallery_url=self.cleaned_data['gallery_url'], + days=self.cleaned_data['days'], + findable=not self.cleaned_data['hidden'], + logo=self.cleaned_data['logo'], + logo_mono=self.cleaned_data['logo_mono'], + logo_alt=self.cleaned_data['logo_alt'], + **kwargs) FORMATS = [(f, f.upper()) for f in Book.ebook_formats] @@ -44,22 +54,24 @@ class DownloadFormatsForm(forms.Form): CUSTOMIZATION_FLAGS = ( - ('nofootnotes', _("Don't show footnotes")), - ('nothemes', _("Don't disply themes")), - ('nowlfont', _("Don't use our custom font")), - ('nocover', _("Without cover")), + ('nofootnotes', _("Bez przypisów")), + ('nothemes', _("Bez motywów")), + ('nowlfont', _("Bez naszego kroju pisma")), + ('nocover', _("Bez okładki")), + ('notoc', _("Bez spisu treści")), ) CUSTOMIZATION_OPTIONS = ( - ('leading', _("Leading"), ( - ('', _('Normal leading')), - ('onehalfleading', _('One and a half leading')), - ('doubleleading', _('Double leading')), + ('leading', _("Interlinia"), ( + ('', _('Zwykła interlinia')), + ('onehalfleading', _('Powiększona interlinia')), + ('doubleleading', _('Podwójna interlinia')), )), - ('fontsize', _("Font size"), ( - ('', _('Default')), - ('13pt', _('Big')) + ('fontsize', _("Rozmiar tekstu"), ( + ('', _('Domyślny')), + ('13pt', _('Duży')), + ('16pt', _('Większy')), )), - # ('pagesize', _("Paper size"), ( + # ('pagesize', _("Rozmiar papieru"), ( # ('a4paper', _('A4')), # ('a5paper', _('A5')), # )), @@ -73,13 +85,13 @@ class CustomPDFForm(forms.Form): for name, label in CUSTOMIZATION_FLAGS: self.fields[name] = forms.BooleanField(required=False, label=label) for name, label, choices in CUSTOMIZATION_OPTIONS: - self.fields[name] = forms.ChoiceField(choices, required=False, label=label) + self.fields[name] = forms.ChoiceField(choices=choices, required=False, label=label) def clean(self): self.cleaned_data['cust'] = self.customizations self.cleaned_data['path'] = get_customized_pdf_path(self.book, self.cleaned_data['cust']) if not WaitedFile.can_order(self.cleaned_data['path']): - raise ValidationError(_('Queue is full. Please try again later.')) + raise ValidationError(_('Kolejka jest pełna. Proszę spróbować ponownie później.')) return self.cleaned_data @property @@ -98,7 +110,7 @@ class CustomPDFForm(forms.Form): def save(self, *args, **kwargs): if not self.cleaned_data['cust'] and self.book.pdf_file: # Don't build with default options, just redirect to the standard file. - return {"redirect": self.book.pdf_file.url} + return {"redirect": self.book.pdf_url()} url = WaitedFile.order( self.cleaned_data['path'], lambda p, waiter_id: build_custom_pdf.delay(self.book.id, self.cleaned_data['cust'], p, waiter_id),