fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor fix
[wolnelektury.git]
/
apps
/
catalogue
/
forms.py
diff --git
a/apps/catalogue/forms.py
b/apps/catalogue/forms.py
index
bf6b0df
..
6ed6d62
100644
(file)
--- a/
apps/catalogue/forms.py
+++ b/
apps/catalogue/forms.py
@@
-1,5
+1,9
@@
# -*- coding: utf-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.
+#
from django import forms
from django import forms
+from django.utils.translation import ugettext_lazy as _
from slughifi import slughifi
from catalogue.models import Tag, Book
from slughifi import slughifi
from catalogue.models import Tag, Book
@@
-10,18
+14,19
@@
from catalogue import utils
class BookImportForm(forms.Form):
book_xml_file = forms.FileField()
class BookImportForm(forms.Form):
book_xml_file = forms.FileField()
- def save(self, commit=True):
- return Book.from_xml_file(self.cleaned_data['book_xml_file'], overwrite=True)
+ def save(self, commit=True
, **kwargs
):
+ return Book.from_xml_file(self.cleaned_data['book_xml_file'], overwrite=True
, **kwargs
)
class SearchForm(forms.Form):
class SearchForm(forms.Form):
- q = JQueryAutoCompleteField('/katalog/tags/', {'minChars': 2, 'selectFirst': True, 'cacheLength': 50})
+ q = JQueryAutoCompleteField('/katalog/tags/', {'minChars': 2, 'selectFirst': True, 'cacheLength': 50
, 'matchContains': "word"
})
tags = forms.CharField(widget=forms.HiddenInput, required=False)
tags = forms.CharField(widget=forms.HiddenInput, required=False)
-
+
def __init__(self, *args, **kwargs):
tags = kwargs.pop('tags', [])
super(SearchForm, self).__init__(*args, **kwargs)
def __init__(self, *args, **kwargs):
tags = kwargs.pop('tags', [])
super(SearchForm, self).__init__(*args, **kwargs)
- self.fields['q'].widget.attrs['title'] = u'tytuł, autor, motyw/temat, epoka, rodzaj, gatunek'
+ self.fields['q'].widget.attrs['title'] = _('title, author, theme/topic, epoch, kind, genre')
+ #self.fields['q'].widget.attrs['style'] = ''
self.fields['tags'].initial = '/'.join(tag.slug for tag in Tag.get_tag_list(tags))
self.fields['tags'].initial = '/'.join(tag.slug for tag in Tag.get_tag_list(tags))
@@
-34,29
+39,29
@@
class UserSetsForm(forms.Form):
class ObjectSetsForm(forms.Form):
class ObjectSetsForm(forms.Form):
- def __init__(self, obj, user, *args, **kwargs):
+ def __init__(self, obj, user, *args, **kwargs):
super(ObjectSetsForm, self).__init__(*args, **kwargs)
self.fields['set_ids'] = forms.MultipleChoiceField(
super(ObjectSetsForm, self).__init__(*args, **kwargs)
self.fields['set_ids'] = forms.MultipleChoiceField(
- label=
u'Półki'
,
+ label=
_('Shelves')
,
required=False,
required=False,
- choices=[(tag.id, "%s (%s)" % (tag.name, tag.
book_count
)) for tag in Tag.objects.filter(category='set', user=user)],
+ choices=[(tag.id, "%s (%s)" % (tag.name, tag.
get_count()
)) for tag in Tag.objects.filter(category='set', user=user)],
initial=[tag.id for tag in obj.tags.filter(category='set', user=user)],
widget=forms.CheckboxSelectMultiple
)
initial=[tag.id for tag in obj.tags.filter(category='set', user=user)],
widget=forms.CheckboxSelectMultiple
)
-
+
class NewSetForm(forms.Form):
name = forms.CharField(max_length=50, required=True)
class NewSetForm(forms.Form):
name = forms.CharField(max_length=50, required=True)
-
+
def __init__(self, *args, **kwargs):
super(NewSetForm, self).__init__(*args, **kwargs)
def __init__(self, *args, **kwargs):
super(NewSetForm, self).__init__(*args, **kwargs)
- self.fields['name'].widget.attrs['title'] =
u'nazwa nowej półki'
-
+ self.fields['name'].widget.attrs['title'] =
_('Name of the new shelf')
+
def save(self, user, commit=True):
name = self.cleaned_data['name']
def save(self, user, commit=True):
name = self.cleaned_data['name']
- new_set = Tag(name=name, slug=utils.get_random_hash(name), sort_key=
slughifi(name
),
+ new_set = Tag(name=name, slug=utils.get_random_hash(name), sort_key=
name.lower(
),
category='set', user=user)
category='set', user=user)
-
+
new_set.save()
return new_set
new_set.save()
return new_set
@@
-67,12
+72,14
@@
FORMATS = (
('pdf', 'PDF'),
('odt', 'ODT'),
('txt', 'TXT'),
('pdf', 'PDF'),
('odt', 'ODT'),
('txt', 'TXT'),
+ ('epub', 'EPUB'),
+ ('daisy', 'DAISY'),
)
class DownloadFormatsForm(forms.Form):
formats = forms.MultipleChoiceField(required=False, choices=FORMATS, widget=forms.CheckboxSelectMultiple)
)
class DownloadFormatsForm(forms.Form):
formats = forms.MultipleChoiceField(required=False, choices=FORMATS, widget=forms.CheckboxSelectMultiple)
-
+
def __init__(self, *args, **kwargs):
super(DownloadFormatsForm, self).__init__(*args, **kwargs)
def __init__(self, *args, **kwargs):
super(DownloadFormatsForm, self).__init__(*args, **kwargs)