From cd94c0d0f4f54b770b1a600cf1c1a6b56d894ef8 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Wed, 18 Oct 2017 11:16:20 +0300 Subject: [PATCH] Sort kaehmys in the correct order --- locale/en/LC_MESSAGES/django.mo | Bin 9325 -> 9502 bytes locale/en/LC_MESSAGES/django.po | 110 ++++++++++--------- locale/fi/LC_MESSAGES/django.mo | Bin 12483 -> 12685 bytes locale/fi/LC_MESSAGES/django.po | 74 +++++++++---- webapp/migrations/0034_auto_20171018_1017.py | 37 +++++++ webapp/models.py | 16 ++- webapp/views.py | 2 +- 7 files changed, 164 insertions(+), 75 deletions(-) create mode 100644 webapp/migrations/0034_auto_20171018_1017.py diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 647f6b60bb72ea5a8a10ce0143bcf182ca03943e..9e44d41d4cc748161963923b355c7873a5d4fb41 100644 GIT binary patch delta 3060 zcmY+_e@vBC9LMnkUPOL~T~JYp%QX@xFBKAnzfmj`jeaOjrhk-8Z7wxiW33-r+DdKK`*WY;R?qm}*ZH3NJm)#*`<&V8)Hlois#%!jM#TSui2P?Aq?>LbDRHmzy1W+@-pAX%5BI-sJs0mfs zd@iaI3sDPbLRD@h>bwrr0@q^__cz;V=)}Dkhn=W_57_)LG8fZ@8u%NVpGOUJ5eJ|W zT{jRl;lZdI2TV@s!Q4Vn1?^*Bx*W=8mmAJvQHO{RkPu97bJ# z()vAWLYGjLx`C=lTwk|Ry;0x$P~QjoQh&}dg>-0!6H(862I|5l%)u7iif^D+I-GK- zQe!X!Ct-gKVLG;n4W;wEsD<`NRU{W3omfaiuU!dh;0JA9 zj(V2UPy<)nd?9L}7UU_JwW#ZMp(eZ!b>mLdxCc?=9Kk#BYn*`pWKw^fFoEUk!ZOtE ztg!h~;h`{0%js8>mVpvkFxt4OOWO)b|0@_ajjE9p}){ z3@cF2JcPPX{W;iy)%Z4QrKz{M=cgn4$mAk#swqX@C{u~LezCO`wUBmH1=iX8byNkM zT{Lt-Cu&BY*b}}&t^ADj2h;>EqHc7>=E-brRltk7kq@=PT3lnzJ^)Zu9ip-GT2#O?V`#w56y=G7YtWdFa7b)Px)i;2OLG-^YAB zhrLZ9A50^bjtq=Jm2(5pMreS=L@p5`;)rL$-}Oq*ETg5ptf#ty&_h%m*jc6}+%F-^ znNLfHKl;gkL+jmGLR1mWgpN9*lxQGo3I5HPd4vw86+N^#9Ua7U;xXbrLdPm%3Q6A50j{~hsUV~GM{0WqFfP0S$vdpzMLJ_9vq2C5=rg~x;q2p0PJNx-?LQB zB4Q;mlhE!OO^hORj36cx{E9_)Dwrqr!LgKhidd#Z`|9b)-lSLJ((CI(i<)bi&E#Nc zL48YYLo{!$i4=JMj7f?1)iu-yYimQH=15LjS8U|Reuc5|#r}eV5d{U2>;cnz`rJ$X s)$X-R>`*uJ$TDABOqx9>*w|QCQypxsX;`!*aye^@hAWN>}3vf!U)`&LUm`i7)#!^<Bh6DOZ!t?TX7V56z{}#Ou}>a`UUip z_aT2~fDgJb*Dw`-cXP*h#~L$^3*%5XWaAx}i)vVm`B;WwY(U0n-ben-Nt>TRANi*^ z8qZ@9UbNS}JY)uWinRcz8poJ&PJ(<8DBy{P-jP!n8%$voez=R`NwU?T29b=+w47UY?x71i-^o4qj?=K+=4Wvt`FT`_KVc4DMO7jt z&7Ij4)Di?ydn4Cg594)@G4oLqof2@LHzz>-)ga6Tb-WOjms%r88&i&IxY=5ddhk9} zMcPm^KZ=aWylub#(0<>A{F!rnFnQCDTH5OY>aT{L3C7GuA0ER3)LQkTD$<9UIDqLm zf|D?XvZ(z`Yd&fs3s9wAZ1WX3p1cBe{}#-~I>+A7hMIZ1^*z)8PN5#uY4aXbB`#rn zDNq%-ifaE0YUysFW|+=sXJG+`a4l*gyHP)PCu%Qr+6xy^9o|5VbQo3AKT%8JV>Fss zCTf6rsDaEwy$2Ry4sJqK^e}3vK1MHoiKXm?udtivns8w*ftTWa%FsDW0ZCa}%gh-!Bj^Y#1h;3Uk2Zq$rMP$Rx=^D)#* z0~?E~$RsSnpuJv!da-P-oXjlr>-WEe6OBBAdhj}oZxYmi z>TJFfRf#6l3|df?JA%5e12xlkP!;J!-PeWsdH16F{l@0~=%_@OIZ?+$sQf0XBQIN2 zFO~qRVLqz#3s4VUg6en~s@+P=!}a(89ji@EqjM^J@_Id+WvzhjweqMvrTLZdF16g}Ogwx;vl=sQYtJl`FKCpa$?D>N!rt zUZ_GV%0X4%WR0l1{GfW$5hMlMv%LNSKFlr)cGu#(T7?nqCz8TeDGiso%NJSm< zCMQ~g4^X8%gBoEkY9M`>kNud72{YZF>s-`QRH7HRq6byQ*N7JhwSS(NLsSvk8!r(0 z`IZpNOmwc#pM8*1?OS!XhtSHX7VIAWJ5b>ZI-7LH5sH7Z5v}vElvqdXAav9a_Y<|m z7J`2&;%g7_ib+jWM>Da8SV`PP=x8JCgeqZq?YU-r^EH;sQj#plz+qr@R%1Mv`{ zqm`IXY*)hZ1hJghA6@MaI4zt#M`#o2(3-4@pZ)hSn^V@tu%xEiUfzvm#9o{Ki`H@p zQAj*X+(+yq%8CCUYuzNtJi^JY=na3+(-ie3XU=+zTpLU80d1_U#A-sv!-RIX6J4Gh zbYA9cJyA&Y{Dr!6M#A#@bG#Q!nQvgeOm8}LbD zr<;4t#@LPIBZ;w&wBJ0jV}TxTtU5j4J9=TL@b2QGqF6`9+N4-&aIYtJBJ`HNEA&Kb HXP*8Cu8#oE diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index b815b0c..576a084 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-17 19:55+0300\n" +"POT-Creation-Date: 2017-10-18 11:11+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -192,11 +192,9 @@ msgid "English" msgstr "English" #: infoscreen/templates/infoscreen_admin.html:166 -#: members/templates/settings.html:23 webapp/templates/kaehmy.html:65 -#, fuzzy -#| msgid "Submitted" +#: members/templates/settings.html:23 webapp/templates/kaehmy.html:77 msgid "Submit" -msgstr "Submitted" +msgstr "Submit" #: members/forms.py:115 members/tables.py:32 msgid "Member" @@ -551,16 +549,12 @@ msgid "Phone number (not public)" msgstr "" #: webapp/forms.py:44 -#, fuzzy -#| msgid "Total challenges:" msgid "Custom roles" -msgstr "Total challenges:" +msgstr "" #: webapp/forms.py:52 webapp/templates/kaehmy.html:41 -#, fuzzy -#| msgid "Total challenges:" msgid "Preset roles" -msgstr "Total challenges:" +msgstr "" #: webapp/forms.py:76 msgid "Invalid phone number" @@ -599,38 +593,28 @@ msgid "Feeds" msgstr "" #: webapp/models.py:68 -#, fuzzy -#| msgid "Events" msgid "Event: {}" -msgstr "Events" +msgstr "" #: webapp/models.py:71 -#, fuzzy -#| msgid "Events" msgid "Event" -msgstr "Events" +msgstr "" #: webapp/models.py:83 msgid "Registration: {}" msgstr "" #: webapp/models.py:86 -#, fuzzy -#| msgid "Rotation" msgid "Registration" -msgstr "Rotation" +msgstr "" #: webapp/models.py:87 -#, fuzzy -#| msgid "Rotations" msgid "Registrations" -msgstr "Rotations" +msgstr "" #: webapp/models.py:94 -#, fuzzy -#| msgid "Corporate" msgid "Corporate affairs" -msgstr "Corporate" +msgstr "" #: webapp/models.py:95 webapp/templates/freshmen.html:7 #: webapp/templates/navigation.html:16 @@ -643,10 +627,8 @@ msgid "International" msgstr "International" #: webapp/models.py:97 -#, fuzzy -#| msgid "External image" msgid "External affairs" -msgstr "External image" +msgstr "" #: webapp/models.py:98 msgid "Media" @@ -692,7 +674,7 @@ msgstr "Applications" msgid "Others" msgstr "" -#: webapp/models.py:111 webapp/models.py:184 +#: webapp/models.py:111 webapp/models.py:192 #, fuzzy #| msgid "Add member" msgid "Board member" @@ -742,60 +724,92 @@ msgstr "Total challenges:" msgid "Custom kaehmy roles" msgstr "Total challenges:" -#: webapp/models.py:158 -msgid "Message" -msgstr "" - -#: webapp/models.py:160 +#: webapp/models.py:146 msgid "Timestamp" msgstr "" -#: webapp/models.py:178 webapp/models.py:249 +#: webapp/models.py:160 +msgid "Kaehmykommentti" +msgstr "Kaehmy comment" + +#: webapp/models.py:161 +msgid "Kaehmykommentit" +msgstr "Kaehmy comments" + +#: webapp/models.py:163 +msgid "Message" +msgstr "" + +#: webapp/models.py:182 webapp/templates/kaehmy.html:12 +msgid "Kaehmylomake" +msgstr "Kaehmy application" + +#: webapp/models.py:183 +msgid "Kaehmylomakkeet" +msgstr "Kaehmy applications" + +#: webapp/models.py:186 webapp/models.py:259 msgid "Phone number" msgstr "" -#: webapp/models.py:179 +#: webapp/models.py:187 msgid "Year" msgstr "" -#: webapp/models.py:180 +#: webapp/models.py:188 msgid "Text" msgstr "" -#: webapp/models.py:182 +#: webapp/models.py:190 msgid "Custom role name" msgstr "" -#: webapp/models.py:192 +#: webapp/models.py:200 #, fuzzy #| msgid "Member applications" msgid "Kaehmy application: {}" msgstr "Member applications" -#: webapp/models.py:214 +#: webapp/models.py:222 msgid "Board: {}" msgstr "" -#: webapp/models.py:220 +#: webapp/models.py:228 msgid "Official: {}" msgstr "" -#: webapp/models.py:234 +#: webapp/models.py:242 msgid "Role" msgstr "" -#: webapp/models.py:236 +#: webapp/models.py:243 +msgid "Roles" +msgstr "" + +#: webapp/models.py:245 msgid "Start date" msgstr "" -#: webapp/models.py:237 +#: webapp/models.py:246 msgid "End date" msgstr "" -#: webapp/models.py:247 +#: webapp/models.py:256 msgid "Official" msgstr "" +#: webapp/models.py:257 +msgid "Officials" +msgstr "" + +#: webapp/models.py:285 +msgid "Telegram channel" +msgstr "" + +#: webapp/models.py:286 +msgid "Telegram channels" +msgstr "" + #: webapp/templates/admin_index.html:6 msgid "SIK Admin" msgstr "SIK Admin" @@ -820,10 +834,6 @@ msgstr "Guild" msgid "Jobs" msgstr "Jobs" -#: webapp/templates/kaehmy.html:12 -msgid "Kaehmylomake" -msgstr "Kaehmy application" - #: webapp/templates/kaehmy.html:16 msgid "" "Kaehmykoneella voit ilmaista kiinnostuksesi toimia killassa ensi vuonna.\n" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index 9d377ddd6387a0203343503537829ad95dc5160c..97561be88c17e8ab7176c69b358d4ef254ae8c86 100644 GIT binary patch delta 4628 zcmY+{3vg7`9mnyLuz5fTB#{__WV48bq$EHH7>XrUMWG^!5{Xg-0$CukBw`Y!K)pt) zAfkvd7E!_Ss8ke-%bQ}Mgc23;HCh}TTIz&{qjW^a$4sRC{`UUU(lh+_bIyI8$Gvwq z9ISkNhIb+((CjEjNj6!Y=v-!;bM0NV)w%KM&V}(-Jd8Ur8NCeOrPzt~N*sXA$R*qX z+un*Pw2xpK9>Xqp7U{xs-`D|hmpIp*9jT}jaX4HjOqmJ8*I<GLM@np zM^FR$0Cj$w?LTMxzct%Yw>CbD_1BW6XZa6JZ&XK@qYfys_O*B!?Fpy>MNl2gLv_3W zHIN5UE4S44H(@;O=TXP4MO}BJwYO!l{yJd~8~WfORQoitn(jQRqhxx|$8^-K7=heQ zHwHDJyHFFEj(Qs+w*4MtvaSJ7^HwcKtz3OCe?W~M6?L!#b%7_%)u@MP1L}kw=0Vf| z-b3BG6R4TDp;qoo+kXKy|JD$+$q#VE}#aS#FvRC)B|<>pqYmn_(0@%&kduZds1eO^LMz(s9O+5 zU2q|4#7j{R**bGOYG$pd<32@oc-Goqp;qPsYUR4~?rLRnF!uiUwGH{G84N^?ywtn~ zwE|;NBOi~NafNNKMRi<{I=>Os(K6J)R-w*&1+{`v^9@YW`~RjL@II>JW2lGmpQsrJ z_}1u$K@8z2WR+bQnUrg^_8M#NL9M{wP#yo>+NV$}anAfVdU{&Z_&U-FJy0{vMvb%& z>V!hn!#L9R-+~ipm!k%}$@agFx|J=c>wJh>kz=TVoJ1Xe#`d4j<^F4_zGH)yFd^i> zuNgRp*Ci8YvAvPycp1;4I(YhWe~H(lCa@I;;C57pCs7mn9M$1@)Oqb@3g63W_v-8U z7b;+b9;#B*Om9TJCX?;J2x_1UQTOyw)XKboLvagUg`c4Ykb8x{g88WHmY^nhgKeLH z8rT%icFeX74XBZ6yO!(;+un@*X|F{M;4tcf$8i{*K^-6DLD4|_A!BhR7{Ur9btrqaLLL`5^%fg16F*baWTQA>Rsc@y2gFbPxh{o^uG?LMdu3amW{ z6KR*4Ww!r%)WFB0R%DW-e>atiI;cX;zJ>mX3o*8IsE4QwwN%qE1;eP7nuq!ZT!FmO zZZm3tM^VRpikiR~?2O-;aYg?1Qc(S-6|w#raZfhrzyege1U2I8Fcr&D9ZpAe@PN6@ ze8yaddX~1J&fjgmWgbUO@C(!meeKzXA5bIGA8r~*XVk-Y32J+P)Uz-cHISjUeLQMF zccRVz9>Rn{&JDqSs9SOehHwGq z<8!E6(1Jg~)7TX=2K(2`MRk;q8o*%G>o>~Z@3{&pI$;`W>E@dAu{-U>n1)TLnQXxE zxEVF$cGUZxSnS&yb=+Xo`K74qjz+E2ZK$Q6f*E@Mt6~-B?#Fm`EJNNFw}NaU=|tsq zpV&oivif%1MkbP{$u9{D;8v54QcXp->@M5zC{8D9$yEAx4-=KSKJK9T28PH|qSvdV z{G7^lQ`b3UeuZ>GLk$&{!EUN z2C{*a5S1k)hv;G4Njl0bDk}+hHCER1d59b)zgEwB`1F^oo=%k+q%>CJ|9DtO^kk=! z2gvMs6j&H1lrcUb2d)EGK$J29m|3 zid;*sChxl1IpcMCC>@iQG({Bq~KdvCn0?^IfREO?ZvnG*U+X zLORN?tg-{IAbZFk$ylP2=M(!3@cDc48?u?)L57l!GK5N)?6wX2b^mA6$R=CKeA1m1 z5S80VBv$jk{fJ!9Ty*pglFAbIX5(8c4bXXIO58~|G%Lwx;Ge%OBx<3E*?=_ z9Q{XbL)UKQwbgU0XNPO%R7Vc(sE?KxCd375Bh~fMiA9gZ2mSMl=2X^H-dFkG>sh61a9{|9u$x~u>I delta 4409 zcmZA33v||H0mt!YV_Y0VHwQut*tiG_#$dn_CMtm#f)WE^q9hU^Ot}Okk?Gz9VIqP8 zgG7o#IZU{w~i#>4= zX5cJrf%DMgp2TZ#Mcn=ZX3&4w5)asp&g=j>!XxMj?_*Q^72bfSu{~al+jCnoYub6} z@#V-Oh5NBH&Wx_a4z%}SKAy5o|KUR1klQMRFVOCb4&ZKdMeapsG94Yr{Ad-j2w@2_ zmaq<8p`BQahtQe-9bJ+CMK7b*$zV1K?^PBR?@=y#LO!|@Md*p8=!MJB<3^yzRiGD| zf{k$oI-t4e`HSQJ6>5oNE#shwf zj`$Dg49~{xm(dP0_y{8{__3Ot=&~s5sKyXuBTA z;1P6XTIHu6#(ebkDM61Lgs#9)wBwQJ@nhruiRj8q!Q?GMU&jPK!rQPgpY@-{hJO@< z@G6dD8SEgfQ|iQQbi^IdKQ5in4o9Lhu0T7Sh@Mv&T@bBC2e1}>c52bLYCrlG9PgA! zo%ox0;5qaj{s&#UOg`ZKFb{9WQRo1kMOSPMdf|=e4C~_d!|1@?i`#!0+h@>${taER zPZDuQdKbO{Y{)_f&=0-fFf7Hf=n2cv8LdK24I8ll8<15Ee?hO)myF39I2pNxiBL(!4(3D`p#xfzIv~`dBi(^~o5Df#Lv;%6=&$Gn&!Zju7riCvEQ2f6 z3Y|!2bil=Ndl}~X{tu(Vn-wNtQ+y0PaA9n(Ks#6)+v~9j?b_(}xPK2i@B^5E$D;3} z*FT9)nj0r1yso3#R^a3Z*15d~8AEBS*&(M3^l6TP+>4L6Acl2#3LH7^F zTW~bm@$;C8>oB=;=rgpv2kY-ronS+A{5iT*r_nFmCFD&EZHiI@ycs?2PIN`aMkk`z zsYE-Rg%0FfaesAeuS5sB37znsBG%uI4zs}v|1NqidLimBOJ|UUUZ8cfFggI8*>H4a z%F%&TpaXpneXSpk+pEx9Tb-cd0G7oaThW2Mj-FVL-imk7Z~X^oM;FlxUP5nSc5&+A z&5w3N2ha=sPV`3~x(V0^A4hLN;x#G-R8C?co=2BFuNU_fZ^bOEL@ziWn_>bTKsEZh zy%hKFLXY2%u2@6#XXwB`#8LQ1WP*v%r+4ao9vCf04}1u(!^He(2ie> z?!x z@*KHRR>jH>(ZPR-yh>IQ%N?YieAE72_POM%q?TB`_e+yCo??8HJU~Ve@1td2itsiL zCq7VD3U@JiyMBNyNb>bvhxd@D$wK1&PaC!R(-!^;PL=VnJJx;NEH1iFgym7PhAguY z%NOxUGBvheKySoY^0l~aBJL#CGSbgVW&x#cT+UmWb@}a@r`7dt p|5;jHd4676)0+xP29%YS*3Bz;G^_68qKve<^x{S7tGDz%`+qdXkpch! diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index f4a03cb..3b28c11 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/locale/fi/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-17 19:55+0300\n" +"POT-Creation-Date: 2017-10-18 11:11+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -193,7 +193,7 @@ msgid "English" msgstr "englanti" #: infoscreen/templates/infoscreen_admin.html:166 -#: members/templates/settings.html:23 webapp/templates/kaehmy.html:65 +#: members/templates/settings.html:23 webapp/templates/kaehmy.html:77 msgid "Submit" msgstr "Lisää" @@ -673,7 +673,7 @@ msgstr "Alumnisuhteet" msgid "Others" msgstr "Muut" -#: webapp/models.py:111 webapp/models.py:184 +#: webapp/models.py:111 webapp/models.py:192 msgid "Board member" msgstr "Hallituksen jäsen" @@ -709,58 +709,90 @@ msgstr "Uusi virka" msgid "Custom kaehmy roles" msgstr "Uudet kaehmyvirat" -#: webapp/models.py:158 -msgid "Message" -msgstr "Viesti" - -#: webapp/models.py:160 +#: webapp/models.py:146 msgid "Timestamp" msgstr "Aikaleima" -#: webapp/models.py:178 webapp/models.py:249 +#: webapp/models.py:160 +msgid "Kaehmykommentti" +msgstr "" + +#: webapp/models.py:161 +msgid "Kaehmykommentit" +msgstr "" + +#: webapp/models.py:163 +msgid "Message" +msgstr "Viesti" + +#: webapp/models.py:182 webapp/templates/kaehmy.html:12 +msgid "Kaehmylomake" +msgstr "Kaehmylomake" + +#: webapp/models.py:183 +msgid "Kaehmylomakkeet" +msgstr "" + +#: webapp/models.py:186 webapp/models.py:259 msgid "Phone number" msgstr "Puhelinnumero" -#: webapp/models.py:179 +#: webapp/models.py:187 msgid "Year" msgstr "Vuosi" -#: webapp/models.py:180 +#: webapp/models.py:188 msgid "Text" msgstr "Teksti" -#: webapp/models.py:182 +#: webapp/models.py:190 msgid "Custom role name" msgstr "Uusi virka" -#: webapp/models.py:192 +#: webapp/models.py:200 msgid "Kaehmy application: {}" msgstr "Kaehmy: {}" -#: webapp/models.py:214 +#: webapp/models.py:222 msgid "Board: {}" msgstr "Hallitus: {}" -#: webapp/models.py:220 +#: webapp/models.py:228 msgid "Official: {}" msgstr "Toimari: {}" -#: webapp/models.py:234 +#: webapp/models.py:242 msgid "Role" msgstr "Rooli" -#: webapp/models.py:236 +#: webapp/models.py:243 +msgid "Roles" +msgstr "Roolit" + +#: webapp/models.py:245 msgid "Start date" msgstr "Alkupäivämäärä" -#: webapp/models.py:237 +#: webapp/models.py:246 msgid "End date" msgstr "Loppupäivämäärä" -#: webapp/models.py:247 +#: webapp/models.py:256 msgid "Official" msgstr "Toimihenkilö" +#: webapp/models.py:257 +msgid "Officials" +msgstr "Toimihenkilöt" + +#: webapp/models.py:285 +msgid "Telegram channel" +msgstr "Telegram-kanava" + +#: webapp/models.py:286 +msgid "Telegram channels" +msgstr "Telegram-kanavat" + #: webapp/templates/admin_index.html:6 msgid "SIK Admin" msgstr "SIK Hallintapaneeli" @@ -785,10 +817,6 @@ msgstr "Kilta" msgid "Jobs" msgstr "Työpaikat" -#: webapp/templates/kaehmy.html:12 -msgid "Kaehmylomake" -msgstr "Kaehmylomake" - #: webapp/templates/kaehmy.html:16 msgid "" "Kaehmykoneella voit ilmaista kiinnostuksesi toimia killassa ensi vuonna.\n" diff --git a/webapp/migrations/0034_auto_20171018_1017.py b/webapp/migrations/0034_auto_20171018_1017.py new file mode 100644 index 0000000..c765c87 --- /dev/null +++ b/webapp/migrations/0034_auto_20171018_1017.py @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11 on 2017-10-18 07:17 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('webapp', '0033_telegramchannel_name'), + ] + + operations = [ + migrations.AlterModelOptions( + name='kaehmyform', + options={'verbose_name': 'Kaehmylomake', 'verbose_name_plural': 'Kaehmylomakkeet'}, + ), + migrations.AlterModelOptions( + name='kaehmymessage', + options={'verbose_name': 'Kaehmykommentti', 'verbose_name_plural': 'Kaehmykommentit'}, + ), + migrations.AlterModelOptions( + name='telegramchannel', + options={'verbose_name': 'Telegram channel', 'verbose_name_plural': 'Telegram channels'}, + ), + migrations.RemoveField( + model_name='kaehmymessage', + name='timestamp', + ), + migrations.AddField( + model_name='messageparent', + name='timestamp', + field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Timestamp'), + ), + ] diff --git a/webapp/models.py b/webapp/models.py index 2aa1ed5..b29ff59 100644 --- a/webapp/models.py +++ b/webapp/models.py @@ -143,6 +143,7 @@ class MessageParent(models.Model): name = models.CharField(_('Name'), max_length=255, default='') email = models.EmailField(_('Email'), default='') + timestamp = models.DateTimeField(_('Timestamp'), default=timezone.now) def __str__(self): return 'Message parent #{}'.format(self.id) @@ -155,9 +156,12 @@ class KaehmyMessage(MessageParent): Every message relates to certain kaehmyform or parent message. """ + class Meta: + verbose_name = _('Kaehmykommentti') + verbose_name_plural = _('Kaehmykommentit') + message = models.TextField(_('Message')) parent = models.ForeignKey('MessageParent', related_name='messages') - timestamp = models.DateTimeField(_('Timestamp'), default=timezone.now) class KaehmyForm(MessageParent): @@ -173,6 +177,10 @@ class KaehmyForm(MessageParent): (4, '4'), (5, 'N'), ) + + class Meta: + verbose_name = _('Kaehmylomake') + verbose_name_plural = _('Kaehmylomakkeet') phone_number = models.CharField( _('Phone number'), max_length=10, default="") @@ -232,6 +240,7 @@ class Role(PresetRole): """Meta class for Role model.""" verbose_name = _('Role') + verbose_name_plural = _('Roles') start_date = models.DateField(_('Start date')) end_date = models.DateField(_('End date')) @@ -245,6 +254,7 @@ class Official(User): """Meta class for Official class.""" verbose_name = _('Official') + verbose_name_plural = _('Officials') phone_number = PhoneNumberField(_('Phone number')) @@ -271,6 +281,10 @@ class OhlhafvChallenge(models.Model): class TelegramChannel(models.Model): """Model containing the channel id of a Telegram chat""" + class Meta: + verbose_name = _('Telegram channel') + verbose_name_plural = _('Telegram channels') + name = models.CharField(max_length=255) channel_id = models.CharField(max_length=255, unique=True) diff --git a/webapp/views.py b/webapp/views.py index 4b4c2c3..9c3f522 100644 --- a/webapp/views.py +++ b/webapp/views.py @@ -226,7 +226,7 @@ def ohlhafv_list(request, *args, **kwargs): def kaehmy_list_view(request, *args, **kwargs): """Kaehmy application list""" - applications = KaehmyForm.objects.all() + applications = KaehmyForm.objects.order_by('-timestamp') context = { 'applications': applications,