From 23c00ce16781c81d7028ea407526958c1b2a29a0 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 30 Jan 2018 16:23:19 +0200 Subject: [PATCH] Add Email sending to Ohlhafv --- locale/en/LC_MESSAGES/django.mo | Bin 14234 -> 14898 bytes locale/en/LC_MESSAGES/django.po | 1023 +++++++++++++++--------------- locale/fi/LC_MESSAGES/django.mo | Bin 17447 -> 17515 bytes locale/fi/LC_MESSAGES/django.po | 1033 ++++++++++++++++--------------- ohlhafv/templates/email.html | 8 + ohlhafv/views.py | 21 + 6 files changed, 1074 insertions(+), 1011 deletions(-) create mode 100644 ohlhafv/templates/email.html diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index c7d77afb2fe03014b351d32beff18d6e30b148cb..73b07124dc4b41cfe17b4136028e713786b9641b 100644 GIT binary patch delta 5072 zcmY+`d3aRS8OQMx5=>aazJ>K71j3S#3E;w_P(TnW2nZTP^g<@dWSN1PNg#+F5D=x6 zZ7LuISsG<&5lSEySy~7b3RqD4hX~c@DYi(T2dKq|2hn1`znPO7@AJI*oOAEF=brPP zbMItBU|%@$S&O7M495kcBeC&5V_GLrPSsgsW;ZwHbDV<>aAFH%Qt(-89wt&R#Xf3> zbYV8x^Oe|)`VMS}2eC1pz(&SI%!d@3a^i2OhS#wP-itRdsV(E@(=ea&y={FpcA>rv z)!}jU;Cbwe39XFD#4Jq0>8LrmNY^HSjd{L#*(rzHKsl`M?JVLj>g`o2L$c) z`KXQ;q8_-?*4LssejD3iHR{3V?e$Mk{ai)O{3fdX-L~ZaehQ7aOE+X;J$w)~ph2hy z4#RAmfManXj=;01wQfpY({TtYV>40rm!lrI0K4KcTi=PSg4v%&{xy;__QWOBK)%8Z zyo*|zZtaa>`Hcsa%EwS^J`T0}r`YqksLaejWzvge*~~+2@|D)jc$K$oPlSS&U>)zC z8dTx{+>e^UHPnM{qV~Wyr~ziM6LsEW9gMu8W)!NQr&0YDSi`7^EW+5*p_U}FmVz?y zmTj=dHaLPx8DF>8zenwrHcs4hRJ#GFwH}HZ_+-@5 zl*Wv(nJ8$cQB=ydqaL&$nXEaC>gZEc%CDeia2+-C|Da}^%ns9lo1m`uK=s!LHNl5a z{XC9(-XwH*zR9OhjLT3R-Ll?AJurbhQZ$WFGsr~k_R;8IDJpX-knLf1+4?D4zk-^O zzD^oQiZu-*+P%Fgs6iHLJ z;1bNhz1RaUq9)2LBC%bW%ygzwZ;eV>3D(03?1c-^NigOe{G9qJdQk`4d&VF1E-F*+ zVIm$wJ@_Q5-BY6J>rn&Tg4(rJ zsJ(FtHQ?K*fhICdwNF8%ycssawx|qt!xYRxwI7URIAVrTP{WDX7@x!XScH1;Y#fb? zQ4ct4uYZi{_#*0oU)uUj)Y9EUejZFy@~#JGpxS#-{S3o~Jl~9=pc^J5Z;Hu7-LMR` z30I*86h(FLCX!9F14rV=I0D;c8Pgx9Bm2~>LS?KPb^jSurZ1pg=S!;deDhxl`a-4j ziw~qTs@@MZkWrX{<1rQIqCPxJQK{U3TJz1Q-M`bG-;K)5K2#uqj@_ND~UT zC=~E|)ys}IEMn_wMFmHo-TQh1XS>hNpSjY$LIpVZc!0wLTrUgQ5oBS z8t_(o{UEBpqo@gruOR8)^n8PiM@?uQGLVSb950x?sNH+aHaLlz*$3DLKf=j)4K=`_55-fy6E%TD zsP^Yk1N$p#v)(|>^e*yAFo_Sxe^atCQ}6#Y3QF0ls9m`dr{X45%DzTzqJ%;5Z+H^& zvc&$Y`3)+aIy5L9ddEk^O8g*MTjNGzBGJd5Q=fXi@e!{PxrB~2#0$hW;#p!9p(7N> zoVFgt;lvw+GPH=$!FbIO;@8A6qKwdSmY7Gd!m(pFe?aNq zI<(Gj5m6$8s3fw9Ed=||R1rGP6E6|l3BGNyBay#dZ23>9*L|n*@1^iAkx2xIcZgxc z31SJ+h-gRX^?ZVGiMq#pDm@A9m8FFC&JJP@v4Kb-CJ=fX*n_5om_lqKrfL28YML5C zn^4EgL=o{Aq2KsaqJpSBo~EFWO>bfaF_Rcf)IA=ja=6ZkM=0xyr=vSDjtCQx-|1l~-&XqKbb{CaM~5<~V=mE+c%Rru)E?=z1xzA#5i9Mv@ml{qwj#2K zSwve^?2(V1iPgj@q6smBc$FAU%qETyU5Q^3Ly2-?5~0IStRtQwdJy*$j}kf-G~>@N zh&&>VNRA$9_Co^e zzEf|EFWS+wV(cVusdpxg!U1Piz@P66mO9+@!#&&*Pe!p%vwNzrEEvjjD`L6G(nYoQ zmV5o-=uXdT4gNppDo;*A0*RT|JvUHBqRYL`Ot07fL&tf#*(OriIgn6QI54MPR-qfJ b+o*!O8JnxSgHB%1=V!?aG}f>;6gK|@&LMb4 delta 4483 zcmZA33s6>N9>?(qyl^ir8KDSo;475A;LF7n+mtjh49z7q#MV_&ykxP3x!LMTAvJH6 zCpE2hH7i^5%ByAJin^suQ`Xcl){LW5SeY*AG*L6%-0$x_4^7jV`TO}l=bZPs{Lga^ zHq~#w-#L@qb-m#@L8KFRbvGs z0`e2{4aVXXRF|>I#>8PNUTutHvPpDfAzpQQB)?$1S4IDoqE7F2)b=yW5QNTPx7!7{8v4R8>3{RryO97he< zYTKt#9bd%j@MqM(JyN~cbqQU6?$KAg}dsX!i|sYaEq z4)u)ZqjtMv&o`hdwgOqSc^36do2i`umBqR%0@ zOrnw{aTnD$0aUx(wr8SN)PS16D(iEoO}Wcn--nv;8>sKbVXVY<)C5a;e%edBP?c^$ zM?W}8LRHPj7>D1YR`@IS!zey)xmbvOaWaNC8*1~d#0mHes#2FQ5`RWt1Yb}*OWVh? z)vr2HWn%hL|1KmcoX|k2sE&uD&X=QBJO;JNrl1CxgPQ09)aGqK-RGiK_M&ZvtZ(5= z&bQk3%{ktuxgv-9tHXJm2;xHQk2^7dpQ0)h#qzb%cnohk)b9fJdEHPP{?`<+Q7-ASgQN;(@=!uc4Dji?{2L6vwN>b`BL4)>tGWQR}# zAHyi(CI{b^o9 z-Tx_S(|wK_@C(#{7m>M`A8`cwdA`GO4i@VD-%Y~CG@qkN7R`fK2kEE*vyeB)1W+HM zvDO)=fgizKY{UfIh5DW}qbm0y#$YRIQ=hfx+c25&&3O`iDt|&f)8ssF=2=+F>k~wk zc2mAL!JU{*`v_{H=P(X0peFP^YQQVjm;v5FM&^sTC>L>$M+8k>TwSXb0l@3EyXgq4dlkN3-RKE|S7Pt)6-$sWdg=7oP z#r>!bd_|r)r~&g(n{W_n1(Q&lwjO=B8C9`n)ZdU(w*8%LC-Sw?f&!=s6kDBi!w1iOoT6#zxc%pG00Pvk7m&J_|*j%h5mJoj;ULzhN1`zecdSV-)LzUPX z&e#K1)@2@J{NIl2ZPtvXzn%3Gl}^u3M?azmv51&NbRIsE5w>vxC)-?HYx6O(3^6fY9zeO#J?sM?+t@YT~~{0-X;PNZe0o zBWDq}5j%*zgpTQ||Bd0)n7<)!mwB4lY0oXif7$$TOtg8bRsUCb#pZY5T$_t&#G}Lk zVlkn&YAx{y(Rn!Kof&TUT|Sz8H}OwmCecFlA_fvVUi2_Sus<=@wjZ=E#1x{4_zRIk zxX-ca%Fg|0>rwDHjy6wSycVh1jw=$#It;%e0mlS>C z9`Y4L-#*$`S~G9kaehmyopasta \n" +" tai olla yhteydessä kyseistä virkaa tänä vuonna toimittavaan " +"henkilöön." +msgstr "" +"Express your interest in the guild for the next year.\n" +"This list contains both board and non-board positions, categorized by area " +"of responsibility.\n" +"If you have anything to ask about the positions, seek out people who have " +"held that position before or contact the board.\n" +"Best positions to consider for English speaking people are in the " +"International category." + +#: kaehmy/templates/kaehmy.html:23 +msgid "" +"Muista, että kaehmyn lähettäminen on kiinnostuksen ilmaus \n" +" eikä siis missään nimessä sitova ilmoittautumien mihinkään " +"tehtävään!" +msgstr "" +"Note, that sending an application is not binding and should be considered as " +"a gesture of interest." + +#: kaehmy/templates/kaehmy.html:26 +msgid "Päivämääriä & deadlineja" +msgstr "Dates and deadlines" + +#: kaehmy/templates/kaehmy.html:28 +msgid "Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!)" +msgstr "Board panel discussion (applications to the board before this date!)" + +#: kaehmy/templates/kaehmy.html:29 +msgid "Vaalikokous, osa 1 (puheenjohtajan valinta)" +msgstr "Election meeting, part 1 (chairman election)" + +#: kaehmy/templates/kaehmy.html:30 +msgid "Vaalikokous, osa 2 (hallituksen valinta)" +msgstr "Election meeting, part 2 (board election)" + +#: kaehmy/templates/kaehmy.html:31 +msgid "Kiltailta" +msgstr "Guild night" + +#: kaehmy/templates/kaehmy.html:32 +msgid "Haku toimariksi olisi hyvä tehdä ennen tätä!" +msgstr "Deadline to apply as a non-board official!" + +#: kaehmy/templates/kaehmy.html:33 +msgid "Vaalikokous, osa 3 (toimarien valinta)" +msgstr "Election meeting, part 3 (non-board election)" + +#: kaehmy/templates/kaehmy.html:77 members/templates/settings.html:23 +msgid "Submit" +msgstr "Submit" + +#: kaehmy/templates/list.html:24 kaehmy/templates/list.html:59 +msgid "All kaehmys" +msgstr "All applications" + +#: kaehmy/templates/list.html:32 +msgid "Commenting on post by " +msgstr "" + +#: kaehmy/templates/list.html:44 +msgid "Comment" +msgstr "" + +#: kaehmy/templates/list.html:48 members/templates/application_index.html:15 +#: members/templates/member_add_many.html:55 +#: members/templates/member_add_many_confirm.html:22 +#: templates/password_reset/recovery_form.html:10 +msgid "Send" +msgstr "Send" + +#: kaehmy/templates/list.html:57 +msgid "Filter kaehmys" +msgstr "Filter kaehmys" + +#: kaehmy/templates/list.html:70 kaehmy/templates/statistics.html:18 +msgid "Total kaehmys:" +msgstr "Total applications:" + +#: kaehmy/templates/list.html:88 +msgid "Show comments" +msgstr "" + +#: kaehmy/templates/list.html:94 +msgid "Add comment" +msgstr "" + +#: kaehmy/templates/message.html:11 +msgid "Reply" +msgstr "" + +#: kaehmy/templates/navigation.html:7 +msgid "List kaehmys" +msgstr "List applications" + +#: kaehmy/templates/navigation.html:8 +msgid "New kaehmy" +msgstr "New application" + +#: kaehmy/templates/navigation.html:9 kaehmy/templates/statistics.html:13 +msgid "Statistics" +msgstr "" + #: members/forms.py:107 members/models.py:103 members/tables.py:32 msgid "Member" msgstr "Member" @@ -191,12 +454,6 @@ msgstr "First name" msgid "Last name" msgstr "Last name" -#: members/models.py:16 webapp/models.py:144 -#: webapp/templates/form_listAll.html:40 -#: webapp/templates/kaehmy/kaehmy_list.html:40 -msgid "Email" -msgstr "Email" - #: members/models.py:17 msgid "Place of residence" msgstr "Place of residence" @@ -234,8 +491,8 @@ msgstr "Bank transfer" msgid "Created" msgstr "Created" -#: members/models.py:104 members/templates/member_add_many_confirm.html:12 -#: members/templates/members_base.html:52 +#: members/models.py:104 members/templates/base.html:52 +#: members/templates/member_add_many_confirm.html:12 msgid "Members" msgstr "Members" @@ -269,27 +526,18 @@ msgstr "Accept" msgid "Decline" msgstr "Decline" -#: members/templates/application_index.html:8 +#: members/templates/application_index.html:7 msgid "Killan jäseneksi liittyminen on helppoa ja hauskaa!" msgstr "Joining the guild is fun and games!" -#: members/templates/application_index.html:9 +#: members/templates/application_index.html:8 msgid "Täytä vain alla oleva lomake" msgstr "Just fill the form below." -#: members/templates/application_index.html:10 +#: members/templates/application_index.html:9 msgid "Muista myös maksaa jäsenmaksusi!" msgstr "Don't forget to pay your membership fee!" -#: members/templates/application_index.html:16 -#: members/templates/member_add_many.html:55 -#: members/templates/member_add_many_confirm.html:22 -#: templates/password_reset/recovery_form.html:10 -#: webapp/templates/form_listAll.html:48 -#: webapp/templates/kaehmy/kaehmy_list.html:48 -msgid "Send" -msgstr "Send" - #: members/templates/application_list.html:8 msgid "Member applications" msgstr "Member applications" @@ -307,10 +555,56 @@ msgstr "Amazing! Your membership application has been sent." msgid "Takaisin Sähköinsinöörikillan web-sivuille" msgstr "Back to the front page" -#: members/templates/member_add.html:8 members/templates/members_base.html:55 +#: members/templates/base.html:15 members/templates/member_list.html:11 +#: webapp/templates/index.html:25 +msgid "Member register" +msgstr "Member register" + +#: members/templates/base.html:33 members/templates/base.html:42 +msgid "Member register of SIK ry" +msgstr "Member register of SIK ry" + +#: members/templates/base.html:54 +msgid "List members" +msgstr "List members" + +#: members/templates/base.html:55 members/templates/member_add.html:8 msgid "Add member" msgstr "Add member" +#: members/templates/base.html:56 +msgid "Add multiple" +msgstr "Add multiple" + +#: members/templates/base.html:60 +#: members/templates/member_add_many_confirm.html:16 +msgid "Payments" +msgstr "Payments" + +#: members/templates/base.html:62 +msgid "List payments" +msgstr "List payments" + +#: members/templates/base.html:63 members/templates/payment_add.html:13 +msgid "Add payment" +msgstr "Add payment" + +#: members/templates/base.html:67 +msgid "Applications" +msgstr "Applications" + +#: members/templates/base.html:69 +msgid "List applications" +msgstr "List applications" + +#: members/templates/base.html:70 +msgid "Application form" +msgstr "Application form" + +#: members/templates/base.html:75 members/templates/settings.html:11 +msgid "Settings" +msgstr "Settings" + #: members/templates/member_add.html:15 members/templates/member_edit.html:18 #: members/templates/payment_add.html:20 members/templates/payment_edit.html:18 msgid "Save" @@ -388,11 +682,6 @@ msgstr "" msgid "Confirm adding these entries?" msgstr "Confirm adding these entries?" -#: members/templates/member_add_many_confirm.html:16 -#: members/templates/members_base.html:60 -msgid "Payments" -msgstr "Payments" - #: members/templates/member_delete_confirm.html:9 msgid "Are you sure you want to delete this member?" msgstr "Are you sure you want to delete this member?" @@ -401,11 +690,6 @@ msgstr "Are you sure you want to delete this member?" msgid "Edit member" msgstr "Edit member" -#: members/templates/member_list.html:11 members/templates/members_base.html:15 -#: webapp/templates/main_index.html:25 -msgid "Member register" -msgstr "Member register" - #: members/templates/member_list.html:21 msgid "Members in register:" msgstr "Members in register:" @@ -418,43 +702,6 @@ msgstr "Search" msgid "Showing results for" msgstr "Showing results for" -#: members/templates/members_base.html:33 -#: members/templates/members_base.html:42 -msgid "Member register of SIK ry" -msgstr "Member register of SIK ry" - -#: members/templates/members_base.html:54 -msgid "List members" -msgstr "List members" - -#: members/templates/members_base.html:56 -msgid "Add multiple" -msgstr "Add multiple" - -#: members/templates/members_base.html:62 -msgid "List payments" -msgstr "List payments" - -#: members/templates/members_base.html:63 members/templates/payment_add.html:13 -msgid "Add payment" -msgstr "Add payment" - -#: members/templates/members_base.html:67 -msgid "Applications" -msgstr "Applications" - -#: members/templates/members_base.html:69 -msgid "List applications" -msgstr "List applications" - -#: members/templates/members_base.html:70 -msgid "Application form" -msgstr "Application form" - -#: members/templates/members_base.html:75 members/templates/settings.html:11 -msgid "Settings" -msgstr "Settings" - #: members/templates/payment_delete_confirm.html:9 msgid "Are you sure you want to delete this payment?" msgstr "Are you sure you want to delete this payment?" @@ -475,18 +722,14 @@ msgstr "Payments in register:" msgid "Language" msgstr "Language" -#: members/templates/settings.html:20 sikweb/base.py:226 +#: members/templates/settings.html:20 sikweb/base.py:232 msgid "Finnish" msgstr "Finnish" -#: members/templates/settings.html:21 sikweb/base.py:227 +#: members/templates/settings.html:21 sikweb/base.py:233 msgid "English" msgstr "English" -#: members/templates/settings.html:23 webapp/templates/kaehmy/kaehmy.html:77 -msgid "Submit" -msgstr "Submit" - #: members/views/applications.py:51 members/views/applications.py:112 #: members/views/applications.py:137 msgid "No application id specified" @@ -571,38 +814,116 @@ msgstr "Could not update payment object" msgid "Missing CSV file" msgstr "Missing CSV file" +#: ohlhafv/models.py:16 +msgid "Ohlhafv" +msgstr "Øhlhäfv" + +#: ohlhafv/models.py:23 +msgid "Ohlhafv challenge" +msgstr "" + +#: ohlhafv/models.py:24 +msgid "Ohlhafv challenges" +msgstr "" + +#: ohlhafv/models.py:30 +msgid "Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)" +msgstr "" + +#: ohlhafv/models.py:33 +msgid "Challenger" +msgstr "" + +#: ohlhafv/models.py:34 +msgid "Victim" +msgstr "" + +#: ohlhafv/models.py:35 +msgid "Challenger email" +msgstr "" + +#: ohlhafv/models.py:36 +msgid "Victim email" +msgstr "" + +#: ohlhafv/models.py:37 +msgid "Series" +msgstr "" + +#: ohlhafv/models.py:42 +msgid "Ohlhafv challenge: {} vs. {}" +msgstr "" + +#: ohlhafv/templates/email.html:2 +msgid "Moikka" +msgstr "Hi" + +#: ohlhafv/templates/email.html:4 +msgid "on haastanut sinut oluenjuontimittelöön" +msgstr "has challenged you to a beer drinking contest" + +#: ohlhafv/templates/email.html:4 +msgid "-sarjassa" +msgstr "series" + +#: ohlhafv/templates/email.html:6 +msgid "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 15.3" +msgstr "Remeber to confirm the challenge at Smökki on Thursday 15.3. at the event" + +#: ohlhafv/templates/email.html:8 +msgid "Käy kurkkaamassa muutkin haasteet osoitteessa" +msgstr "Also go and check other challenges at" + +#: ohlhafv/templates/list.html:8 +msgid "All challenges" +msgstr "All challenges" + +#: ohlhafv/templates/list.html:12 +msgid "Total challenges:" +msgstr "Total challenges:" + +#: ohlhafv/templates/navigation.html:5 +msgid "New challenge" +msgstr "" + +#: ohlhafv/templates/navigation.html:6 +msgid "List challenges" +msgstr "All challenges" + +#: ohlhafv/templates/new.html:12 +msgid "Challenge your foe(s) to combat!" +msgstr "" + +#: ohlhafv/templates/new.html:19 +msgid "Challenge" +msgstr "Challenge" + +#: ohlhafv/views.py:43 +msgid "Sinut on haastettu Øhlhäfviin!" +msgstr "You have been challenged at Ohlhafv!" + #: templates/admin/base_site.html:43 msgid "Go" msgstr "Go" -#: templates/base.html:14 templates/footer.html:10 -#: webapp/templates/form_base.html:14 -#: webapp/templates/kaehmy/kaehmy_base.html:14 -#: webapp/templates/main_index.html:9 +#: templates/footer.html:10 templates/project.html:15 +#: webapp/templates/index.html:9 msgid "Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Aalto-yliopiston Sähköinsinöörikilta ry" -#: templates/error.html:8 webapp/templates/kaehmy/kaehmy_error.html:8 -msgid "Error" -msgstr "Error" - -#: templates/error.html:15 webapp/templates/kaehmy/kaehmy_error.html:15 -msgid "Back" -msgstr "Back" - -#: templates/login.html:8 templates/login.html:9 +#: templates/login.html:12 templates/login.html:13 msgid "Username" msgstr "Username" -#: templates/login.html:12 templates/login.html:13 +#: templates/login.html:16 templates/login.html:17 msgid "Password" msgstr "Password" -#: templates/login.html:16 +#: templates/login.html:20 msgid "Forgot password?" msgstr "Forgot password?" -#: templates/login.html:22 +#: templates/login.html:26 msgid "Log in" msgstr "Log in" @@ -653,30 +974,6 @@ msgstr "" "An email was sent to %(email)s %(ago)s ago. Use the link in " "it to set a new password." -#: webapp/forms.py:38 -msgid "Email (not public)" -msgstr "Email (not public)" - -#: webapp/forms.py:39 -msgid "Phone number (not public)" -msgstr "Phone number (not public)" - -#: webapp/forms.py:44 -msgid "Custom roles" -msgstr "Custom roles" - -#: webapp/forms.py:52 webapp/templates/kaehmy/kaehmy.html:41 -msgid "Preset roles" -msgstr "Preset roles" - -#: webapp/forms.py:76 -msgid "Invalid phone number" -msgstr "Invalid phone number" - -#: webapp/forms.py:84 -msgid "Custom role with the same name already exists." -msgstr "Custom role with the same name already exists." - #: webapp/models.py:17 msgid "Webapp" msgstr "Webapp" @@ -783,10 +1080,6 @@ msgstr "Alumni relations" msgid "Others" msgstr "" -#: webapp/models.py:111 webapp/models.py:191 -msgid "Board member" -msgstr "Board member" - #: webapp/models.py:112 msgid "Category" msgstr "" @@ -799,146 +1092,26 @@ msgstr "board member" msgid "Description" msgstr "Description" -#: webapp/models.py:129 -msgid "Preset kaehmy role" -msgstr "Preset kaehmy role" - -#: webapp/models.py:130 -msgid "Preset kaehmy roles" -msgstr "Preset kaehmy roles" - -#: webapp/models.py:137 -msgid "Custom kaehmy role" -msgstr "Custom kaehmy role" - -#: webapp/models.py:138 -msgid "Custom kaehmy roles" -msgstr "Custom kaehmy roles" - -#: webapp/models.py:145 -msgid "Timestamp" -msgstr "" - -#: webapp/models.py:159 -msgid "Kaehmykommentti" -msgstr "Kaehmy comment" - -#: webapp/models.py:160 -msgid "Kaehmykommentit" -msgstr "Kaehmy comments" - -#: webapp/models.py:162 webapp/models.py:290 -msgid "Message" -msgstr "" - -#: webapp/models.py:181 webapp/templates/kaehmy/kaehmy.html:12 -msgid "Kaehmylomake" -msgstr "Kaehmy application" - -#: webapp/models.py:182 -msgid "Kaehmylomakkeet" -msgstr "Kaehmy applications" - -#: webapp/models.py:185 webapp/models.py:267 -msgid "Phone number" -msgstr "" - -#: webapp/models.py:186 -msgid "Year" -msgstr "" - -#: webapp/models.py:187 -msgid "Text" -msgstr "" - -#: webapp/models.py:189 -msgid "Custom role name" -msgstr "" - -#: webapp/models.py:199 -msgid "Kaehmy application: {}" -msgstr "Kaehmy application: {}" - -#: webapp/models.py:221 -msgid "Board: {}" -msgstr "" - -#: webapp/models.py:227 -msgid "Official: {}" -msgstr "" - -#: webapp/models.py:250 +#: webapp/models.py:136 msgid "Role" msgstr "" -#: webapp/models.py:251 webapp/tables.py:18 -msgid "Roles" -msgstr "" - -#: webapp/models.py:253 +#: webapp/models.py:139 msgid "Start date" msgstr "" -#: webapp/models.py:254 +#: webapp/models.py:140 msgid "End date" msgstr "" -#: webapp/models.py:264 +#: webapp/models.py:150 msgid "Official" msgstr "" -#: webapp/models.py:265 +#: webapp/models.py:151 msgid "Officials" msgstr "" -#: webapp/models.py:275 -msgid "Ohlhafv challenge" -msgstr "" - -#: webapp/models.py:276 -msgid "Ohlhafv challenges" -msgstr "" - -#: webapp/models.py:282 -msgid "Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)" -msgstr "" - -#: webapp/models.py:285 -msgid "Challenger" -msgstr "" - -#: webapp/models.py:286 -msgid "Victim" -msgstr "" - -#: webapp/models.py:287 -msgid "Challenger email" -msgstr "" - -#: webapp/models.py:288 -msgid "Victim email" -msgstr "" - -#: webapp/models.py:289 -msgid "Series" -msgstr "" - -#: webapp/models.py:294 -msgid "Ohlhafv challenge: {} vs. {}" -msgstr "" - -#: webapp/models.py:302 -msgid "Telegram channel" -msgstr "" - -#: webapp/models.py:303 -msgid "Telegram channels" -msgstr "" - -#: webapp/templates/admin_index.html:6 -msgid "SIK Admin" -msgstr "SIK Admin" - #: webapp/templates/contact.html:10 webapp/templates/navigation.html:21 msgid "Contact" msgstr "Contact" @@ -947,161 +1120,30 @@ msgstr "Contact" msgid "Event calendar" msgstr "Event calendar" -#: webapp/templates/form_listAll.html:24 webapp/templates/form_listAll.html:59 -#: webapp/templates/kaehmy/kaehmy_list.html:24 -#: webapp/templates/kaehmy/kaehmy_list.html:59 -msgid "All kaehmys" -msgstr "All applications" - -#: webapp/templates/form_listAll.html:32 -#: webapp/templates/kaehmy/kaehmy_list.html:32 -msgid "Commenting on post by " -msgstr "" - -#: webapp/templates/form_listAll.html:44 -#: webapp/templates/kaehmy/kaehmy_list.html:44 -msgid "Comment" -msgstr "" - -#: webapp/templates/form_listAll.html:57 -#: webapp/templates/kaehmy/kaehmy_list.html:57 -msgid "Filter kaehmys" -msgstr "Filter kaehmys" - -#: webapp/templates/form_listAll.html:70 -#: webapp/templates/kaehmy/kaehmy_list.html:70 -#: webapp/templates/kaehmy/kaehmy_statistics.html:18 -msgid "Total kaehmys:" -msgstr "Total applications:" - -#: webapp/templates/form_listAll.html:88 -#: webapp/templates/kaehmy/kaehmy_list.html:88 -msgid "Show comments" -msgstr "" - -#: webapp/templates/form_listAll.html:94 -#: webapp/templates/kaehmy/kaehmy_list.html:94 -msgid "Add comment" -msgstr "" - #: webapp/templates/guild.html:10 msgid "Kilta" msgstr "Guild" -#: webapp/templates/jobs.html:10 webapp/templates/navigation.html:28 -msgid "Jobs" -msgstr "Jobs" - -#: webapp/templates/kaehmy/kaehmy.html:16 -msgid "" -"Kaehmykoneella voit ilmaista kiinnostuksesi toimia killassa ensi vuonna.\n" -" Listassa on vastuualueittain sekä hallitus- että " -"toimihenkilövirkoja.\n" -" Koska lista ei ole koskaan täydellinen, voit myös ehdottaa ihan " -"uutta toimenkuvaa.\n" -" Jos sinulla on kysyttävää mistä tahansa virasta, kannattaa " -"konsultoida kaehmyopasta \n" -" tai olla yhteydessä kyseistä virkaa tänä vuonna toimittavaan " -"henkilöön." -msgstr "" -"Express your interest in the guild for the next year.\n" -"This list contains both board and non-board positions, categorized by area " -"of responsibility.\n" -"If you have anything to ask about the positions, seek out people who have " -"held that position before or contact the board.\n" -"Best positions to consider for English speaking people are in the " -"International category." - -#: webapp/templates/kaehmy/kaehmy.html:23 -msgid "" -"Muista, että kaehmyn lähettäminen on kiinnostuksen ilmaus \n" -" eikä siis missään nimessä sitova ilmoittautumien mihinkään " -"tehtävään!" -msgstr "" -"Note, that sending an application is not binding and should be considered as " -"a gesture of interest." - -#: webapp/templates/kaehmy/kaehmy.html:26 -msgid "Päivämääriä & deadlineja" -msgstr "Dates and deadlines" - -#: webapp/templates/kaehmy/kaehmy.html:28 -msgid "Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!)" -msgstr "Board panel discussion (applications to the board before this date!)" - -#: webapp/templates/kaehmy/kaehmy.html:29 -msgid "Vaalikokous, osa 1 (puheenjohtajan valinta)" -msgstr "Election meeting, part 1 (chairman election)" - -#: webapp/templates/kaehmy/kaehmy.html:30 -msgid "Vaalikokous, osa 2 (hallituksen valinta)" -msgstr "Election meeting, part 2 (board election)" - -#: webapp/templates/kaehmy/kaehmy.html:31 -msgid "Kiltailta" -msgstr "Guild night" - -#: webapp/templates/kaehmy/kaehmy.html:32 -msgid "Haku toimariksi olisi hyvä tehdä ennen tätä!" -msgstr "Deadline to apply as a non-board official!" - -#: webapp/templates/kaehmy/kaehmy.html:33 -msgid "Vaalikokous, osa 3 (toimarien valinta)" -msgstr "Election meeting, part 3 (non-board election)" - -#: webapp/templates/kaehmy/kaehmy_export.html:9 -msgid "All applications" -msgstr "All applications" - -#: webapp/templates/kaehmy/kaehmy_export.html:13 -msgid "Board applications" -msgstr "Board applications" - -#: webapp/templates/kaehmy/kaehmy_export.html:18 -msgid "Non-board applications" -msgstr "Non-board applications" - -#: webapp/templates/kaehmy/kaehmy_export.html:23 -msgid "Front page" -msgstr "" - -#: webapp/templates/kaehmy/kaehmy_footer.html:23 -msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" -msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" - -#: webapp/templates/kaehmy/kaehmy_message.html:11 -msgid "Reply" -msgstr "" - -#: webapp/templates/kaehmy/kaehmy_navigation.html:6 -msgid "List kaehmys" -msgstr "List applications" - -#: webapp/templates/kaehmy/kaehmy_navigation.html:7 -msgid "New kaehmy" -msgstr "New application" - -#: webapp/templates/kaehmy/kaehmy_navigation.html:8 -#: webapp/templates/kaehmy/kaehmy_statistics.html:13 -msgid "Statistics" -msgstr "" - -#: webapp/templates/main_index.html:14 +#: webapp/templates/index.html:14 msgid "This site is not yet ready." msgstr "" -#: webapp/templates/main_index.html:19 +#: webapp/templates/index.html:19 msgid "Are you perhaps looking for one of the following?" msgstr "" -#: webapp/templates/main_index.html:24 +#: webapp/templates/index.html:24 msgid "Infoscreen admin pane" msgstr "Infoscreen Admin Pane" -#: webapp/templates/main_index.html:26 +#: webapp/templates/index.html:26 msgid "Kaehmy application" msgstr "Kaehmy application" +#: webapp/templates/jobs.html:10 webapp/templates/navigation.html:28 +msgid "Jobs" +msgstr "Jobs" + #: webapp/templates/navigation.html:6 msgid "Guild" msgstr "Guild" @@ -1114,35 +1156,8 @@ msgstr "Sössö" msgid "Corporate" msgstr "Corporate" -#: webapp/templates/ohlhafv/list.html:8 -msgid "All challenges" -msgstr "All challenges" - -#: webapp/templates/ohlhafv/list.html:12 -msgid "Total challenges:" -msgstr "Total challenges:" - -#: webapp/templates/ohlhafv/navigation.html:6 -msgid "New challenge" -msgstr "" - -#: webapp/templates/ohlhafv/navigation.html:7 -msgid "List challenges" -msgstr "All challenges" - -#: webapp/templates/ohlhafv/new.html:12 -msgid "Challenge your foe(s) to combat!" -msgstr "" - -#: webapp/templates/ohlhafv/new.html:19 -msgid "Challenge" -msgstr "Challenge" - -#~ msgid "Ohlhafv" -#~ msgstr "Øhlhäfv" - -#~ msgid "Infoscreen" -#~ msgstr "Infoscreen" +#~ msgid "SIK Admin" +#~ msgstr "SIK Admin" #~ msgid "Admin tools" #~ msgstr "Admin tools" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index a6cc859d0672595ff317a591791a6706d4e9cb53..4d7e2c0456855eaacf5cbc8ff7712aebc52a079b 100644 GIT binary patch delta 5586 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 A`~Uy| diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index a2c3441..25e2c60 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/locale/fi/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-25 21:32+0200\n" +"POT-Creation-Date: 2018-01-30 15:54+0200\n" "PO-Revision-Date: 2017-11-02 23:04+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -50,128 +50,398 @@ msgstr "HSL-aikataulut" msgid "External image" msgstr "Ulkoinen kuva" -#: infoscreen/templates/infoscreen_admin.html:24 -#: members/templates/members_base.html:79 +#: infoscreen/templates/infoscreen_admin.html:10 +#, fuzzy +#| msgid "Infoscreen admin pane" +msgid "Infoscreen admin" +msgstr "Infonäyttöjen hallintapaneeli" + +#: infoscreen/templates/infoscreen_admin.html:26 members/templates/base.html:79 msgid "Log out" msgstr "Kirjaudu ulos" -#: infoscreen/templates/infoscreen_admin.html:31 +#: infoscreen/templates/infoscreen_admin.html:33 msgid "Infoscreen Admin Pane" msgstr "Infonäyttöjen hallintapaneeli" -#: infoscreen/templates/infoscreen_admin.html:35 +#: infoscreen/templates/infoscreen_index.html:8 +msgid "Infoscreen" +msgstr "Infonäyttö" + +#: infoscreen/templates/nav.html:5 msgid "Manage Slides" msgstr "Hallinnoi dioja" -#: infoscreen/templates/infoscreen_admin.html:37 +#: infoscreen/templates/nav.html:9 msgid "Manage Rotations" msgstr "Hallinnoi Rotaatioita" -#: infoscreen/templates/infoscreen_admin.html:41 +#: infoscreen/templates/nav.html:14 msgid "Create/Delete" msgstr "Lisää/Poista" -#: infoscreen/templates/infoscreen_admin.html:48 -msgid "Create new item" -msgstr "Luo uusi dia" +#: infoscreen/templates/tabs/add_remove.html:5 +msgid "Rotations" +msgstr "Rotaatiot" -#: infoscreen/templates/infoscreen_admin.html:49 -msgid "Create a new item by type" -msgstr "Luo uusi dia tyypin perusteella" +#: infoscreen/templates/tabs/add_remove.html:7 +msgid "Select rotation to edit" +msgstr "Valitse muokattava rotaatio" -#: infoscreen/templates/infoscreen_admin.html:52 -msgid "Item type" -msgstr "Diatyyppi" +#: infoscreen/templates/tabs/add_remove.html:11 +#: infoscreen/templates/tabs/rotations.html:28 +msgid "Rotation" +msgstr "Rotaatio" -#: infoscreen/templates/infoscreen_admin.html:63 -#: infoscreen/templates/infoscreen_admin.html:83 -msgid "Info items" -msgstr "Diat" +#: infoscreen/templates/tabs/add_remove.html:12 +msgid "id" +msgstr "id" -#: infoscreen/templates/infoscreen_admin.html:64 -#: infoscreen/templates/infoscreen_admin.html:84 -msgid "Infoitems available for rotations" -msgstr "Rotaatioon lisättävät diat" +#: infoscreen/templates/tabs/add_remove.html:13 +#: infoscreen/templates/tabs/add_remove.html:19 +#: infoscreen/templates/tabs/rotations.html:29 +msgid "Preview" +msgstr "Esikatsele" -#: infoscreen/templates/infoscreen_admin.html:67 -#: infoscreen/templates/infoscreen_admin.html:87 -msgid "Item" -msgstr "Dia" - -#: infoscreen/templates/infoscreen_admin.html:68 -#: infoscreen/templates/infoscreen_admin.html:88 -msgid "Type" -msgstr "Tyyppi" - -#: infoscreen/templates/infoscreen_admin.html:69 -#: infoscreen/templates/infoscreen_admin.html:74 -#: infoscreen/templates/infoscreen_admin.html:91 -#: infoscreen/templates/infoscreen_admin.html:98 -#: infoscreen/templates/infoscreen_admin.html:111 -#: infoscreen/templates/infoscreen_admin.html:115 -#: infoscreen/templates/infoscreen_admin.html:131 -#: infoscreen/templates/infoscreen_admin.html:137 +#: infoscreen/templates/tabs/add_remove.html:14 +#: infoscreen/templates/tabs/add_remove.html:20 +#: infoscreen/templates/tabs/rotations.html:13 +#: infoscreen/templates/tabs/rotations.html:20 +#: infoscreen/templates/tabs/rotations.html:36 +#: infoscreen/templates/tabs/rotations.html:40 +#: infoscreen/templates/tabs/slides.html:27 +#: infoscreen/templates/tabs/slides.html:32 #: members/templates/member_edit.html:20 members/templates/payment_edit.html:20 msgid "Delete" msgstr "Poista" -#: infoscreen/templates/infoscreen_admin.html:89 -msgid "Set duration" -msgstr "Aseta kesto" - -#: infoscreen/templates/infoscreen_admin.html:90 -msgid "Add to rotation" -msgstr "Lisää rotaatioon" - -#: infoscreen/templates/infoscreen_admin.html:97 -msgid "Add" -msgstr "Lisää" - -#: infoscreen/templates/infoscreen_admin.html:105 -#: infoscreen/templates/infoscreen_admin.html:128 -msgid "Rotation" -msgstr "Rotaatio" - -#: infoscreen/templates/infoscreen_admin.html:105 -#: infoscreen/templates/infoscreen_admin.html:130 -#: infoscreen/templates/infoscreen_admin.html:136 -msgid "Preview" -msgstr "Esikatsele" - -#: infoscreen/templates/infoscreen_admin.html:106 -msgid "Instances in currently selected rotation" -msgstr "Nykyisen rotaation diat" - -#: infoscreen/templates/infoscreen_admin.html:109 -msgid "Instance" -msgstr "Dia" - -#: infoscreen/templates/infoscreen_admin.html:110 -msgid "Duration" -msgstr "Kesto" - -#: infoscreen/templates/infoscreen_admin.html:122 -msgid "Rotations" -msgstr "Rotaatiot" - -#: infoscreen/templates/infoscreen_admin.html:124 -msgid "Select rotation to edit" -msgstr "Valitse muokattava rotaatio" - -#: infoscreen/templates/infoscreen_admin.html:129 -msgid "id" -msgstr "id" - -#: infoscreen/templates/infoscreen_admin.html:140 webapp/models.py:110 -#: webapp/models.py:143 webapp/templates/form_listAll.html:36 -#: webapp/templates/kaehmy/kaehmy_list.html:36 +#: infoscreen/templates/tabs/add_remove.html:23 kaehmy/models.py:39 +#: kaehmy/templates/list.html:36 webapp/models.py:110 msgid "Name" msgstr "Nimi" -#: infoscreen/templates/infoscreen_admin.html:141 +#: infoscreen/templates/tabs/add_remove.html:24 msgid "Create new" msgstr "Luo uusi" +#: infoscreen/templates/tabs/rotations.html:5 +#: infoscreen/templates/tabs/slides.html:21 +msgid "Info items" +msgstr "Diat" + +#: infoscreen/templates/tabs/rotations.html:6 +#: infoscreen/templates/tabs/slides.html:22 +msgid "Infoitems available for rotations" +msgstr "Rotaatioon lisättävät diat" + +#: infoscreen/templates/tabs/rotations.html:9 +#: infoscreen/templates/tabs/slides.html:25 +msgid "Item" +msgstr "Dia" + +#: infoscreen/templates/tabs/rotations.html:10 +#: infoscreen/templates/tabs/slides.html:26 +msgid "Type" +msgstr "Tyyppi" + +#: infoscreen/templates/tabs/rotations.html:11 +msgid "Set duration" +msgstr "Aseta kesto" + +#: infoscreen/templates/tabs/rotations.html:12 +msgid "Add to rotation" +msgstr "Lisää rotaatioon" + +#: infoscreen/templates/tabs/rotations.html:19 +msgid "Add" +msgstr "Lisää" + +#: infoscreen/templates/tabs/rotations.html:31 +msgid "Instances in currently selected rotation" +msgstr "Nykyisen rotaation diat" + +#: infoscreen/templates/tabs/rotations.html:34 +msgid "Instance" +msgstr "Dia" + +#: infoscreen/templates/tabs/rotations.html:35 +msgid "Duration" +msgstr "Kesto" + +#: infoscreen/templates/tabs/slides.html:6 +msgid "Create new item" +msgstr "Luo uusi dia" + +#: infoscreen/templates/tabs/slides.html:7 +msgid "Create a new item by type" +msgstr "Luo uusi dia tyypin perusteella" + +#: infoscreen/templates/tabs/slides.html:10 +msgid "Item type" +msgstr "Diatyyppi" + +#: kaehmy/forms.py:36 +msgid "Email (not public)" +msgstr "Sähköposti (ei julkinen)" + +#: kaehmy/forms.py:37 +msgid "Phone number (not public)" +msgstr "Puhelinnumero (ei julkinen)" + +#: kaehmy/forms.py:42 +msgid "Custom roles" +msgstr "Uudet virat" + +#: kaehmy/forms.py:50 kaehmy/templates/kaehmy.html:41 +msgid "Preset roles" +msgstr "Kaehmyvirat" + +#: kaehmy/forms.py:72 +msgid "Invalid phone number" +msgstr "Virheellinen puhelinnumero" + +#: kaehmy/forms.py:80 +msgid "Custom role with the same name already exists." +msgstr "Samanniminen virka on jo olemassa." + +#: kaehmy/models.py:18 +#, fuzzy +#| msgid "Kaehmylomake" +msgid "Kaehmy" +msgstr "Kaehmylomake" + +#: kaehmy/models.py:25 +msgid "Preset kaehmy role" +msgstr "Kaehmyvirka" + +#: kaehmy/models.py:26 +msgid "Preset kaehmy roles" +msgstr "Kaehmyvirat" + +#: kaehmy/models.py:33 +msgid "Custom kaehmy role" +msgstr "Uusi virka" + +#: kaehmy/models.py:34 +msgid "Custom kaehmy roles" +msgstr "Uudet kaehmyvirat" + +#: kaehmy/models.py:40 kaehmy/templates/list.html:40 members/models.py:16 +msgid "Email" +msgstr "Sähköposti" + +#: kaehmy/models.py:41 +msgid "Timestamp" +msgstr "Aikaleima" + +#: kaehmy/models.py:55 +msgid "Kaehmykommentti" +msgstr "Kaehmykommentti" + +#: kaehmy/models.py:56 +msgid "Kaehmykommentit" +msgstr "Kaehmykommentit" + +#: kaehmy/models.py:58 ohlhafv/models.py:38 +msgid "Message" +msgstr "Viesti" + +#: kaehmy/models.py:77 kaehmy/templates/kaehmy.html:12 +msgid "Kaehmylomake" +msgstr "Kaehmylomake" + +#: kaehmy/models.py:78 +msgid "Kaehmylomakkeet" +msgstr "Kaehmylomakkeet" + +#: kaehmy/models.py:81 webapp/models.py:153 +msgid "Phone number" +msgstr "Puhelinnumero" + +#: kaehmy/models.py:82 +msgid "Year" +msgstr "Vuosi" + +#: kaehmy/models.py:83 +msgid "Text" +msgstr "Teksti" + +#: kaehmy/models.py:85 +msgid "Custom role name" +msgstr "Uusi virka" + +#: kaehmy/models.py:87 webapp/models.py:111 +msgid "Board member" +msgstr "Hallituksen jäsen" + +#: kaehmy/models.py:95 +msgid "Kaehmy application: {}" +msgstr "Kaehmy: {}" + +#: kaehmy/models.py:117 +msgid "Board: {}" +msgstr "Hallitus: {}" + +#: kaehmy/models.py:123 +msgid "Official: {}" +msgstr "Toimari: {}" + +#: kaehmy/models.py:140 +msgid "Telegram channel" +msgstr "Telegram-kanava" + +#: kaehmy/models.py:141 +msgid "Telegram channels" +msgstr "Telegram-kanavat" + +#: kaehmy/tables.py:13 webapp/models.py:137 +msgid "Roles" +msgstr "Roolit" + +#: kaehmy/templates/error.html:8 templates/error.html:8 +msgid "Error" +msgstr "Virhe" + +#: kaehmy/templates/error.html:15 templates/error.html:15 +msgid "Back" +msgstr "Takaisin" + +#: kaehmy/templates/export.html:9 +msgid "All applications" +msgstr "Kaikki kaehmyt" + +#: kaehmy/templates/export.html:13 +msgid "Board applications" +msgstr "Hallituskaehmyt" + +#: kaehmy/templates/export.html:18 +msgid "Non-board applications" +msgstr "Toimarikaehmyt" + +#: kaehmy/templates/export.html:23 +msgid "Front page" +msgstr "Etusivulle" + +#: kaehmy/templates/footer.html:23 ohlhafv/templates/footer.html:23 +#: webapp/templates/footer.html:23 +msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" +msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" + +#: kaehmy/templates/kaehmy.html:16 +msgid "" +"Kaehmykoneella voit ilmaista kiinnostuksesi toimia killassa ensi vuonna.\n" +" Listassa on vastuualueittain sekä hallitus- että " +"toimihenkilövirkoja.\n" +" Koska lista ei ole koskaan täydellinen, voit myös ehdottaa ihan " +"uutta toimenkuvaa.\n" +" Jos sinulla on kysyttävää mistä tahansa virasta, kannattaa " +"konsultoida kaehmyopasta \n" +" tai olla yhteydessä kyseistä virkaa tänä vuonna toimittavaan " +"henkilöön." +msgstr "" +"Kaehmykoneella voit ilmaista kiinnostuksesi toimia killassa ensi vuonna.\n" +" Listassa on vastuualueittain sekä hallitus- että " +"toimihenkilövirkoja.\n" +" Koska lista ei ole koskaan täydellinen, voit myös ehdottaa ihan " +"uutta toimenkuvaa.\n" +" Jos sinulla on kysyttävää mistä tahansa virasta, kannattaa " +"konsultoida kaehmyopasta \n" +" tai olla yhteydessä kyseistä virkaa tänä vuonna toimittavaan " +"henkilöön." + +#: kaehmy/templates/kaehmy.html:23 +msgid "" +"Muista, että kaehmyn lähettäminen on kiinnostuksen ilmaus \n" +" eikä siis missään nimessä sitova ilmoittautumien mihinkään " +"tehtävään!" +msgstr "" +"Muista, että kaehmyn lähettäminen on kiinnostuksen ilmaus \n" +" eikä siis missään nimessä sitova ilmoittautumien mihinkään " +"tehtävään!" + +#: kaehmy/templates/kaehmy.html:26 +msgid "Päivämääriä & deadlineja" +msgstr "Päivämääriä & deadlineja" + +#: kaehmy/templates/kaehmy.html:28 +msgid "Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!)" +msgstr "Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!)" + +#: kaehmy/templates/kaehmy.html:29 +msgid "Vaalikokous, osa 1 (puheenjohtajan valinta)" +msgstr "Vaalikokous, osa 1 (puheenjohtajan valinta)" + +#: kaehmy/templates/kaehmy.html:30 +msgid "Vaalikokous, osa 2 (hallituksen valinta)" +msgstr "Vaalikokous, osa 2 (hallituksen valinta)" + +#: kaehmy/templates/kaehmy.html:31 +msgid "Kiltailta" +msgstr "Kiltailta" + +#: kaehmy/templates/kaehmy.html:32 +msgid "Haku toimariksi olisi hyvä tehdä ennen tätä!" +msgstr "Haku toimariksi olisi hyvä tehdä ennen tätä!" + +#: kaehmy/templates/kaehmy.html:33 +msgid "Vaalikokous, osa 3 (toimarien valinta)" +msgstr "Vaalikokous, osa 3 (toimarien valinta)" + +#: kaehmy/templates/kaehmy.html:77 members/templates/settings.html:23 +msgid "Submit" +msgstr "Lisää" + +#: kaehmy/templates/list.html:24 kaehmy/templates/list.html:59 +msgid "All kaehmys" +msgstr "Kaikki kaehmyt" + +#: kaehmy/templates/list.html:32 +msgid "Commenting on post by " +msgstr "Kommentoidaan viestiin lähettäjältä " + +#: kaehmy/templates/list.html:44 +msgid "Comment" +msgstr "Kommentti" + +#: kaehmy/templates/list.html:48 members/templates/application_index.html:15 +#: members/templates/member_add_many.html:55 +#: members/templates/member_add_many_confirm.html:22 +#: templates/password_reset/recovery_form.html:10 +msgid "Send" +msgstr "Lähetä" + +#: kaehmy/templates/list.html:57 +msgid "Filter kaehmys" +msgstr "Rajaa kaehmyjä" + +#: kaehmy/templates/list.html:70 kaehmy/templates/statistics.html:18 +msgid "Total kaehmys:" +msgstr "Kaehmyjä yhteensä:" + +#: kaehmy/templates/list.html:88 +msgid "Show comments" +msgstr "Näytä kommentit" + +#: kaehmy/templates/list.html:94 +msgid "Add comment" +msgstr "Kommentoi" + +#: kaehmy/templates/message.html:11 +msgid "Reply" +msgstr "Vastaa" + +#: kaehmy/templates/navigation.html:7 +msgid "List kaehmys" +msgstr "Kaikki kaehmyt" + +#: kaehmy/templates/navigation.html:8 +msgid "New kaehmy" +msgstr "Uusi kaehmy" + +#: kaehmy/templates/navigation.html:9 kaehmy/templates/statistics.html:13 +msgid "Statistics" +msgstr "Kaehmytilastot" + #: members/forms.py:107 members/models.py:103 members/tables.py:32 msgid "Member" msgstr "Jäsen" @@ -192,12 +462,6 @@ msgstr "Etunimi" msgid "Last name" msgstr "Sukunimi" -#: members/models.py:16 webapp/models.py:144 -#: webapp/templates/form_listAll.html:40 -#: webapp/templates/kaehmy/kaehmy_list.html:40 -msgid "Email" -msgstr "Sähköposti" - #: members/models.py:17 msgid "Place of residence" msgstr "Asuinpaikka" @@ -235,8 +499,8 @@ msgstr "Tilisiirto" msgid "Created" msgstr "Lisätty" -#: members/models.py:104 members/templates/member_add_many_confirm.html:12 -#: members/templates/members_base.html:52 +#: members/models.py:104 members/templates/base.html:52 +#: members/templates/member_add_many_confirm.html:12 msgid "Members" msgstr "Jäsenet" @@ -270,27 +534,18 @@ msgstr "Hyväksy" msgid "Decline" msgstr "Hylkää" -#: members/templates/application_index.html:8 +#: members/templates/application_index.html:7 msgid "Killan jäseneksi liittyminen on helppoa ja hauskaa!" msgstr "Killan jäseneksi liittyminen on helppoa ja hauskaa!" -#: members/templates/application_index.html:9 +#: members/templates/application_index.html:8 msgid "Täytä vain alla oleva lomake" msgstr "Täytä vain alla oleva lomake" -#: members/templates/application_index.html:10 +#: members/templates/application_index.html:9 msgid "Muista myös maksaa jäsenmaksusi!" msgstr "Muista myös maksaa jäsenmaksusi!" -#: members/templates/application_index.html:16 -#: members/templates/member_add_many.html:55 -#: members/templates/member_add_many_confirm.html:22 -#: templates/password_reset/recovery_form.html:10 -#: webapp/templates/form_listAll.html:48 -#: webapp/templates/kaehmy/kaehmy_list.html:48 -msgid "Send" -msgstr "Lähetä" - #: members/templates/application_list.html:8 msgid "Member applications" msgstr "Jäsenhakemukset" @@ -308,10 +563,56 @@ msgstr "Hienoa! Jäsenhakemuksesi on nyt lähetetty." msgid "Takaisin Sähköinsinöörikillan web-sivuille" msgstr "Takaisin Sähköinsinöörikillan web-sivuille" -#: members/templates/member_add.html:8 members/templates/members_base.html:55 +#: members/templates/base.html:15 members/templates/member_list.html:11 +#: webapp/templates/index.html:25 +msgid "Member register" +msgstr "Jäsenrekisteri" + +#: members/templates/base.html:33 members/templates/base.html:42 +msgid "Member register of SIK ry" +msgstr "Aalto-yliopiston Sähköinsinöörikilta ry:n jäsenrekisteri" + +#: members/templates/base.html:54 +msgid "List members" +msgstr "Jäsenlistaus" + +#: members/templates/base.html:55 members/templates/member_add.html:8 msgid "Add member" msgstr "Lisää jäsen" +#: members/templates/base.html:56 +msgid "Add multiple" +msgstr "Lisää useita" + +#: members/templates/base.html:60 +#: members/templates/member_add_many_confirm.html:16 +msgid "Payments" +msgstr "Maksutapahtumat" + +#: members/templates/base.html:62 +msgid "List payments" +msgstr "Maksulistaus" + +#: members/templates/base.html:63 members/templates/payment_add.html:13 +msgid "Add payment" +msgstr "Lisää maksu" + +#: members/templates/base.html:67 +msgid "Applications" +msgstr "Jäsenhakemukset" + +#: members/templates/base.html:69 +msgid "List applications" +msgstr "Hakemuslistaus" + +#: members/templates/base.html:70 +msgid "Application form" +msgstr "Jäsenhakemuslomake" + +#: members/templates/base.html:75 members/templates/settings.html:11 +msgid "Settings" +msgstr "Asetukset" + #: members/templates/member_add.html:15 members/templates/member_edit.html:18 #: members/templates/payment_add.html:20 members/templates/payment_edit.html:18 msgid "Save" @@ -387,11 +688,6 @@ msgstr "" msgid "Confirm adding these entries?" msgstr "Vahvista muutokset?" -#: members/templates/member_add_many_confirm.html:16 -#: members/templates/members_base.html:60 -msgid "Payments" -msgstr "Maksutapahtumat" - #: members/templates/member_delete_confirm.html:9 msgid "Are you sure you want to delete this member?" msgstr "Oletko varma, että haluat poistaa tämän jäsenen?" @@ -400,11 +696,6 @@ msgstr "Oletko varma, että haluat poistaa tämän jäsenen?" msgid "Edit member" msgstr "Muokkaa jäsentä" -#: members/templates/member_list.html:11 members/templates/members_base.html:15 -#: webapp/templates/main_index.html:25 -msgid "Member register" -msgstr "Jäsenrekisteri" - #: members/templates/member_list.html:21 msgid "Members in register:" msgstr "Jäseniä:" @@ -417,43 +708,6 @@ msgstr "Hae" msgid "Showing results for" msgstr "Näytetään tulokset haulle" -#: members/templates/members_base.html:33 -#: members/templates/members_base.html:42 -msgid "Member register of SIK ry" -msgstr "Aalto-yliopiston Sähköinsinöörikilta ry:n jäsenrekisteri" - -#: members/templates/members_base.html:54 -msgid "List members" -msgstr "Jäsenlistaus" - -#: members/templates/members_base.html:56 -msgid "Add multiple" -msgstr "Lisää useita" - -#: members/templates/members_base.html:62 -msgid "List payments" -msgstr "Maksulistaus" - -#: members/templates/members_base.html:63 members/templates/payment_add.html:13 -msgid "Add payment" -msgstr "Lisää maksu" - -#: members/templates/members_base.html:67 -msgid "Applications" -msgstr "Jäsenhakemukset" - -#: members/templates/members_base.html:69 -msgid "List applications" -msgstr "Hakemuslistaus" - -#: members/templates/members_base.html:70 -msgid "Application form" -msgstr "Jäsenhakemuslomake" - -#: members/templates/members_base.html:75 members/templates/settings.html:11 -msgid "Settings" -msgstr "Asetukset" - #: members/templates/payment_delete_confirm.html:9 msgid "Are you sure you want to delete this payment?" msgstr "Oletko varma, että haluat poistaa tämän maksutapahtuman?" @@ -474,18 +728,14 @@ msgstr "Maksutapahtumia:" msgid "Language" msgstr "Kieli" -#: members/templates/settings.html:20 sikweb/base.py:226 +#: members/templates/settings.html:20 sikweb/base.py:232 msgid "Finnish" msgstr "suomi" -#: members/templates/settings.html:21 sikweb/base.py:227 +#: members/templates/settings.html:21 sikweb/base.py:233 msgid "English" msgstr "englanti" -#: members/templates/settings.html:23 webapp/templates/kaehmy/kaehmy.html:77 -msgid "Submit" -msgstr "Lisää" - #: members/views/applications.py:51 members/views/applications.py:112 #: members/views/applications.py:137 msgid "No application id specified" @@ -569,38 +819,116 @@ msgstr "Maksutapahtumaobjektia ei voitu päivittää" msgid "Missing CSV file" msgstr "Puuttuva CSV-tiedosto" +#: ohlhafv/models.py:16 +msgid "Ohlhafv" +msgstr "Øhlhäfv" + +#: ohlhafv/models.py:23 +msgid "Ohlhafv challenge" +msgstr "Ohlhafv haaste" + +#: ohlhafv/models.py:24 +msgid "Ohlhafv challenges" +msgstr "Ohlhafv haasteet" + +#: ohlhafv/models.py:30 +msgid "Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)" +msgstr "Joukkuehaaste (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)" + +#: ohlhafv/models.py:33 +msgid "Challenger" +msgstr "Haastaja" + +#: ohlhafv/models.py:34 +msgid "Victim" +msgstr "Uhri" + +#: ohlhafv/models.py:35 +msgid "Challenger email" +msgstr "Haastajan sähköpostiosoite" + +#: ohlhafv/models.py:36 +msgid "Victim email" +msgstr "Uhrin sähköpostiosoite" + +#: ohlhafv/models.py:37 +msgid "Series" +msgstr "Sarja" + +#: ohlhafv/models.py:42 +msgid "Ohlhafv challenge: {} vs. {}" +msgstr "Ohlhafv-haaste: {} vs. {}" + +#: ohlhafv/templates/email.html:2 +msgid "Moikka" +msgstr "" + +#: ohlhafv/templates/email.html:4 +msgid "on haastanut sinut oluenjuontimittelöön" +msgstr "" + +#: ohlhafv/templates/email.html:4 +msgid "-sarjassa." +msgstr "" + +#: ohlhafv/templates/email.html:6 +msgid "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 15.3." +msgstr "" + +#: ohlhafv/templates/email.html:8 +msgid "Käy kurkkaamassa muutkin haasteet osoitteessa" +msgstr "" + +#: ohlhafv/templates/list.html:8 +msgid "All challenges" +msgstr "Kaikki haasteet" + +#: ohlhafv/templates/list.html:12 +msgid "Total challenges:" +msgstr "Haasteita yhteensä:" + +#: ohlhafv/templates/navigation.html:5 +msgid "New challenge" +msgstr "Uusi haaste" + +#: ohlhafv/templates/navigation.html:6 +msgid "List challenges" +msgstr "Kaikki haasteet" + +#: ohlhafv/templates/new.html:12 +msgid "Challenge your foe(s) to combat!" +msgstr "Haasta kaverisi mittelöön!" + +#: ohlhafv/templates/new.html:19 +msgid "Challenge" +msgstr "Haasta" + +#: ohlhafv/views.py:43 +msgid "Sinut on haastettu Øhlhäfviin!" +msgstr "" + #: templates/admin/base_site.html:43 msgid "Go" msgstr "Vaihda" -#: templates/base.html:14 templates/footer.html:10 -#: webapp/templates/form_base.html:14 -#: webapp/templates/kaehmy/kaehmy_base.html:14 -#: webapp/templates/main_index.html:9 +#: templates/footer.html:10 templates/project.html:15 +#: webapp/templates/index.html:9 msgid "Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Aalto-yliopiston Sähköinsinöörikilta ry" -#: templates/error.html:8 webapp/templates/kaehmy/kaehmy_error.html:8 -msgid "Error" -msgstr "Virhe" - -#: templates/error.html:15 webapp/templates/kaehmy/kaehmy_error.html:15 -msgid "Back" -msgstr "Takaisin" - -#: templates/login.html:8 templates/login.html:9 +#: templates/login.html:12 templates/login.html:13 msgid "Username" msgstr "Käyttäjänimi" -#: templates/login.html:12 templates/login.html:13 +#: templates/login.html:16 templates/login.html:17 msgid "Password" msgstr "Salasana" -#: templates/login.html:16 +#: templates/login.html:20 msgid "Forgot password?" msgstr "Unohditko salasanasi?" -#: templates/login.html:22 +#: templates/login.html:26 msgid "Log in" msgstr "Kirjaudu sisään" @@ -650,30 +978,6 @@ msgstr "" "Sähköposti on lähetetty osoitteeseen %(email)s %(ago)s:a " "sitten. Käytä linkkiä asettaaksesi uuden salasanan." -#: webapp/forms.py:38 -msgid "Email (not public)" -msgstr "Sähköposti (ei julkinen)" - -#: webapp/forms.py:39 -msgid "Phone number (not public)" -msgstr "Puhelinnumero (ei julkinen)" - -#: webapp/forms.py:44 -msgid "Custom roles" -msgstr "Uudet virat" - -#: webapp/forms.py:52 webapp/templates/kaehmy/kaehmy.html:41 -msgid "Preset roles" -msgstr "Kaehmyvirat" - -#: webapp/forms.py:76 -msgid "Invalid phone number" -msgstr "Virheellinen puhelinnumero" - -#: webapp/forms.py:84 -msgid "Custom role with the same name already exists." -msgstr "Samanniminen virka on jo olemassa." - #: webapp/models.py:17 msgid "Webapp" msgstr "Nettisivut" @@ -780,10 +1084,6 @@ msgstr "Alumnisuhteet" msgid "Others" msgstr "Muut" -#: webapp/models.py:111 webapp/models.py:191 -msgid "Board member" -msgstr "Hallituksen jäsen" - #: webapp/models.py:112 msgid "Category" msgstr "Kategoria" @@ -796,146 +1096,26 @@ msgstr "hallituksen jäsen" msgid "Description" msgstr "Kuvaus" -#: webapp/models.py:129 -msgid "Preset kaehmy role" -msgstr "Kaehmyvirka" - -#: webapp/models.py:130 -msgid "Preset kaehmy roles" -msgstr "Kaehmyvirat" - -#: webapp/models.py:137 -msgid "Custom kaehmy role" -msgstr "Uusi virka" - -#: webapp/models.py:138 -msgid "Custom kaehmy roles" -msgstr "Uudet kaehmyvirat" - -#: webapp/models.py:145 -msgid "Timestamp" -msgstr "Aikaleima" - -#: webapp/models.py:159 -msgid "Kaehmykommentti" -msgstr "Kaehmykommentti" - -#: webapp/models.py:160 -msgid "Kaehmykommentit" -msgstr "Kaehmykommentit" - -#: webapp/models.py:162 webapp/models.py:290 -msgid "Message" -msgstr "Viesti" - -#: webapp/models.py:181 webapp/templates/kaehmy/kaehmy.html:12 -msgid "Kaehmylomake" -msgstr "Kaehmylomake" - -#: webapp/models.py:182 -msgid "Kaehmylomakkeet" -msgstr "Kaehmylomakkeet" - -#: webapp/models.py:185 webapp/models.py:267 -msgid "Phone number" -msgstr "Puhelinnumero" - -#: webapp/models.py:186 -msgid "Year" -msgstr "Vuosi" - -#: webapp/models.py:187 -msgid "Text" -msgstr "Teksti" - -#: webapp/models.py:189 -msgid "Custom role name" -msgstr "Uusi virka" - -#: webapp/models.py:199 -msgid "Kaehmy application: {}" -msgstr "Kaehmy: {}" - -#: webapp/models.py:221 -msgid "Board: {}" -msgstr "Hallitus: {}" - -#: webapp/models.py:227 -msgid "Official: {}" -msgstr "Toimari: {}" - -#: webapp/models.py:250 +#: webapp/models.py:136 msgid "Role" msgstr "Rooli" -#: webapp/models.py:251 webapp/tables.py:18 -msgid "Roles" -msgstr "Roolit" - -#: webapp/models.py:253 +#: webapp/models.py:139 msgid "Start date" msgstr "Alkupäivämäärä" -#: webapp/models.py:254 +#: webapp/models.py:140 msgid "End date" msgstr "Loppupäivämäärä" -#: webapp/models.py:264 +#: webapp/models.py:150 msgid "Official" msgstr "Toimihenkilö" -#: webapp/models.py:265 +#: webapp/models.py:151 msgid "Officials" msgstr "Toimihenkilöt" -#: webapp/models.py:275 -msgid "Ohlhafv challenge" -msgstr "Ohlhafv haaste" - -#: webapp/models.py:276 -msgid "Ohlhafv challenges" -msgstr "Ohlhafv haasteet" - -#: webapp/models.py:282 -msgid "Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)" -msgstr "Joukkuehaaste (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)" - -#: webapp/models.py:285 -msgid "Challenger" -msgstr "Haastaja" - -#: webapp/models.py:286 -msgid "Victim" -msgstr "Uhri" - -#: webapp/models.py:287 -msgid "Challenger email" -msgstr "Haastajan sähköpostiosoite" - -#: webapp/models.py:288 -msgid "Victim email" -msgstr "Uhrin sähköpostiosoite" - -#: webapp/models.py:289 -msgid "Series" -msgstr "Sarja" - -#: webapp/models.py:294 -msgid "Ohlhafv challenge: {} vs. {}" -msgstr "Ohlhafv-haaste: {} vs. {}" - -#: webapp/models.py:302 -msgid "Telegram channel" -msgstr "Telegram-kanava" - -#: webapp/models.py:303 -msgid "Telegram channels" -msgstr "Telegram-kanavat" - -#: webapp/templates/admin_index.html:6 -msgid "SIK Admin" -msgstr "SIK Hallintapaneeli" - #: webapp/templates/contact.html:10 webapp/templates/navigation.html:21 msgid "Contact" msgstr "Yhteystiedot" @@ -944,164 +1124,30 @@ msgstr "Yhteystiedot" msgid "Event calendar" msgstr "Tapahtumakalenteri" -#: webapp/templates/form_listAll.html:24 webapp/templates/form_listAll.html:59 -#: webapp/templates/kaehmy/kaehmy_list.html:24 -#: webapp/templates/kaehmy/kaehmy_list.html:59 -msgid "All kaehmys" -msgstr "Kaikki kaehmyt" - -#: webapp/templates/form_listAll.html:32 -#: webapp/templates/kaehmy/kaehmy_list.html:32 -msgid "Commenting on post by " -msgstr "Kommentoidaan viestiin lähettäjältä " - -#: webapp/templates/form_listAll.html:44 -#: webapp/templates/kaehmy/kaehmy_list.html:44 -msgid "Comment" -msgstr "Kommentti" - -#: webapp/templates/form_listAll.html:57 -#: webapp/templates/kaehmy/kaehmy_list.html:57 -msgid "Filter kaehmys" -msgstr "Rajaa kaehmyjä" - -#: webapp/templates/form_listAll.html:70 -#: webapp/templates/kaehmy/kaehmy_list.html:70 -#: webapp/templates/kaehmy/kaehmy_statistics.html:18 -msgid "Total kaehmys:" -msgstr "Kaehmyjä yhteensä:" - -#: webapp/templates/form_listAll.html:88 -#: webapp/templates/kaehmy/kaehmy_list.html:88 -msgid "Show comments" -msgstr "Näytä kommentit" - -#: webapp/templates/form_listAll.html:94 -#: webapp/templates/kaehmy/kaehmy_list.html:94 -msgid "Add comment" -msgstr "Kommentoi" - #: webapp/templates/guild.html:10 msgid "Kilta" msgstr "Kilta" -#: webapp/templates/jobs.html:10 webapp/templates/navigation.html:28 -msgid "Jobs" -msgstr "Työpaikat" - -#: webapp/templates/kaehmy/kaehmy.html:16 -msgid "" -"Kaehmykoneella voit ilmaista kiinnostuksesi toimia killassa ensi vuonna.\n" -" Listassa on vastuualueittain sekä hallitus- että " -"toimihenkilövirkoja.\n" -" Koska lista ei ole koskaan täydellinen, voit myös ehdottaa ihan " -"uutta toimenkuvaa.\n" -" Jos sinulla on kysyttävää mistä tahansa virasta, kannattaa " -"konsultoida kaehmyopasta \n" -" tai olla yhteydessä kyseistä virkaa tänä vuonna toimittavaan " -"henkilöön." -msgstr "" -"Kaehmykoneella voit ilmaista kiinnostuksesi toimia killassa ensi vuonna.\n" -" Listassa on vastuualueittain sekä hallitus- että " -"toimihenkilövirkoja.\n" -" Koska lista ei ole koskaan täydellinen, voit myös ehdottaa ihan " -"uutta toimenkuvaa.\n" -" Jos sinulla on kysyttävää mistä tahansa virasta, kannattaa " -"konsultoida kaehmyopasta \n" -" tai olla yhteydessä kyseistä virkaa tänä vuonna toimittavaan " -"henkilöön." - -#: webapp/templates/kaehmy/kaehmy.html:23 -msgid "" -"Muista, että kaehmyn lähettäminen on kiinnostuksen ilmaus \n" -" eikä siis missään nimessä sitova ilmoittautumien mihinkään " -"tehtävään!" -msgstr "" -"Muista, että kaehmyn lähettäminen on kiinnostuksen ilmaus \n" -" eikä siis missään nimessä sitova ilmoittautumien mihinkään " -"tehtävään!" - -#: webapp/templates/kaehmy/kaehmy.html:26 -msgid "Päivämääriä & deadlineja" -msgstr "Päivämääriä & deadlineja" - -#: webapp/templates/kaehmy/kaehmy.html:28 -msgid "Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!)" -msgstr "Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!)" - -#: webapp/templates/kaehmy/kaehmy.html:29 -msgid "Vaalikokous, osa 1 (puheenjohtajan valinta)" -msgstr "Vaalikokous, osa 1 (puheenjohtajan valinta)" - -#: webapp/templates/kaehmy/kaehmy.html:30 -msgid "Vaalikokous, osa 2 (hallituksen valinta)" -msgstr "Vaalikokous, osa 2 (hallituksen valinta)" - -#: webapp/templates/kaehmy/kaehmy.html:31 -msgid "Kiltailta" -msgstr "Kiltailta" - -#: webapp/templates/kaehmy/kaehmy.html:32 -msgid "Haku toimariksi olisi hyvä tehdä ennen tätä!" -msgstr "Haku toimariksi olisi hyvä tehdä ennen tätä!" - -#: webapp/templates/kaehmy/kaehmy.html:33 -msgid "Vaalikokous, osa 3 (toimarien valinta)" -msgstr "Vaalikokous, osa 3 (toimarien valinta)" - -#: webapp/templates/kaehmy/kaehmy_export.html:9 -msgid "All applications" -msgstr "Kaikki kaehmyt" - -#: webapp/templates/kaehmy/kaehmy_export.html:13 -msgid "Board applications" -msgstr "Hallituskaehmyt" - -#: webapp/templates/kaehmy/kaehmy_export.html:18 -msgid "Non-board applications" -msgstr "Toimarikaehmyt" - -#: webapp/templates/kaehmy/kaehmy_export.html:23 -msgid "Front page" -msgstr "Etusivulle" - -#: webapp/templates/kaehmy/kaehmy_footer.html:23 -msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" -msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" - -#: webapp/templates/kaehmy/kaehmy_message.html:11 -msgid "Reply" -msgstr "Vastaa" - -#: webapp/templates/kaehmy/kaehmy_navigation.html:6 -msgid "List kaehmys" -msgstr "Kaikki kaehmyt" - -#: webapp/templates/kaehmy/kaehmy_navigation.html:7 -msgid "New kaehmy" -msgstr "Uusi kaehmy" - -#: webapp/templates/kaehmy/kaehmy_navigation.html:8 -#: webapp/templates/kaehmy/kaehmy_statistics.html:13 -msgid "Statistics" -msgstr "Kaehmytilastot" - -#: webapp/templates/main_index.html:14 +#: webapp/templates/index.html:14 msgid "This site is not yet ready." msgstr "Nämä sivut eivät ole vielä valmiit." -#: webapp/templates/main_index.html:19 +#: webapp/templates/index.html:19 msgid "Are you perhaps looking for one of the following?" msgstr "Etsitkö kenties jotain näistä?" -#: webapp/templates/main_index.html:24 +#: webapp/templates/index.html:24 msgid "Infoscreen admin pane" msgstr "Infonäyttöjen hallintapaneeli" -#: webapp/templates/main_index.html:26 +#: webapp/templates/index.html:26 msgid "Kaehmy application" msgstr "Kaehmy" +#: webapp/templates/jobs.html:10 webapp/templates/navigation.html:28 +msgid "Jobs" +msgstr "Työpaikat" + #: webapp/templates/navigation.html:6 msgid "Guild" msgstr "Kilta" @@ -1114,39 +1160,12 @@ msgstr "Sössö" msgid "Corporate" msgstr "Yritys" -#: webapp/templates/ohlhafv/list.html:8 -msgid "All challenges" -msgstr "Kaikki haasteet" - -#: webapp/templates/ohlhafv/list.html:12 -msgid "Total challenges:" -msgstr "Haasteita yhteensä:" - -#: webapp/templates/ohlhafv/navigation.html:6 -msgid "New challenge" -msgstr "Uusi haaste" - -#: webapp/templates/ohlhafv/navigation.html:7 -msgid "List challenges" -msgstr "Kaikki haasteet" - -#: webapp/templates/ohlhafv/new.html:12 -msgid "Challenge your foe(s) to combat!" -msgstr "Haasta kaverisi mittelöön!" - -#: webapp/templates/ohlhafv/new.html:19 -msgid "Challenge" -msgstr "Haasta" +#~ msgid "SIK Admin" +#~ msgstr "SIK Hallintapaneeli" #~ msgid "Team" #~ msgstr "Joukkue" -#~ msgid "Ohlhafv" -#~ msgstr "Øhlhäfv" - -#~ msgid "Infoscreen" -#~ msgstr "Infonäyttö" - #~ msgid "Admin tools" #~ msgstr "Hallintatyökalut" diff --git a/ohlhafv/templates/email.html b/ohlhafv/templates/email.html new file mode 100644 index 0000000..c948928 --- /dev/null +++ b/ohlhafv/templates/email.html @@ -0,0 +1,8 @@ +{% load i18n %} +{% trans "Moikka" %} {{ challenge.victim }}, + +{{ challenge.challenger }} {% trans "on haastanut sinut oluenjuontimittelöön" %} {{ challenge.get_series_display }} {% trans "-sarjassa" %}! + +{% trans "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 15.3" %}. + +{% trans "Käy kurkkaamassa muutkin haasteet osoitteessa" %} {{ url }} \ No newline at end of file diff --git a/ohlhafv/views.py b/ohlhafv/views.py index 0c99d60..ec1bce9 100644 --- a/ohlhafv/views.py +++ b/ohlhafv/views.py @@ -8,6 +8,8 @@ from django.views.decorators.csrf import ensure_csrf_cookie from django.http import HttpResponse, HttpResponseRedirect from django.contrib.auth.decorators import permission_required, login_required from django.conf import settings +from django.utils.translation import ugettext_lazy as _ +from django.template.loader import render_to_string import logging import requests @@ -16,6 +18,7 @@ from dealer.git import git from ohlhafv.models import OhlhafvChallenge from ohlhafv.forms import OhlhafvForm from ohlhafv.tables import OhlhafvTable +from webapp.utils import send_email @require_http_methods(["GET"]) @@ -32,6 +35,24 @@ def ohlhafv_submit(request, *args, **kwargs): form = OhlhafvForm(request.POST) if form.is_valid(): form.save() + challenge = form.instance + email = form.cleaned_data.get('victim_email', '') + #challenger = form.cleaned_data.get('challenger', 'Anonymous') + #victim = form.cleaned_data.get('victim', 'Anonymous') + #series = form.cleaned_data.get('series', '') + + url = 'https://sika.sahkoinsinoorikilta.fi/ohlhafv/list' + subject = _('Sinut on haastettu Øhlhäfviin!') + + message = render_to_string( + 'ohlhafv:email.html', { + 'challenge': challenge, + 'url': url, + } + ) + send_email(email, subject, message) + logging.debug( + 'Sent ohlhafv email to recipient <{}>'.format(email)) else: pass return HttpResponseRedirect('/ohlhafv/list/')