fnp
/
redakcja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ad1668b
)
allow svg, but not tiff
author
Jan Szejko
<janek37@gmail.com>
Wed, 1 Mar 2017 11:16:22 +0000
(12:16 +0100)
committer
Jan Szejko
<janek37@gmail.com>
Wed, 1 Mar 2017 12:54:04 +0000
(13:54 +0100)
apps/catalogue/forms.py
patch
|
blob
|
history
apps/wiki/forms.py
patch
|
blob
|
history
apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo
patch
|
blob
|
history
apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
patch
|
blob
|
history
apps/wiki/static/wiki/editor
patch
|
blob
|
history
lib/librarian
patch
|
blob
|
history
diff --git
a/apps/catalogue/forms.py
b/apps/catalogue/forms.py
index
cbb1ad9
..
5a8e4b2
100644
(file)
--- a/
apps/catalogue/forms.py
+++ b/
apps/catalogue/forms.py
@@
-32,7
+32,7
@@
class DocumentCreateForm(forms.Form):
def clean_cover(self):
cover = self.cleaned_data['cover']
def clean_cover(self):
cover = self.cleaned_data['cover']
- if cover and cover.name.rsplit('.', 1)[-1].lower() not in ('jpg', 'jpeg', 'png', 'gif', '
tif', 'tiff
'):
+ if cover and cover.name.rsplit('.', 1)[-1].lower() not in ('jpg', 'jpeg', 'png', 'gif', '
svg
'):
raise forms.ValidationError(_('The cover should be an image file (jpg/png/gif)'))
return file
raise forms.ValidationError(_('The cover should be an image file (jpg/png/gif)'))
return file
diff --git
a/apps/wiki/forms.py
b/apps/wiki/forms.py
index
6db1903
..
ac219b1
100644
(file)
--- a/
apps/wiki/forms.py
+++ b/
apps/wiki/forms.py
@@
-78,8
+78,8
@@
class DocumentTextSaveForm(forms.Form):
cover_url = doc.meta.get_one(DCNS('relation.coverimage.url'))
if cover_url:
ext = cover_url.rsplit('.', 1)[-1].lower()
cover_url = doc.meta.get_one(DCNS('relation.coverimage.url'))
if cover_url:
ext = cover_url.rsplit('.', 1)[-1].lower()
- if ext not in ('jpg', 'jpeg', 'png', 'gif', '
tif', 'tiff
'):
- raise ValidationError('Invalid cover image format, should be an image file (jpg, png, gif). '
+ if ext not in ('jpg', 'jpeg', 'png', 'gif', '
svg
'):
+ raise ValidationError('Invalid cover image format, should be an image file (jpg, png, gif
, svg
). '
'Change it in Metadata.')
return text
'Change it in Metadata.')
return text
diff --git
a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo
b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo
index
d68493a
..
9516c1f
100644
(file)
Binary files a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo and b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo differ
diff --git
a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
index
6143b51
..
d175792
100644
(file)
--- a/
apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
+++ b/
apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
@@
-473,10
+473,10
@@
msgstr "Metadane dokumentu"
#: static/wiki/editor/src/editor/plugins/core/metadataEditor/action.js:33
msgid ""
#: static/wiki/editor/src/editor/plugins/core/metadataEditor/action.js:33
msgid ""
-"The cover needs to be an image file: jpg, png, gif. Use another URL or clear "
+"The cover needs to be an image file: jpg, png, gif
, svg
. Use another URL or clear "
"the cover field."
msgstr ""
"the cover field."
msgstr ""
-"Okładka musi być plikiem graficznym: jpg, png, gif. Użyj innego adresu lub "
+"Okładka musi być plikiem graficznym: jpg, png, gif
, svg
. Użyj innego adresu lub "
"wyczyść pole okładki."
#: static/wiki/editor/src/editor/plugins/core/metadataEditor/view.js:28
"wyczyść pole okładki."
#: static/wiki/editor/src/editor/plugins/core/metadataEditor/view.js:28
diff --git
a/apps/wiki/static/wiki/editor
b/apps/wiki/static/wiki/editor
index
e32eab0
..
667a010
160000
(submodule)
--- a/
apps/wiki/static/wiki/editor
+++ b/
apps/wiki/static/wiki/editor
@@
-1
+1
@@
-Subproject commit
e32eab0deee844e3df8dfdfd784da674260c2351
+Subproject commit
667a0106a4beba6eb4dfde0398b2223adf0ebac9
diff --git
a/lib/librarian
b/lib/librarian
index
30a74b4
..
8287173
160000
(submodule)
--- a/
lib/librarian
+++ b/
lib/librarian
@@
-1
+1
@@
-Subproject commit
30a74b436b8a81adbdbeea5a9b2f99dfc2e4949
f
+Subproject commit
8287173da88bfaa3a8b90a39768198dceba2e25
f