From 2a6f98f4c11892c606ac1e77771f8ebf67039cb2 Mon Sep 17 00:00:00 2001
From: Jan Szejko <janek37@gmail.com>
Date: Wed, 1 Mar 2017 12:16:22 +0100
Subject: [PATCH] allow svg, but not tiff

---
 apps/catalogue/forms.py                     |   2 +-
 apps/wiki/forms.py                          |   4 ++--
 apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo | Bin 8196 -> 8206 bytes
 apps/wiki/locale/pl/LC_MESSAGES/djangojs.po |   4 ++--
 apps/wiki/static/wiki/editor                |   2 +-
 lib/librarian                               |   2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index cbb1ad9d..5a8e4b2f 100644
--- 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']
-        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
 
diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index 6db1903d..ac219b17 100644
--- 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()
-            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
 
diff --git a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo
index d68493a860710ee7399020b6fa84f696ac452472..9516c1fa9e48de968d5e34c13a1b63399541b687 100644
GIT binary patch
delta 1342
zcmXZcPe@cz6vy#1GdWIUf6Qt8Q%$2Kktjup5tSelfka@0wwV6VA45u}jgf8YVH6me
zAxb476gbe%Y9y?LHbJ(@jm<)d5TZp;*(QUa`u=zq9`kwc-uKQq_uR|eXc}mGay;an
zF|+y-vvR!a9LJSBPh$n<k;@kOS%#sQStmx2%P#Q~!d_IIeq4cBT#nCB-%nu?&R`Vh
zW9C_yn=cHk#c!wtK^`Jlh?+0P0xUz#Cs2VmIqOjG?ZP$Kh<d*TvjMX<EaUl4+-x<*
zO8tdxF7^D0Mh29y%}ty{t>6kO@J-x~{ip;}NGyAgTG?l$c3VPqu83@fSb-|E%2|t=
zZ@>iZ_qb7_)3^>VqAI_IYULd)#>cn;UtlffQHg`RRE=>|VS8{D9&*peP~T@zd9I<h
zpbrUQ-aU6Sjtck|wc<HsF}C2Ie>?vnmxVbPN|Z!x$u?96>ro5XhiY{SRlpJCva|ds
z?p1%>vtj?nvZz4MQ3+mQ70x<;A(xfYCbfPiYQ@c{&ZJR^x>1Gnq6!#9E$k6)!3pFz
z*gRHq{%p~`5MS>n+=|+>gQ!5QsKh7ScsD9=52{mxsFvP$<73VVRDo|$r#+9_f(2CT
zzoX8dg(+VF5~xE|gE~Bos6q~)0<@r3l18l{<HoO}3b~CcY#7y{F=TD_5*6<Qs-Tb9
zj6cv*g54ZNB~GDE=TX!iwqrY9z)qY&ZOz_|zOAT$8Duf$p%Onp74#I-IEj2}v84Y$
zu>)0DLz4ch;=>H+gHxzhcc5C;gIf83n;${7?xB00L@nSo>b-ZU!e>!uY0iy*LdE~;
z=6|Bj%2JXI)(4Twp>!k_IG-Dh^aTPoR1@tAbmm5*(}e|fm0g!Ra_34$irnqrL^${#
D*9d?&

delta 1330
zcmXZcPe@cz6vy%Nv~-*)GskQ)ogo?&k^YE8voVIEKMX{+P)f8G{XugPC{aQ20wtrQ
z!Gs`46e0p4Ehcj*)TU;Wvrt+H)v7<zqJkEI()Y)^@R-kg_r7<|x#wQyetIbVqN~{N
zHnWyWvlxy#r*I?BZ*dzIkjqy1S%+)bhs9AdF1yT6F%F{Q4C4lz#4>!2`hE^0n8z?K
zMa{PoZoV*3h2KyKRxyM{3~D}t>#-6wA43JMb2gyfYsSr(LcO2Cr=D3GZsqy!7PC!Q
zUL7nfUhM}HDF&3V%}ty}tzZBZ_!jQLVN`-SB$mBLt?Uz0v;9VOu7qr*ScNLI)>)65
z--~s4z~@GZy08X&QI!v&T6q^M@Cnx9D{R67D)A~Nv4WRX*gh=Bqwcu_^?eU2&vn!m
z+(te%|AD)iLIr$-TJa*X7+ZGFf1Ll2%RCN-64ju#q!HD@-KYiZN42^YRlsrNvNQZB
z?zLdtw`_1@lc+#1Q3+n-4*cN!g<KY;O=|rv)QS(GI@69y)Q>7;5LLhkYGIGD9%qo_
zU`v?f{Mm|op<;WGa3^Zd4x<8{KqWrq#`{r$Z=gCgf@<lQ8=r8_pbDHvo%RB13zku>
z|BgC;=25-^#88JQi8?$fR3T|pfDCFS?Wh&>xbd5)Lhhgn%c43ofvnADQSlZ~1%1S0
z_yc_<XyGU-aVzR{o<!~8Sv-#y@FM0>Thkm5%%B3ELl$FKP>DxT1wF$~oJKyivPAGd
z(SRzfDM9~L@eu~}K?kbU-KbVwMXh|u&1X@qd+460Q45$wy*H04JdZj{3vPT775}rF
w|B5;*KND=QK3GePb%qXlmKzV<^Sr*X#_)jGn;Q?mE6rW1d=$xr;w44@0b{6qRR910

diff --git a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
index 6143b51c..d175792e 100644
--- 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 ""
-"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 ""
-"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
diff --git a/apps/wiki/static/wiki/editor b/apps/wiki/static/wiki/editor
index e32eab0d..667a0106 160000
--- 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 30a74b43..8287173d 160000
--- a/lib/librarian
+++ b/lib/librarian
@@ -1 +1 @@
-Subproject commit 30a74b436b8a81adbdbeea5a9b2f99dfc2e4949f
+Subproject commit 8287173da88bfaa3a8b90a39768198dceba2e25f
-- 
2.20.1