# HG changeset patch # User neko259 # Date 2015-04-14 18:40:46 # Node ID e990ce466b1f0416359c78b2812470d5e4fd285e # Parent ecf622bdb513bc5d2c3afb753ccb8e4cf92ff955 Show the list of required tags when non was entered at thread creation diff --git a/boards/forms.py b/boards/forms.py --- a/boards/forms.py +++ b/boards/forms.py @@ -340,7 +340,10 @@ class ThreadForm(PostForm): break if not required_tag_exists: - raise forms.ValidationError(_('Need at least 1 required tag.')) + all_tags = Tag.objects.filter(required=True) + raise forms.ValidationError( + _('Need at least one of the tags: ') + + ', '.join([tag.name for tag in all_tags])) return tags diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo index f5b2a64531591d0413a09539fafe05aa1deed0d6..85135b8a2c6c41b6ecca8b4806d5110ac6362c4b GIT binary patch literal 7071 zc$|$_Yit}>6~55Y#v7;3!_E`ho0gR6`+DtA$}AIfso)k=iGfb zcBHO6^UZynbI;>DXU2bAe&e?kevjk&EUv$NTB+xN?|eq_@2#7aS_FI>xEweJq@}B7 z{+GbTz~2J#r#`^#Cg9(I6~KQ0W59o#^&26y3|I-Q0p1F{5x9Mk=zCz1=-Uh20Bkku zA+QoSWbpY#V#hZY$vLk9HSkT~df>ajHNX#zKH79Eom(N}Ex;wf`+>Ir8-ce0yDCIq zh+7r#D-~k@OJ?6|z&j}}Mo(n+zi;$?2t)|gKP$xUe^p34{%giJ#6;hsn8ag6Oyt(Z z#GlP({vI>FKPGn68@ZO4=y@zAdcPQxxTSzeU?wJce9P#$8k4;J%IyCDcmwdSG4bak zqwhb!UBLgD@h&*G5!kR;{2W*;_JqLIz-NFDQv4T-|L>XgKP;B`{290hxVTc{(OfC# zw^hpiL%`dCU#b-Qj#tY0->wut-ZT4eSt9<`ED^a|m&p7kU^T^QiTJtS>}v*o4%od! z^aj9-p8{Wi>oDG3CA@l~O3ojy5bAMi!s4$2#F6Y!?x z#$R9q`MX^Fd>*(N_#@!w=^WrT;K#r_fOoEtdU$w+@ISLc{5b`T1K%;@-vd_=4_1gh zw^R!cHdG5w?y8n}K47r9TF&jMmN>mwEpdILTH^O}gTJd5zyDM%y!?B$=#SNip7k}d zzTJ!;1P%f_YQ+Cv)X4dtUMYSoTPgdttrWQfE5*-8%s2;pf%0m`6{{p()vLtML#u=* zgR3M?&jEXY=YgxJ9#@P0Ex?C~FTj_9Ut2Bu)~%5|Z(Jk#?gw^K{?lF4it7Pf_nI-)FZEE0*PUkW3rhOVRx_sB zq5eX(wZqI&ers_x;(AO;JyY#cp1N>t!L?mUKB%|dX5{J&?om>kh2MTP_qQ9@T}twQ zNSXJLk~*OG?W1LTDaXxaT~J7j*} zfaP0#I4aPNs7zdU2dxZRX(uHInP=75-@}gsHU4b8YP%rof4R8tVv8mYi($^gzk=1dTan@;+Ef`9rGH8njiXZTWozfG~7i5VP}$lg%PF z8#eX9tZ;LnebJZDWKbd6P#D;@20@DJsxynACLx*4rXWXg#vNQsSvV}~IUtkj1X+*R z(BkF#2P9FQLvCn2t-3%|TsmX9aE965MWsTwBDGR>+Q~S?_1+;JWUW3jtZNRJ9WwdL zIfr>nOMDXz18{jRJxfHBZGkan02bixNN9D+vjgoSS)5r}K<=S1fWs1$oHfDL#G)8_t3OdQH$8y3kXl(C)A-KIrYoIqIX+G&~qzkDPpHE6kg z)EY=6p}Mp9qmodN^R;Wi%SSDA2b>eweV$8ZAI4caO@%?`LaTb*%V`Vhh_k*0_9S?! z4+e&45Lt`2NdZw5$@8pmv@q}6K`tG#(Mb~abyGW)u}`j27<+BdtCxEqD#t?_`a+hp zsC818ql1;j-BP9O!0C5wdKk3R9%!bdEY*|NpcVA_PBzq~HFO2r4Qyp%7bwIUjY34U z)04t^J!vqrhugDo7bNe^WwOjTl$!UX-5182Qt?Ab1*$Zu+Z*;h+;Ff_A8PFAY-($b zQE~ZUyd~&&Qt`dH{vh7vC3UR5tt-y007CKo+>f@_*4-Pg-5#&ouD8}D>+ai9yREhs z8{-`aT2R{ecw<9HyrnI^zd=9LmTYO-@I2=)&APRrrBUx{ zY-wm}-qWyue@A0y=Wc9u`*UzI-ep^vq;76#J=jeq?`m$|lXeoG-(T93)P643($vye z@~|#Z8>3vH8skL1B0I$^9m zo%5}9`~b*`7VBnt7}RguspYYLle?j=w!XejZ``Qqv37lZU7dbV*XksXch_$%EbXe_ zPLC{6yQ{8NKl`kRU{CF4$kah*>*k#?6@4?Bjm|}*(O5K@KbAkGqnT(Te=NEbP0HF8 zT+`8IT8$>6>HMkaa(*P5&^(;UkErP7XdFV5yyqx%3bk=Wsv+K7LP_($PD8iOv#@nS1>-UIYQ$q zdKHRTzXWpLMA3axdhJ^2xHk&kXjnKMO=`pd=3)ay7|$B!Qc5n6|2jHnoJEMnAUe(- zjwDp{y@Idg!UTmZn$gjDSU(LrhA}ls{ujbEGABVvF%i^Ye=mrsNF}~9$gp`!`P0{t zC^I*jEi+fVpTGw6R%YN7W$<}dW(;*$!Rjbj`E z;SYT`&6}i*6P<~I;=zJ-kUwEE2ZG_;VLohZ0b-sZ@=)NROT6Z?W4`e;#|mFo(OC$L zV2U$+884K~VmDNcLZn1zc=bFH z<#iIE6N{{Xhb1+M!j6R)5KUqE`vn4#?Gx-kG*w1Qa{$LIp-bgQ$*28SI0syU>uERF zFHzR?9Yl4wKxWo9=ZI)lMQ@ripmLusaq|b!CEU3DOnabEm${!Gp&-$YD?B+?UdHoT zeQj3gj5BQ8c%fIo07}hpaRK&I_^%iIA2YW`rDVyFG43%VWrMQELQ@%=)2b$zrx#h% zY*~}bpD3QiPEjKzdS9X-jv8BL5l3#$XLxXhZRN0*eeaS_#sY8`IW$2fY0e?5g12|; z{7K$K!~|avP|A|AT3!gVB`*`)jM!-Dv!_bm%JWKKiW`8?iW13QPf26rw?O_R6X_Dx zk8^XITaIU`nNpx>f&x)u?kG{HK!IXqmUSC?*Od`{4(Au_%&hAoTRSaV04Ydx!VEq9 zjFUWd4WY@&%UmbIA{Ikk3yaU{{MU_GF|a(Ckkrrrr$I=LkX-vO!+dTa57p@nxS9mZk?}!B&H$~$mYIn%?tNeK}NkkibP^9tq7W6h&_h=oyiZjk({MlM>qV(PR(V*h8IE WI@n diff --git a/boards/locale/ru/LC_MESSAGES/django.po b/boards/locale/ru/LC_MESSAGES/django.po --- a/boards/locale/ru/LC_MESSAGES/django.po +++ b/boards/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-14 13:07+0300\n" +"POT-Creation-Date: 2015-04-14 21:16+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -120,23 +120,24 @@ msgstr "Метки" msgid "Inappropriate characters in tags." msgstr "Недопустимые символы в метках." -#: forms.py:343 -msgid "Need at least 1 required tag." -msgstr "Нужна хотя бы 1 обязательная метка." +#: forms.py:345 +#| msgid "Need at least 1 required tag." +msgid "Need at least one of the tags: " +msgstr "Нужна хотя бы одна из меток: " -#: forms.py:355 +#: forms.py:358 msgid "Theme" msgstr "Тема" -#: forms.py:356 +#: forms.py:359 msgid "User name" msgstr "Имя пользователя" -#: forms.py:357 +#: forms.py:360 msgid "Time zone" msgstr "Часовой пояс" -#: forms.py:363 +#: forms.py:366 msgid "Inappropriate characters." msgstr "Недопустимые символы." @@ -212,31 +213,31 @@ msgstr "Предыдущая страница" msgid "Next page" msgstr "Следующая страница" -#: templates/boards/post.html:32 +#: templates/boards/post.html:25 msgid "Open" msgstr "Открыть" -#: templates/boards/post.html:34 templates/boards/post.html.py:38 +#: templates/boards/post.html:27 templates/boards/post.html.py:31 msgid "Reply" msgstr "Ответ" -#: templates/boards/post.html:43 +#: templates/boards/post.html:36 msgid "Edit" msgstr "Изменить" -#: templates/boards/post.html:45 +#: templates/boards/post.html:38 msgid "Edit thread" msgstr "Изменить тему" -#: templates/boards/post.html:75 +#: templates/boards/post.html:70 msgid "Replies" msgstr "Ответы" -#: templates/boards/post.html:86 templates/boards/thread.html:31 +#: templates/boards/post.html:82 templates/boards/thread.html:31 msgid "messages" msgstr "сообщений" -#: templates/boards/post.html:87 templates/boards/thread.html:32 +#: templates/boards/post.html:83 templates/boards/thread.html:32 msgid "images" msgstr "изображений"