From 4e53098e230d7b2945828122bf8a0131b42d936d Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Wed, 11 Oct 2017 23:14:37 +0300 Subject: [PATCH] Make some styles --- locale/en/LC_MESSAGES/django.mo | Bin 7141 -> 7141 bytes locale/en/LC_MESSAGES/django.po | 61 +++++++++++----------- locale/fi/LC_MESSAGES/django.mo | Bin 10234 -> 10284 bytes locale/fi/LC_MESSAGES/django.po | 64 ++++++++++++------------ webapp/models.py | 5 ++ webapp/templates/kaehmy_list.html | 18 +++---- webapp/templates/kaehmy_navigation.html | 4 +- 7 files changed, 75 insertions(+), 77 deletions(-) diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 6614a3f7dd058d2b9948be33389e2dd8c1ba56dc..345887faa4ca361395468d035826b305f1c19fc9 100644 GIT binary patch delta 15 WcmaEA{?vTKBOxXe^UY6$7&!qs%?14c delta 15 WcmaEA{?vTKBOxYZqs>o*7&!qss0H@` diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 86403be..42d397f 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-11 22:32+0300\n" +"POT-Creation-Date: 2017-10-11 22:47+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -116,8 +116,7 @@ msgstr "Type" #: infoscreen/templates/infoscreen_admin.html:116 #: infoscreen/templates/infoscreen_admin.html:132 #: infoscreen/templates/infoscreen_admin.html:138 -#: members/templates/member_edit.html:20 -#: members/templates/payment_edit.html:20 +#: members/templates/member_edit.html:20 members/templates/payment_edit.html:20 msgid "Delete" msgstr "Delete" @@ -169,8 +168,7 @@ msgid "id" msgstr "id" #: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:93 -#: webapp/models.py:134 webapp/models.py:155 -#: webapp/templates/kaehmy_list.html:40 +#: webapp/models.py:123 webapp/templates/kaehmy_list.html:40 msgid "Name" msgstr "Name" @@ -212,7 +210,7 @@ msgstr "First name" msgid "Last name" msgstr "Last name" -#: members/models.py:16 webapp/models.py:135 webapp/models.py:156 +#: members/models.py:16 webapp/models.py:124 #: webapp/templates/kaehmy_list.html:44 msgid "Email" msgstr "Email" @@ -295,8 +293,7 @@ msgid "Add member" msgstr "Add member" #: members/templates/member_add.html:15 members/templates/member_edit.html:18 -#: members/templates/payment_add.html:20 -#: members/templates/payment_edit.html:18 +#: members/templates/payment_add.html:20 members/templates/payment_edit.html:18 msgid "Save" msgstr "Save" @@ -393,8 +390,7 @@ msgstr "Yes, I'm sure" msgid "Edit member" msgstr "Edit member" -#: members/templates/member_list.html:11 -#: members/templates/members_base.html:15 +#: members/templates/member_list.html:11 members/templates/members_base.html:15 msgid "Member register" msgstr "Member register" @@ -404,13 +400,11 @@ msgstr "Member register" msgid "Members in register:" msgstr "Member register" -#: members/templates/member_list.html:28 -#: members/templates/payment_list.html:25 +#: members/templates/member_list.html:28 members/templates/payment_list.html:25 msgid "Search" msgstr "" -#: members/templates/member_list.html:36 -#: members/templates/payment_list.html:33 +#: members/templates/member_list.html:36 members/templates/payment_list.html:33 msgid "Showing results for" msgstr "" @@ -435,8 +429,7 @@ msgstr "Add multiple" msgid "List payments" msgstr "List payments" -#: members/templates/members_base.html:63 -#: members/templates/payment_add.html:13 +#: members/templates/members_base.html:63 members/templates/payment_add.html:13 msgid "Add payment" msgstr "Add payment" @@ -617,7 +610,7 @@ msgstr "Rotation" msgid "Registrations" msgstr "Rotations" -#: webapp/models.py:94 webapp/models.py:164 +#: webapp/models.py:94 webapp/models.py:163 #, fuzzy #| msgid "Add member" msgid "Board member" @@ -639,49 +632,49 @@ msgstr "Duration" msgid "Summary" msgstr "" -#: webapp/models.py:136 +#: webapp/models.py:137 msgid "Message" msgstr "" -#: webapp/models.py:138 +#: webapp/models.py:139 msgid "Timestamp" msgstr "" -#: webapp/models.py:158 webapp/models.py:217 +#: webapp/models.py:157 webapp/models.py:216 msgid "Phone number" msgstr "" -#: webapp/models.py:159 +#: webapp/models.py:158 msgid "Year" msgstr "" -#: webapp/models.py:160 +#: webapp/models.py:159 msgid "Text" msgstr "" -#: webapp/models.py:162 +#: webapp/models.py:161 msgid "Custom role name" msgstr "" -#: webapp/models.py:172 +#: webapp/models.py:171 #, fuzzy #| msgid "Member applications" msgid "Kaehmy application: {}" msgstr "Member applications" -#: webapp/models.py:202 +#: webapp/models.py:201 msgid "Role" msgstr "" -#: webapp/models.py:204 +#: webapp/models.py:203 msgid "Start date" msgstr "" -#: webapp/models.py:205 +#: webapp/models.py:204 msgid "End date" msgstr "" -#: webapp/models.py:215 +#: webapp/models.py:214 msgid "Official" msgstr "" @@ -758,11 +751,17 @@ msgstr "Add payment" msgid "Reply" msgstr "" -#: webapp/templates/kaehmy_navigation.html:16 -msgid "Apply" +#: webapp/templates/kaehmy_navigation.html:10 +#, fuzzy +#| msgid "Total challenges:" +msgid "List kaehmys" +msgstr "Total challenges:" + +#: webapp/templates/kaehmy_navigation.html:11 +msgid "New kaehmy" msgstr "" -#: webapp/templates/kaehmy_navigation.html:17 +#: webapp/templates/kaehmy_navigation.html:12 #: webapp/templates/kaehmy_statistics.html:12 msgid "Statistics" msgstr "" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index def16768b033999f92e4cde28a6cd3b99368ba9e..9c321661baa858ddfd16117a860ba228a285f13e 100644 GIT binary patch delta 3924 zcmYk;32;qU9LMpK)(kaM%INp^-aj+$4)Wuc@+%bc zv4V46w~Z6supepLePZP^NT2S4m488g++BY0LH86JV`vrUk}wrLn1vN_66(JBR?fBS z1y;WqL+Ib_<)kb(9>OR*iqZI;)!)Syl>fmHObB-_4pYn_Sex=9jKQr|K4Im{Se^RE zsF_Dp^-nYgE7HGf%83Th4mHCrsF`G%!|eJf)Y48wt=M$b3>Tsv$tu+6@=@(j{4c6}@cQl1jQ`s>E&RH(xoRCxvJ18cAjZnW}IjHG-T)zKwvh}TiiJd}&F8frid zP!mW*ZPFH2pN5)H`$*Pb&%6s2>UcP+;W4NWPBwFp$M3wTrOY>XpgJr-S;uFVqSNg6Moz&yKo6LfUBqm{y=r~0JU@h>^LoTBx)sUnekSi zjOs8AwRbw9RyYgmqZeawFV@uif0h${^WE@OIQPuTHTjfg-U`)WM=N(jtw3MYrW$4S z<4`l3V$Q^Yl;@%b^fhV^T|_;C-_WD?{~;%u>0?w!K{fmhg`#F2hFXzm)N7M~lLPqH z!wHnPun`Vm0JBiT#i-AnKn?I5CgOQiKaWro3*=kQtC59rq7O!xab_~Ap>)(<=!=@c z7}V~agZkVG)T1dtt;{}5!DHA4|3Y=#h_6XKvSd_y?P|0Bs^~|B1~Lpa(=60V%(D6g z7*BaQs-q&*eV=0s{1$b8V2uB(IRs-VCm}zs55M&JX;=?8VPiZI>tNyw_ZbX3P9QGW|2Sa~+8UGGAxScaOx zYBSGnC`1i#J8I^|=3!I^pP~kS5m`ic9kuBK>iS>nGN^$?quNPCU2ly{$m`l$MR(Lp zdZPw1*vcbNBh5CaqgEydwUkRx4d`>B2ol4J@{v|4}xP^zT}6 zq7E`p9rv;uhFLia^;+ei8d!IzEjohWn;I z>#t37kBVdrYv5nf42-2b4jW=FY6%Zw0$xBp+b5_7L*o4%grhpHfvRtUx-S*AQk^jv z`(i)LjA#8dlYLa^wL5H{wHvRX9?1<<1NX5EK1IETL5xmDVIVfb0DS&fO<|fpn~J9ua2KgeI+8cYX!6|Q zb?dDZWR^ueXdNR-Gv66o6zdZH1iL0=FnN=-CX30dB!w&>lgT=wqYmliJ7ZTN&)*Fp zt;kz?y2YIEciOjWrsGsnKuV9XoNOTD$v!fW>>)aK`tiLYt2lp;%ptyqhT7WN?ioby zWhO}?%ZQFD^zRmuL=r{bA@#`;^89g#f?k7-q_wGKS11I$}uz=}CGJ9fL?3`A`Lpct36&CX*>v7E8$iqR!qX zYe{z!tnIXhlcA*aSi#8-vbnSZo0r_G6ctz!P-U$rc=G71iBlI80yAv$IQY%Zr=j`5%o{R`>t_ delta 3894 zcmYk;32;tV7{>7vk_c52Bx;Eyh%HG&P+MEEhpN~b)KUqd5@Kmn4eAC(5Q3hu-RJb;mS+Ul=id&)OZ=SSCat_ij>2Vf)0GcXEQS-Hf@ z=dd32cTp=)tu_;;e-}!N0jh(LI?g?V^-vurq1x?$ z>L?l2es9#w2iWlub-4ePsK~GrGf^F8TX`1hf_#j@WmZ0b;gml?b@V;9z%tZI>Y%KF z8c;*j1Y%H|HO}f2!&!gLs2vr$=Uq@E9*k;uIO@W5GaI@6E*G_wi%}h|LAA3DHPbz) zl_{~~C++w-WYJt1YO~+;$Y@hML|qupD42wcM3s}U8Fog^Bpn;z1mw@n=cg_fqXt}p zy6!Xcq}886t?UK!n$>&v$k4Z|K+PzW*4Usf64g*^RDDO(jC!GFoQ7Jd@u-1iS$QgI zAi1cOn`;)J&RdOIsrAU8=Qi7cqo|HPM>X&@s-yF$CA)&U@GsP!s4#=rd8!XZbyyd* zS7J~r+XG{9G)ChB)C%svhV<`FSjA;ug>w&3GmqeEHQWeQjzz6N0%{YzX!YGuGwWxj z;thoj-@GRp*$}^e9 zUc7>8cq#91T~~}6;4X~AeW(>JLrvr=YGCE)>B9SDWB{)_8H#Es3bhv!P%}tI?b^Yp z^Dxk2>A})o!y!tiLKcQK1p_M9p{rYDGp`eFiqC zJQ>yD8q|5au{|C^oqrScO1_WL7!l=v6?Z^gKMb3qhw->0%JZLao(hfd9;)FA)C{Xc z`|Bf61C2u6yH==`NJL%N6*YhqGZi(VG}Kcv7Pa&fP%D{Z=6ht+(P~u3TT##dK~%%1 zPz`*GYVZft(p^H`qC2R8{b%Kn82<`IAgk_Lp*l`MeFFwsc@(N$Z@g7xp=L0{%(D~n zQ3G6rn)zCD1FC~9sDU3x7R{YOZN3}G6Y6fG1{&Ph-%cIW@g~TGJlEVR+Ms6A9yO3; zEB8T-bg(%bwK8K+OF0oWz&un(1*ie7v*X*X{s`(tcM5guE@H5r|LbJ5d+*wT0Cvy| zl*3RRrJ@El95t|U$fR5rYDEfBE3pdoVmX8~<<6o8bQ^W+9+|=HK(!l+zVClMGCHB9 zDzGhTKs`_m3`O0$4Aek!?0BBJ)ZB;~;C|GKm0I~zREH-}{d|LZiY}n<`~L@-%2eD% z&ERkJjWE{VaXr+9v8W|aL|z%L8>+)Gs0K69cPmhvt^n1}N@Vh`7_~=^V-jADW&O33 zq0RiyYZA7gJOs6bbFdX|LEY0cs0PbW9b83qTyFJ`Q0E0T_pekf45l231FQSOx@Z8 z^zTxMQC7)U*!QnE-yq+Avm0?O@jTIsP|72;3Im8NVm`5zm`=Pxd`NU8`VdMziFrhC z6-b$WTvzO?yzb>nWk@rLKtfNzG$NKrCR!7Z(_3T~66sdK+t$r4>Q=qBx65j@Ho9?q zx!j8c8_Jh<^Si1_%LWC0Ch($yO@kH|6aw};&D^($M zgO$b-ZImJHCA1~^l)6M>I8jLGb2Wz;L+H!$Hjzy%Ba|8w{e3zAj%rDM1ks6Dp|{CC zGJ1xBh^fRBVm0w(Dxxrf_=p%vY$ud9`*G2@nAk?VLA**RX=`h{_aO8_7)Crxnm9 i^z7WpQ>Ub7XBPb#8DIKa^Ol%8rbDe!+c9#w(> diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index c832e78..d5e5d6f 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-11 22:32+0300\n" +"POT-Creation-Date: 2017-10-11 22:47+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -117,8 +117,7 @@ msgstr "Tyyppi" #: infoscreen/templates/infoscreen_admin.html:116 #: infoscreen/templates/infoscreen_admin.html:132 #: infoscreen/templates/infoscreen_admin.html:138 -#: members/templates/member_edit.html:20 -#: members/templates/payment_edit.html:20 +#: members/templates/member_edit.html:20 members/templates/payment_edit.html:20 msgid "Delete" msgstr "Poista" @@ -170,8 +169,7 @@ msgid "id" msgstr "id" #: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:93 -#: webapp/models.py:134 webapp/models.py:155 -#: webapp/templates/kaehmy_list.html:40 +#: webapp/models.py:123 webapp/templates/kaehmy_list.html:40 msgid "Name" msgstr "Nimi" @@ -211,7 +209,7 @@ msgstr "Etunimi" msgid "Last name" msgstr "Sukunimi" -#: members/models.py:16 webapp/models.py:135 webapp/models.py:156 +#: members/models.py:16 webapp/models.py:124 #: webapp/templates/kaehmy_list.html:44 msgid "Email" msgstr "Sähköposti" @@ -294,8 +292,7 @@ msgid "Add member" msgstr "Lisää jäsen" #: members/templates/member_add.html:15 members/templates/member_edit.html:18 -#: members/templates/payment_add.html:20 -#: members/templates/payment_edit.html:18 +#: members/templates/payment_add.html:20 members/templates/payment_edit.html:18 msgid "Save" msgstr "Tallenna" @@ -390,8 +387,7 @@ msgstr "Kyllä, olen varma" msgid "Edit member" msgstr "Muokkaa jäsentä" -#: members/templates/member_list.html:11 -#: members/templates/members_base.html:15 +#: members/templates/member_list.html:11 members/templates/members_base.html:15 msgid "Member register" msgstr "Jäsenrekisteri" @@ -399,13 +395,11 @@ msgstr "Jäsenrekisteri" msgid "Members in register:" msgstr "Jäseniä:" -#: members/templates/member_list.html:28 -#: members/templates/payment_list.html:25 +#: members/templates/member_list.html:28 members/templates/payment_list.html:25 msgid "Search" msgstr "Hae" -#: members/templates/member_list.html:36 -#: members/templates/payment_list.html:33 +#: members/templates/member_list.html:36 members/templates/payment_list.html:33 msgid "Showing results for" msgstr "Näytetään tulokset haulle" @@ -430,8 +424,7 @@ msgstr "Lisää useita" msgid "List payments" msgstr "Maksulistaus" -#: members/templates/members_base.html:63 -#: members/templates/payment_add.html:13 +#: members/templates/members_base.html:63 members/templates/payment_add.html:13 msgid "Add payment" msgstr "Lisää maksu" @@ -602,7 +595,7 @@ msgstr "Ilmoittautuminen" msgid "Registrations" msgstr "Ilmoittautumiset" -#: webapp/models.py:94 webapp/models.py:164 +#: webapp/models.py:94 webapp/models.py:163 msgid "Board member" msgstr "Hallituksen jäsen" @@ -618,47 +611,47 @@ msgstr "Kuvaus" msgid "Summary" msgstr "Tiivistelmä" -#: webapp/models.py:136 +#: webapp/models.py:137 msgid "Message" msgstr "Viesti" -#: webapp/models.py:138 +#: webapp/models.py:139 msgid "Timestamp" msgstr "Aikaleima" -#: webapp/models.py:158 webapp/models.py:217 +#: webapp/models.py:157 webapp/models.py:216 msgid "Phone number" msgstr "Puhelinnumero" -#: webapp/models.py:159 +#: webapp/models.py:158 msgid "Year" msgstr "Vuosi" -#: webapp/models.py:160 +#: webapp/models.py:159 msgid "Text" msgstr "Teksti" -#: webapp/models.py:162 +#: webapp/models.py:161 msgid "Custom role name" msgstr "Uusi virka" -#: webapp/models.py:172 +#: webapp/models.py:171 msgid "Kaehmy application: {}" msgstr "Kaehmy: {}" -#: webapp/models.py:202 +#: webapp/models.py:201 msgid "Role" msgstr "Rooli" -#: webapp/models.py:204 +#: webapp/models.py:203 msgid "Start date" msgstr "Alkupäivämäärä" -#: webapp/models.py:205 +#: webapp/models.py:204 msgid "End date" msgstr "Loppupäivämäärä" -#: webapp/models.py:215 +#: webapp/models.py:214 msgid "Official" msgstr "Toimihenkilö" @@ -731,11 +724,15 @@ msgstr "Kommentoi" msgid "Reply" msgstr "Vastaa" -#: webapp/templates/kaehmy_navigation.html:16 -msgid "Apply" -msgstr "Hakulomake" +#: webapp/templates/kaehmy_navigation.html:10 +msgid "List kaehmys" +msgstr "Kaikki kaehmyt" -#: webapp/templates/kaehmy_navigation.html:17 +#: webapp/templates/kaehmy_navigation.html:11 +msgid "New kaehmy" +msgstr "Uusi kaehmy" + +#: webapp/templates/kaehmy_navigation.html:12 #: webapp/templates/kaehmy_statistics.html:12 msgid "Statistics" msgstr "Kaehmytilastot" @@ -788,5 +785,8 @@ msgstr "Kaikki haasteet" msgid "Total challenges:" msgstr "Haasteita yhteensä:" +#~ msgid "Apply" +#~ msgstr "Hakulomake" + #~ msgid "language" #~ msgstr "Kieli" diff --git a/webapp/models.py b/webapp/models.py index 3c98f71..3e00e7a 100644 --- a/webapp/models.py +++ b/webapp/models.py @@ -186,6 +186,11 @@ class KaehmyForm(MessageParent): return total + def all_roles(self): + presets = [r.name.capitalize() for r in self.preset_roles.all()] + customs = [r.name.capitalize() for r in self.custom_roles.all()] + return ', '.join(presets + customs) + class Role(PresetRole): """ diff --git a/webapp/templates/kaehmy_list.html b/webapp/templates/kaehmy_list.html index 84dcb47..d4153d4 100644 --- a/webapp/templates/kaehmy_list.html +++ b/webapp/templates/kaehmy_list.html @@ -21,11 +21,11 @@
-

{% trans "All kaehmys" %}

+

{% trans "All kaehmys" %}

-
{% trans "Total kaehmys:" %} {{ application_count }}
+
{% trans "Total kaehmys:" %} {{ application_count }}
@@ -58,17 +58,11 @@ {% for application in applications %}
+

{{ application.name }}

-

{{ application.name }}

-
{% trans "Roles" %}:
- {% for role in application.custom_roles.all %} -
{{ role.name }}
- {% endfor %} - {% for role in application.preset_roles.all %} -
{{ role.name }}
- {% endfor %} - -

{{ application.text }}

+
{{ application.all_roles }}
+ +

{{ application.text }}

{% if application.comment_count > 0 %}