From d0db00f9ad8389d969ee049832d187aeec34ddbb Mon Sep 17 00:00:00 2001 From: henu Date: Wed, 27 Sep 2017 18:50:45 +0300 Subject: [PATCH 1/8] Add Guild page template --- webapp/templates/guild.html | 5 +++++ webapp/urls.py | 2 ++ webapp/views.py | 9 +++++++++ 3 files changed, 16 insertions(+) create mode 100644 webapp/templates/guild.html diff --git a/webapp/templates/guild.html b/webapp/templates/guild.html new file mode 100644 index 0000000..3570195 --- /dev/null +++ b/webapp/templates/guild.html @@ -0,0 +1,5 @@ +{% load i18n %} + +
+

{% "Kilta" %}

+
diff --git a/webapp/urls.py b/webapp/urls.py index c517fbc..cb847d5 100644 --- a/webapp/urls.py +++ b/webapp/urls.py @@ -10,6 +10,7 @@ from webapp.views import about_view from webapp.views import ohlhafv_view from webapp.views import ohlhafv_submit from webapp.views import ohlhafv_list +from webapp.views import guild_view urlpatterns = [ # main @@ -22,6 +23,7 @@ urlpatterns = [ # git revision url(r'^about', about_view), + url(r'^guild', guild_view), # ohlhafv url(r'^ohlhafv$', ohlhafv_view), diff --git a/webapp/views.py b/webapp/views.py index d398898..5684fbb 100644 --- a/webapp/views.py +++ b/webapp/views.py @@ -63,8 +63,15 @@ def about_view(request, *args, **kwargs): return render(request, "about.html", {}) +@require_http_methods(["GET"]) +def guild_view(request, *args, **kwargs): + """Render "Guild" page.""" + return render(request, "guild.html", {}) + + @require_http_methods(["GET"]) def ohlhafv_view(request, *args, **kwargs): + """Render Ohlhafv form page.""" form = OhlhafvForm() return render(request, 'ohlhafv.html', {'form': form}) @@ -72,6 +79,7 @@ def ohlhafv_view(request, *args, **kwargs): @ensure_csrf_cookie @require_http_methods(["POST"]) def ohlhafv_submit(request, *args, **kwargs): + """Submit Ohlhafv form.""" form = OhlhafvForm(request.POST) if form.is_valid(): form.save() @@ -85,6 +93,7 @@ def ohlhafv_submit(request, *args, **kwargs): @ensure_csrf_cookie @require_http_methods(["GET"]) def ohlhafv_list(request, *args, **kwargs): + """Present Ohlhafv challenges list.""" challenges = OhlhafvChallenge.objects.all() table = OhlhafvTable(challenges, From 55d0b11ec6b1654bdd3926e8e85cd0327b479626 Mon Sep 17 00:00:00 2001 From: henu Date: Wed, 27 Sep 2017 19:22:58 +0300 Subject: [PATCH 2/8] Add translations for main page views --- locale/en/LC_MESSAGES/django.mo | Bin 6691 -> 7029 bytes locale/en/LC_MESSAGES/django.po | 88 +++++++++++++++++++------------- locale/fi/LC_MESSAGES/django.mo | Bin 8490 -> 8623 bytes locale/fi/LC_MESSAGES/django.po | 80 +++++++++++++++++------------ 4 files changed, 100 insertions(+), 68 deletions(-) diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 6364efbbae44f602d2bc38d8c392c0efb7c5eaef..843785a458a0c882f2d3d62228c6b86b690611b2 100644 GIT binary patch literal 7029 zcmeH}ZH!!18OIN=g+&EHKwdpiD6Q?Z+g5116x!+TY&&J&*x4;?QS05gcV=&U=icGo zJG))tD}fJ6K#ijKfdmD7NeGEXtA-Cq)&wxo7-R4YL5+Y$)R=RD^*&vWL!aPF!18?JfeQsl)`jCmM7wu&3q_8w!NhCARH@T9Xk?12n5 z=fU;xLU=mtcm4Yzub2_|4mbt*nHsmVVe0fd;k(f9gXh2pp~gQBH^3)g0saA=3NPT{ zJK-fz`Z{%I$O%G?7Lrw5?MeHCh5UxzHgd>?Au0z3`=9LnxwePD4j{47ndhZ;l=NCDyhVMo%K&^Kdl)WLSbsdEA--B9L==$$~=b?WJ z@-z2yy9hoCHU3Gs20jfn|6kxG@KtyLJR4&d!ZlFiZ*&}l@^b{T1aphiYw%q31Zw=9 zuKzPo>-mD?gHZE*1IqqmPX95~`ksZd{~Xl%ehu~h%TV$DE7Us9B`8k}=o8r_tvKuEy

P_d>1n0jNBF6cTdtZKpp471y6a`S(23_&>u9@HJR~ z*N|-TcM{6agHE4;idO?_opbP7_zBnlJ*YZ<((!jtb-apAZ`Uo9KIrrS%I~|O{QMl$ zd=Ej{e;mq>V@`hpYTXM^e*Xk2PQQX0_Zz5ny#%%Xze9~XnPgDCoegF8e5YRq6_3?W zcDFcv2b7(CP<1>7^Ib$!$I{}8H< ze*_i(Uqa>oi%{eL4cEZa>6Bjus5;mJ39T7{EWrd&<3HwjHJoz&VaIiKGgayhkE~NsCaLJykc&Ks^cTj!p}qb z{~f40{+ZKXar!DA%HCB_{;h|K*H)KrnHY)7s~s)*uv zEu#4AOwhFp2@vJ_m58oekrYv!hmbu8;a$Ae(b}}Ab@p3o0qJx7`yEw_y0o{-$3s$< zT^?;xpj|tIP<#Gi@-_Z9yX((tu(#)2ClZ-d1BKf_wq1_(HjIJPm%~9qR3Wf zyeJCddVtz&Mq#x*%+`_=*OoeXng(`0Y1yph8gm|zz_cGkK_1wACd`~SyWZYl=i)B2 z$EzOU79X*B>cv?tNKL<&&6xhKZ>B$qbFZ4i<~&sS^)P9+PWG;>p&$s=R17@H_c$6L`Kg`>=<&o)hxJ=Us+s&?$ zO3swxdK9u>r8G@aQ=+nRTlL5)-*akaN=Ne`jlIZ*4X++7sdK?}hUaDwLxHb+3L9)z z?n088!7z?xd{9MiRrF?%0-qtf&E8fR`DR~b$mU@q$i3-^G%mL%D91HS5fVCRwp-Sl zWfqN6elONUXGB&_159dgr)fK-GUgGpa-8K}TwQ8pmMW^Y(v-DE^EM-<)g1p9>#Q8N z*Q=mpW$TZ+dJ$5>}^?N-wZeKW*auzVXBuAa_5IK^!Q zT2jZQHj-9uhP@cGcHEVHW`^5mnZrt}okune>X@hYj?-;Yvz78qI(s@#FcxMUOm%x@ z9vsbUVG#LO+Og5f1U7ExB+YHR&y09%)=08^HXHgjYjTh>!q>A#=ZrnRyPNSV`bTG? z8Lu{LMw<$2X2!fMn@dukM*Fa{fl^QXZIy=3fB8?sgnpn697}`QkizLkX0eeOEwa7m zrsB;8rqbTi#T`{@2C9w9Xyq?Iy9r8V6MbJBqp$4r*hS`kUoIdVvn zWe3V}BYdC7oshiIlWtU$y>B$Cb6~y21l<8|^|G5}<@}v<>WzKtK3jZop2Pa6sVp4J zvV~(^S})DRstR<1q+I^T(`P1B6qA__2r_0W$TryWHI4RPjiC_6(nKe7q3jn91Zl?J z_t~*x|4qfcC3~PWUMY``^o$2OH44L7J@gBETJ@|jk@VS~vC)Y_`%L7ef{wvHyQO#Y zwnFcY!j^4z^NzmW&Fg!&_VzNcFivL3xEnWBDvlS1M+*Z*yKl5_xV--0=t!wYeF_V(yskAyBLJbhNRwuvvAFuq>@+G!T#H%v|p7Pc>qbN`-& zQd~`ZGP2KZpAPe$|GlrLg}Y9CKDlx`@%eP(^XbIr(}~Zg6<<}|4}}w-PwvyJ{bALO K%KzEt(|-T~Dbt|< literal 6691 zcmeH}ZHygN8OINA0t=!oZz?K>0;Q$BWxG&bmO^{Gd$-)OZ{52s6v1Wo&g|W3=gwSa z=I*k_7)$t2jNt=~ApxQ$HY5Zk8e_u;QFK-Opd?~2YGO4JV-N?n6F~968OHN8!dZxzG-sZOjYsA$S(t-P7S+ zkg28)H^2t`06gr*AA|hNm${q^pMvMWqwquUhfaS9ei;22)V$Z=M))sSg6nzcba)5+ zAiUe@`=MM+;1)O!FNfc7{000Z`Wx_4cmc+xUk9bvAg?ePls}(?vi~rY-6x>ld&KEa zL9Opwke_*$i{kNPsCh3!t>c%FSDIHKKl3`5GvHfLc2DCa($9hC!BtRpt<$f9vU5HB z2;2$v+`Ul#&O$wxLD_l0jUR%Sp&xeoci@HS&qMk7E4U8+9`ZA1VMKmk1ld}13DkaG z2{nJc8}D=63Rf{c1huX^q3i@u{%25reg?|_2i*8!cs}}LP;q_+eiVKWYW}a`TKESj zf6ipmCGcE$5nKl^hTEX#-vQ;{6yy;z>-2fJ8vXN7^A5Z5$D!7D#PJ!Z_dE+__c^D( z47IM`LfQW_)Vf}Wdj9WF@jZpb$^XmYmGBm5VI9iv2chcdt4@E;>A!)p_a>BoZ$WJt3PN;p`4L86&Q13bD#t%W|%@?88 z_b60;9)T>$eADUAL;3SFsCmDG8{uDI30{0b$Il9sf4iK1C)9fGfvUp*stzA_{619O z{Sm6}P9-U&uYuCbQ2u#P{zOprKMQ5|3sCWS#OaSht?w&Pem)5mk8eZG`!3WvegL)3 zm!ReygQ}NTq3r(E>HmPrqklu$J&&Z5ej${dE1>Fd3)FL?Q2y?Pn&&~;ZMpF|s6097 z^shlon`fZ>{1IFSe-5?IH=+DKon+L0o(;91=R?iE*o|Aqt0Adiu7g_F5R{!7l>Z)- zpR-W@x7_$a$X1#|P;q_&Dv!SoHUB4YEqoEmpEscL`JWIM%|!%(t|>vyuR!@X0u_h7 zP7k2!Fov3U(2YL?wZ2CjpMZMLlTdb_cKRaJx_$~}|7ECk9fNxQPf+oF4a)yjTvUe} zpoP1k{7#|j@L{Jv?erI*?7afz->Xn@`Wr0v;bWcmo(&b()lhY4A!TT;MQ%bS5ykNe zL~SGT38aLm4tFB*cLs@&CZeXC{1h@Gg?0eZ`lpc=QbPuj2}Dh`(u?#V9->^+{>vw| z7#S^k#tgt)T)&IWbT%Pd5v|)IE8A|T1S+=YxIJ~E7`U5;pP)fDUPi1uh3at(4jvLCq~QM(Vh0l63HwxMnZCW!W)tyyZj z=*>E93%mol3Q-Q<>QM(#ZUED0iHPwaMWk?lSBZc;9U3%<_HWQ{&3opMP5CaN@k{#G;D;i&1RE!dJ9gOp$#iDQUrz~a#`&cb-{=;F~dJP<~?XVV2!uGfQBZpywdu^k^f z-FB3RttcpzmbcKv)uNv#HcfIb50e3 zv$_3mA~R5IZk*)SD`I55<>lC9dVf$@Rsv{_TgCgCJIyzPOgDo;Jqlw{dt(NZ`8Y~E-wxFFn!$G3+53tg z=0=y5k?9P$G%9X(Q>UVOGL^Uyh3riwO_S7AD4X2Yy(ox% TI+@A+&>_s+gdW~RN zoe!onJU2ra3Vh{G*lZ>g_aTanXX!2x2|Q z;iamn#>E0vL0)94+6-N6zR(KHu5!%`dvT+!wGVS1brw?eT3+azVTyWX$g|E!C+1FZ zK}Sm(cvB#0=Vru5DW{bpvQIFuZYx7xX7)1bi%si_lmo6Oi+^>!U1ojVu{GftR> zU6Tj*=QCjt`D^U>SZxv;_i-fVwiq*`9vd^7tbCgdeVes75t-rZUbAypo;cji?&HSC zT8d<5#=R_?Pg0*waa!3x>80^PrK1B}esiRUexN-YPlLIT;^;CdnN*%1ErCy5&ESa?M7CbO!{rl_}FBrIOTY#q=T*B_VsSQq11a*sc(zz+uVO` z--h06dwZE!njjBk+|AopDNmF}#!7=_d)rw5NOi+qW22QG6=7*oe=?DmCuzSO+A}yR|Y>t`2W64-QULYPDOL+9~1EWZ*UX?QnT?=N`Gdb$EDt6mCk=#_}9o9jT5~ zme;p=Q*V#{y-44Z!qab6QP=PR62>>%`mC2`L4M1g$)VDX%k$iSU#Sw;6QBI+w>M6Q ydC&jf$Ijw|C%<-1e(e+=L){aw`!TijiF5L6=j7MU$*-N0Upp&5xc(QucK!p*Mv-;^ diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 839ce4d..8c429ff 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-09-25 21:32+0300\n" +"POT-Creation-Date: 2017-09-27 19:01+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -184,12 +184,12 @@ msgid "Language" msgstr "Language" #: infoscreen/templates/infoscreen_admin.html:161 -#: members/templates/settings.html:20 sikweb/base.py:216 +#: members/templates/settings.html:20 sikweb/base.py:220 msgid "Finnish" msgstr "Finnish" #: infoscreen/templates/infoscreen_admin.html:162 -#: members/templates/settings.html:21 sikweb/base.py:217 +#: members/templates/settings.html:21 sikweb/base.py:221 msgid "English" msgstr "English" @@ -200,56 +200,56 @@ msgstr "English" msgid "Submit" msgstr "Submitted" -#: members/forms.py:103 members/tables.py:32 +#: members/forms.py:110 members/tables.py:32 msgid "Member" msgstr "Member" -#: members/models.py:13 +#: members/models.py:14 msgid "First name" msgstr "First name" -#: members/models.py:14 +#: members/models.py:15 msgid "Last name" msgstr "Last name" -#: members/models.py:15 webapp/models.py:95 webapp/models.py:108 +#: members/models.py:16 webapp/models.py:95 webapp/models.py:108 msgid "Email" msgstr "Email" -#: members/models.py:16 +#: members/models.py:17 msgid "Place of residence" msgstr "Place of residence" -#: members/models.py:18 members/models.py:83 +#: members/models.py:19 members/models.py:60 #: members/templates/member_add_many.html:35 msgid "AYY" msgstr "AYY" -#: members/models.py:19 +#: members/models.py:20 msgid "JAS" msgstr "JAS" -#: members/models.py:69 +#: members/models.py:46 msgid "Submitted" msgstr "Submitted" -#: members/models.py:81 +#: members/models.py:58 msgid "Date" msgstr "Date" -#: members/models.py:82 +#: members/models.py:59 msgid "Source" msgstr "Source" -#: members/models.py:84 +#: members/models.py:61 msgid "Cash" msgstr "Cash" -#: members/models.py:85 members/templates/member_add_many.html:36 +#: members/models.py:62 members/templates/member_add_many.html:36 msgid "Bank transfer" msgstr "Bank transfer" -#: members/models.py:102 +#: members/models.py:86 msgid "Created" msgstr "Created" @@ -474,61 +474,61 @@ msgstr "Successfully deleted application" msgid "Could not delete application object" msgstr "Could not delete application object" -#: members/views/members.py:70 members/views/members.py:163 -#: members/views/members.py:189 +#: members/views/members.py:71 members/views/members.py:164 +#: members/views/members.py:190 msgid "No member id specified" msgstr "No member id specified" -#: members/views/members.py:105 +#: members/views/members.py:106 msgid "Failed to import members" msgstr "Failed to import members" -#: members/views/members.py:118 +#: members/views/members.py:119 msgid "Successfully added member" msgstr "Successfully added member" -#: members/views/members.py:143 +#: members/views/members.py:144 msgid "Successfully updated member" msgstr "Successfully updated member" -#: members/views/members.py:151 +#: members/views/members.py:152 msgid "Could not update member object" msgstr "Could not update member object" -#: members/views/members.py:167 +#: members/views/members.py:168 msgid "Successfully deleted member" msgstr "Successfully deleted member" -#: members/views/members.py:178 +#: members/views/members.py:179 msgid "Could not delete member object" msgstr "Could not delete member object" -#: members/views/payments.py:69 +#: members/views/payments.py:67 msgid "Successfully added payment for member" msgstr "Successfully added payment for member" -#: members/views/payments.py:87 members/views/payments.py:105 -#: members/views/payments.py:124 +#: members/views/payments.py:85 members/views/payments.py:103 +#: members/views/payments.py:122 msgid "No payment id specified" msgstr "No payment id specified" -#: members/views/payments.py:129 +#: members/views/payments.py:127 msgid "Successfully deleted payment" msgstr "Successfully deleted payment" -#: members/views/payments.py:139 +#: members/views/payments.py:137 msgid "Could not delete payment object" msgstr "Could not delete payment object" -#: members/views/payments.py:158 +#: members/views/payments.py:156 msgid "Successfully updated payment" msgstr "Successfully updated payment" -#: members/views/payments.py:165 +#: members/views/payments.py:163 msgid "Could not update payment object" msgstr "Could not update payment object" -#: members/views/utils.py:110 +#: members/views/utils.py:113 msgid "Missing \"textfield\" POST request field" msgstr "Missing \"textfield\" POST request field" @@ -608,6 +608,22 @@ msgstr "Infoscreen" msgid "Admin tools" msgstr "Admin tools" +#: webapp/templates/navigation.html:15 +msgid "Guild" +msgstr "Guild" + +#: webapp/templates/navigation.html:16 +msgid "Freshmen" +msgstr "Freshmen" + +#: webapp/templates/navigation.html:18 +msgid "Corporate" +msgstr "Corporate" + +#: webapp/templates/navigation.html:20 +msgid "Jobs" +msgstr "Jobs" + #: webapp/templates/navigation.html:29 msgid "Event calendar" msgstr "Event calendar" @@ -626,19 +642,19 @@ msgstr "Contact" #: webapp/templates/ohlhafv.html:8 msgid "Ohlhafv" -msgstr "" +msgstr "Ohlhafv" #: webapp/templates/ohlhafv.html:15 msgid "Challenge" -msgstr "" +msgstr "Challenge" #: webapp/templates/ohlhafv_list.html:11 msgid "All challenges" -msgstr "" +msgstr "All challenges" #: webapp/templates/ohlhafv_list.html:15 msgid "Total challenges:" -msgstr "" +msgstr "Total challenges:" #~ msgid "Successfully imported multiple members" #~ msgstr "Successfully imported multiple members" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index d57a49a90a032e4ae4175f6680e48ab2849ef0e1..bf328d30be6ef7d150c09bf0400265e76daa4914 100644 GIT binary patch delta 3235 zcmYk8eN5F=7{?EE1w&E6cf`1aS1BOTAW|{~6JJRR-zy39ri38EB?FOblBsEmFg9vx zx|S_hQ+KDmI9bk|`Hy9mwKZs&)%>H{bgP!F`h4$wXr0~f?{m)cJ1@`kob&tr?$N?y zGlRW}o=!(;L&<2r$GNkr-^qpI9q61NroszwJM0e^#z(je-a)$@W{%43{GY_Z=KW`)82MW@zpgzy0|8&eml(G zY3S3!PmEf@7`gzC2q_Ji$E{kxzR zJZ$#2A+fn*P+QV%?embI`+`ew6qO&SXyD&ak;EiKCQN`@APH(BueB#a^~;5+aE7%j z;Bea2P!6@ibhsNTBPXE(ItR5SpCpif9iGqa##N|+-&lw1#$O;m_Xih69+w!Ia3oY@ zKBxdPp(4w%`?KtRDIAJ@1=JSRKy6)1BKg-7tF;(P-WnsPRJ~w_Gw*|7@r&4Ca}k5Nd(BPHpdLTybM)K=C)0t~vXROI3Ih{3f%9hOcQ4c~xOQO+HKYiK7D z=26%Lm0BMsSp9RL&Qc-Ni>L@{-a06UHbM1oHMWPz{vW2I364W;K{u3#m!S^J_fV<3 z1r<4{}iAyh^#K+Shac0K>ssN}+5t%ENq@*>KF zUhE|>1#W;7;66AGegHFJuiYQOzQ~abs0DMNA}%m{3DlWd4i(r+7}S6oD)MZju?5QW zZBWnuUZ@myLS^QF@fg$sXQ3AS400S?57fLjp~l~a%19IkL>U?emGP8h_Ft*U!k~9^ z0n~sps0IB{j#ZmI0JUHfR3tl%d!WX5Ksj;(Dr4PHXQCJC>9_{9@SkSyKbHI}(t(Ut z#}QB-CP6vkgW;4yMV+Ww-aANFw-S<7*9`B5T~H34h6?DS@e0(uJy4GPX!hT%9aNs= z(GaK!QlUOF6QLZ*hss0|)IE7)K{m24!GG8LsnsDxH61DKedQ@CY;CwSb6t&;otbC> z+JOFFg1cxb>b|nXDmvv#U%s^`!6x(sddO_b&K5KSsrZpzWRIgAs1&Kpjv#z}&gvC# zqW1q;Dvz2``=c@qtwn8WP}ZYLv>Po#DlO<~q^((oijay9mk+&+YS2q)E>fmfpiHz9 z=}v$^jkQd#98c<(ZM@6UkJ~Rt)1RS4%@IibAW}$JY3{5~w(N?qxscb_}hHH^a ziq+%bb`&qKrke2u$R{BDIL?6!Q6Aci>d`6`Kzq<$)DP)Hq@vfZir#XMpvTZFNPkvT zbmIF;fmPN(ZCChlsWM|B%s?-qB(oL6T2yXr7y5F*&FI*=+Vyqi0e|S@LARp@71jCc z*H-&$-0X(Rb*nqNhrH*Rx4xo26i7((#O8S?O_`cKDRgjnswZZ7U1gxLKGZ$BFnVB7 kLsflcz|F5*7bx%eXUyTaMUCf9)s|OQl?OtvC-3t73l_i`F#rGn delta 3126 zcmYk8eN5F=7{?EIO$8J$B5y%l5Cip+2!aZkhGIz~q?j*d=38heL8g`h*Oy39vQ28O z<%(9;BAX_T{|a4GxBg((SY7hzt4G|-|u&x=RD_}9~_<4 zUL3d><9XfDT2L~o_c+%DdxvtNeHZE6T6i9wg)^d@)2$)HLmUYQVJE@~Fa_QP=bFC) zj>N8n5pXSJ2v-XkGT<8MMB``aR>2aoi1e!#Ma3jE9|28Fxbs z^sTYa{8ynW_Pg=6`A3kADijYjp=`)4R|qvu8C2Xw0Xhn>45|{VjT`NOtxy%Hhe~L- z`QL&XxDD$4Par?n$wkk93ALnOncWLD{uQXDyau(21JTrFES+)C2g{)4Iuea$c#D#0|f$3rdcL>R8~Kb=l>7`qu(apMT}Z-=o= zH@F$0Ug(C}M7>ZSnoCdvN3oTa&}gXVQ;dFN5!CyoP)o1`D#26G|eCu>V-t8z*C?qFdJ&^*Fcutt%C}*!~6%JW_Hl*Lr?+Rpc4K7YJx|h0-u6< z|6DTlSD=gbz|VH$AIN@mkz}Kira_f*64V}&)H`mC$~u_YXn+t!Rfzq!X$V zr=Z3;3pM^Zs3i(~Z#RC0D)9}d%x;-Kp89J*AJmI}NO4>N)C?Cw4YUkuZEK(cZGqbD z0m#q2$0Zkj0acN|pik#Nfom3yX;76|1;@iCsHHguHQ;AZ0nR`L?1tKum!T550ac-Y zp=LaSDB7H{kPnT^gkg}=9BlPmhY{aBOGh7+Cy@r)gjBj2s1)_LW;zp*f;6CPq|KzH zUqotJf^Hd+AIjzAHwLq34iV6)Fk#LjQVcBQ8TPAXQ3DGw*NZ zbRI$Xn?ol=?ST-28!ylL!XWF+P+>Ba?n|6f?E3(G;`_6(O~X5bj(TSa04P zPv~zw`#IRAaVy61opPj|z}BY$j6E zso8~=q9te#T8$>54JaH9)-3%f5$SlS)uC$iIC>Om7q3K{(ZJ@zNHs?#d>S>P#b_(q zfpnC2qdDkd\n" "Language-Team: LANGUAGE \n" @@ -183,12 +183,12 @@ msgid "Language" msgstr "Kieli" #: infoscreen/templates/infoscreen_admin.html:161 -#: members/templates/settings.html:20 sikweb/base.py:216 +#: members/templates/settings.html:20 sikweb/base.py:220 msgid "Finnish" msgstr "suomi" #: infoscreen/templates/infoscreen_admin.html:162 -#: members/templates/settings.html:21 sikweb/base.py:217 +#: members/templates/settings.html:21 sikweb/base.py:221 msgid "English" msgstr "englanti" @@ -197,56 +197,56 @@ msgstr "englanti" msgid "Submit" msgstr "Lisää" -#: members/forms.py:103 members/tables.py:32 +#: members/forms.py:110 members/tables.py:32 msgid "Member" msgstr "Jäsen" -#: members/models.py:13 +#: members/models.py:14 msgid "First name" msgstr "Etunimi" -#: members/models.py:14 +#: members/models.py:15 msgid "Last name" msgstr "Sukunimi" -#: members/models.py:15 webapp/models.py:95 webapp/models.py:108 +#: members/models.py:16 webapp/models.py:95 webapp/models.py:108 msgid "Email" msgstr "Sähköposti" -#: members/models.py:16 +#: members/models.py:17 msgid "Place of residence" msgstr "Asuinpaikka" -#: members/models.py:18 members/models.py:83 +#: members/models.py:19 members/models.py:60 #: members/templates/member_add_many.html:35 msgid "AYY" msgstr "AYY" -#: members/models.py:19 +#: members/models.py:20 msgid "JAS" msgstr "JAS" -#: members/models.py:69 +#: members/models.py:46 msgid "Submitted" msgstr "Lisätty" -#: members/models.py:81 +#: members/models.py:58 msgid "Date" msgstr "Päivämäärä" -#: members/models.py:82 +#: members/models.py:59 msgid "Source" msgstr "Lähde" -#: members/models.py:84 +#: members/models.py:61 msgid "Cash" msgstr "Käteinen" -#: members/models.py:85 members/templates/member_add_many.html:36 +#: members/models.py:62 members/templates/member_add_many.html:36 msgid "Bank transfer" msgstr "Tilisiirto" -#: members/models.py:102 +#: members/models.py:86 msgid "Created" msgstr "Lisätty" @@ -464,61 +464,61 @@ msgstr "Onnistuneesti poistettiin hakemus" msgid "Could not delete application object" msgstr "Hakemusobjektia ei voitu poistaa" -#: members/views/members.py:70 members/views/members.py:163 -#: members/views/members.py:189 +#: members/views/members.py:71 members/views/members.py:164 +#: members/views/members.py:190 msgid "No member id specified" msgstr "Jäsenen ID ei määritelty" -#: members/views/members.py:105 +#: members/views/members.py:106 msgid "Failed to import members" msgstr "Jäsenten tuonti epäonnistui" -#: members/views/members.py:118 +#: members/views/members.py:119 msgid "Successfully added member" msgstr "Onnistuneesti lisättiin jäsen" -#: members/views/members.py:143 +#: members/views/members.py:144 msgid "Successfully updated member" msgstr "Onnistuneesti päivitettiin jäsen" -#: members/views/members.py:151 +#: members/views/members.py:152 msgid "Could not update member object" msgstr "Jäsenobjektia ei voitu päivittää" -#: members/views/members.py:167 +#: members/views/members.py:168 msgid "Successfully deleted member" msgstr "Onnistuneesti poistettiin jäsen" -#: members/views/members.py:178 +#: members/views/members.py:179 msgid "Could not delete member object" msgstr "Jäsenobjektia ei voitu poistaa" -#: members/views/payments.py:69 +#: members/views/payments.py:67 msgid "Successfully added payment for member" msgstr "Onnistuneesti lisättiin maksutapahtuma jäsenelle" -#: members/views/payments.py:87 members/views/payments.py:105 -#: members/views/payments.py:124 +#: members/views/payments.py:85 members/views/payments.py:103 +#: members/views/payments.py:122 msgid "No payment id specified" msgstr "Maksutapahtuman ID ei määritelty" -#: members/views/payments.py:129 +#: members/views/payments.py:127 msgid "Successfully deleted payment" msgstr "Onnistuneesti poistettiin maksutapahtuma" -#: members/views/payments.py:139 +#: members/views/payments.py:137 msgid "Could not delete payment object" msgstr "Maksutapahtumaobjektia ei voitu poistaa" -#: members/views/payments.py:158 +#: members/views/payments.py:156 msgid "Successfully updated payment" msgstr "Onnistuneesti päivitettiin maksutapahtuma" -#: members/views/payments.py:165 +#: members/views/payments.py:163 msgid "Could not update payment object" msgstr "Maksutapahtumaobjektia ei voitu päivittää" -#: members/views/utils.py:110 +#: members/views/utils.py:113 msgid "Missing \"textfield\" POST request field" msgstr "Puuttuva \"textfield\" POST-kenttä" @@ -594,6 +594,22 @@ msgstr "Infonäyttö" msgid "Admin tools" msgstr "Hallintatyökalut" +#: webapp/templates/navigation.html:15 +msgid "Guild" +msgstr "Kilta" + +#: webapp/templates/navigation.html:16 +msgid "Freshmen" +msgstr "Fuksit" + +#: webapp/templates/navigation.html:18 +msgid "Corporate" +msgstr "Yritys" + +#: webapp/templates/navigation.html:20 +msgid "Jobs" +msgstr "Työpaikat" + #: webapp/templates/navigation.html:29 msgid "Event calendar" msgstr "Tapahtumakalenteri" From 8ce0b9a0d6f184ab0c7ec84ee1ca1a839c38490b Mon Sep 17 00:00:00 2001 From: henu Date: Wed, 27 Sep 2017 19:23:34 +0300 Subject: [PATCH 3/8] Add freshmen and jobs dummy pages --- webapp/templates/freshmen.html | 10 ++++++++++ webapp/templates/jobs.html | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 webapp/templates/freshmen.html create mode 100644 webapp/templates/jobs.html diff --git a/webapp/templates/freshmen.html b/webapp/templates/freshmen.html new file mode 100644 index 0000000..ae521fc --- /dev/null +++ b/webapp/templates/freshmen.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} +{% block content %} + +{% load i18n %} + +

+

{% trans "Freshmen" %}

+
+ +{% endblock %} diff --git a/webapp/templates/jobs.html b/webapp/templates/jobs.html new file mode 100644 index 0000000..ae4ec03 --- /dev/null +++ b/webapp/templates/jobs.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} +{% block content %} + +{% load i18n %} + +
+

{% trans "Jobs" %}

+
+ +{% endblock %} From 7c27365f1e654cc9178d93c4bca3fd573a38a92f Mon Sep 17 00:00:00 2001 From: henu Date: Wed, 27 Sep 2017 19:24:30 +0300 Subject: [PATCH 4/8] Add views and urls for jobs and freshmen --- webapp/templates/guild.html | 7 ++++++- webapp/templates/navigation.html | 14 +++++++------- webapp/urls.py | 7 +++++++ webapp/views.py | 12 ++++++++++++ 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/webapp/templates/guild.html b/webapp/templates/guild.html index 3570195..9daddfc 100644 --- a/webapp/templates/guild.html +++ b/webapp/templates/guild.html @@ -1,5 +1,10 @@ +{% extends "base.html" %} +{% block content %} + {% load i18n %}
-

{% "Kilta" %}

+

{% trans "Kilta" %}

+ +{% endblock %} diff --git a/webapp/templates/navigation.html b/webapp/templates/navigation.html index 92fbfcf..6d85699 100644 --- a/webapp/templates/navigation.html +++ b/webapp/templates/navigation.html @@ -7,17 +7,17 @@ - +