From e8fafeda841d31bde41ab759cf226f85cb920dd1 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Thu, 12 Oct 2017 00:56:28 +0300 Subject: [PATCH] Fix things --- locale/en/LC_MESSAGES/django.mo | Bin 7141 -> 7141 bytes locale/en/LC_MESSAGES/django.po | 80 +++++++++++++------ locale/fi/LC_MESSAGES/django.mo | Bin 10284 -> 10580 bytes locale/fi/LC_MESSAGES/django.po | 71 ++++++++++------ webapp/forms.py | 10 ++- webapp/migrations/0027_auto_20171012_0037.py | 26 ++++++ webapp/models.py | 14 ++-- webapp/static/css/webapp.css | 2 +- webapp/templates/kaehmy.html | 2 +- webapp/templates/kaehmy_navigation.html | 2 +- webapp/templates/sik_header.html | 2 +- webapp/views.py | 12 +-- 12 files changed, 156 insertions(+), 65 deletions(-) create mode 100644 webapp/migrations/0027_auto_20171012_0037.py diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 345887faa4ca361395468d035826b305f1c19fc9..467a9896026d64422093c6bd47dc4f61c397b19f 100644 GIT binary patch delta 20 bcmaEA{?vTKT_JWO1p@;s6VuI4gcvyiRw@SP delta 20 bcmaEA{?vTKT_JWu1tTLX6Z6eagcvyiR!|1) diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 42d397f..ac4ecc7 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:47+0300\n" +"POT-Creation-Date: 2017-10-12 00:48+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -168,7 +168,7 @@ msgid "id" msgstr "id" #: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:93 -#: webapp/models.py:123 webapp/templates/kaehmy_list.html:40 +#: webapp/models.py:126 webapp/templates/kaehmy_list.html:40 msgid "Name" msgstr "Name" @@ -210,7 +210,7 @@ msgstr "First name" msgid "Last name" msgstr "Last name" -#: members/models.py:16 webapp/models.py:124 +#: members/models.py:16 webapp/models.py:127 #: webapp/templates/kaehmy_list.html:44 msgid "Email" msgstr "Email" @@ -551,6 +551,18 @@ msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" #: webapp/forms.py:28 +#, fuzzy +#| msgid "Total challenges:" +msgid "Custom roles" +msgstr "Total challenges:" + +#: webapp/forms.py:30 +#, fuzzy +#| msgid "Total challenges:" +msgid "Preset roles" +msgstr "Total challenges:" + +#: webapp/forms.py:40 msgid "Invalid value" msgstr "" @@ -610,71 +622,95 @@ msgstr "Rotation" msgid "Registrations" msgstr "Rotations" -#: webapp/models.py:94 webapp/models.py:163 +#: webapp/models.py:94 webapp/models.py:166 #, fuzzy #| msgid "Add member" msgid "Board member" msgstr "Add member" -#: webapp/models.py:97 +#: webapp/models.py:98 #, fuzzy #| msgid "Add member" msgid "board member" msgstr "Add member" -#: webapp/models.py:103 +#: webapp/models.py:104 #, fuzzy #| msgid "Duration" msgid "Description" msgstr "Duration" -#: webapp/models.py:104 +#: webapp/models.py:105 msgid "Summary" msgstr "" -#: webapp/models.py:137 +#: webapp/models.py:112 +#, fuzzy +#| msgid "Total challenges:" +msgid "Preset kaehmy role" +msgstr "Total challenges:" + +#: webapp/models.py:113 +#, fuzzy +#| msgid "Total challenges:" +msgid "Preset kaehmy roles" +msgstr "Total challenges:" + +#: webapp/models.py:120 +#, fuzzy +#| msgid "Total challenges:" +msgid "Custom kaehmy role" +msgstr "Total challenges:" + +#: webapp/models.py:121 +#, fuzzy +#| msgid "Total challenges:" +msgid "Custom kaehmy roles" +msgstr "Total challenges:" + +#: webapp/models.py:140 msgid "Message" msgstr "" -#: webapp/models.py:139 +#: webapp/models.py:142 msgid "Timestamp" msgstr "" -#: webapp/models.py:157 webapp/models.py:216 +#: webapp/models.py:160 webapp/models.py:224 msgid "Phone number" msgstr "" -#: webapp/models.py:158 +#: webapp/models.py:161 msgid "Year" msgstr "" -#: webapp/models.py:159 +#: webapp/models.py:162 msgid "Text" msgstr "" -#: webapp/models.py:161 +#: webapp/models.py:164 msgid "Custom role name" msgstr "" -#: webapp/models.py:171 +#: webapp/models.py:174 #, fuzzy #| msgid "Member applications" msgid "Kaehmy application: {}" msgstr "Member applications" -#: webapp/models.py:201 +#: webapp/models.py:209 msgid "Role" msgstr "" -#: webapp/models.py:203 +#: webapp/models.py:211 msgid "Start date" msgstr "" -#: webapp/models.py:204 +#: webapp/models.py:212 msgid "End date" msgstr "" -#: webapp/models.py:214 +#: webapp/models.py:222 msgid "Official" msgstr "" @@ -733,15 +769,11 @@ msgstr "" msgid "Comment" msgstr "" -#: webapp/templates/kaehmy_list.html:63 -msgid "Roles" -msgstr "" - -#: webapp/templates/kaehmy_list.html:75 +#: webapp/templates/kaehmy_list.html:69 msgid "Show comments" msgstr "" -#: webapp/templates/kaehmy_list.html:81 +#: webapp/templates/kaehmy_list.html:75 #, fuzzy #| msgid "Add payment" msgid "Add comment" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index 9c321661baa858ddfd16117a860ba228a285f13e..b7afd579d45c1f58a952d099b271046d7ecbc511 100644 GIT binary patch delta 4226 zcmZA32~bs49LMpafLkaoD266a0R_0lwJOcOQmPe;rfsAlAcE)_x9ks|(1FbIqJ< zBrwvskZVgpCnO{HcIj5n#3s~ptUeiagF@s&w-~$ND(s3?7>*~gF`h=9_qWv}n){!( zK()8VhV<_eDb%N-8@9q;cpYY0dm*M%4`M^yf$_NCJdW+CU&1(S)55R!Mb#(ZwYUH^ z^9`tpZpFs*@AgvA01hJeaPK2O?l`|R<7(81FQaDIDB3p)bzL-S$=jk*IF<6&+0Ci$Ks>5Wf_ePyR0Ndjbs}~?YZVtcHQ5h!T zM$}$-%lsHMps!F9IMI^z*X})KAN-1%(eJ3ea1k|-rc`v}R;UZ(%w%MLxf@U`nQ4wh zbvy}mznQ2R2T?1u$Ua{avJ=Wt&%6S)IS!yU%?GFpze85d{bKdY*pYffj6b6;sFg{> zHrNk2#f?XP+-!bn0xMAWTWf}%v=6qSmii_0HETbNEP^|Vn&Ho=O?uv}$Ai|uuSI>{ z71co>t7o8Qd^>7ICZkq#7V;=UE=WNmn~z%BWoDUwf_ogbgyl$|uEN^iKy`Qsb^XVv z4n9K-=ttCbf1y_9irJ85ReLmg-~Togw3!l-A2*m^iI|H4T!C8B?Wi~8dshG6>X%V7 zj*azi+yPZjM$J48wZ}57{Z`Z_%#!;4kD@RN$D>wY7iv=-Ks}NVQ5SrHn&~&F8Jx8C zYShesL#@casBcjuqb{h!e!^+g7c%-C_#^7RkMNcY>B21(G{T*jf_qUNeT|yQPpE-a zqb~f@jNrAWdNk@j@u39eqbWhHOldowe-8?qY3PebP#s^xdsELW z8g;`st9M5Yq(5q=gHbCn+S(^#C+c~qj@F>gdj`{S59<7%P_OVaaUuU1M+N+Mbt>ux z*_eRyunTTMu5lls26!5E|CqzLP=AuTH zZ{ClZ={(feWf|&GtVG>-tyzH@z<$(#-bKA9j-u{+5_SDq)cr1?R`d$$k%gLd@JAen zYUqqwy57iRcEeE}=c8s&Wc4Me8$WFIGSmb%nC13)1!{oXQ8TYH-$d>oa&J@6$WNe_ zxEi$?BY8mjzBfe;ED3d^o*0Iis2L5h`Y6=Wk3$XQ9;?ql4K!#jK&{MDY)1dCl!9(t zZtg&J_&RD}hfzy@%-VlOy%8^i3}rwiGq7b*O%}Vn~IZ z)=*`>iyG+>)P-M}XUt2e88q(bFKskx0I{fn#iRC6S8Kl+!>A8MO(@IS^EQdCJwjAr>Yp5F@LOrTaQJeAyRL7^0r{T_{_D~Gp;qKTA+2}4G16YPhxEr;i zpLb&YJ5#twgPwH)pX!EbSRebKI?k~6v8eMVp;o96>)~9?#wDnU96@~zzckOH&I?Pn zJ%hSFHbfzULL%yWnPLvWy3}*94(hm>JWTczT|AiR(2`E_O8lKSg;tU$>w`^{VfYry#F;7*R**TtW${iD9R1GF(t(_0u&2!De6P7xpH7&a(MhOZ`l5aSIb;etGs?|LRRI4gx+EQ0i>3o A1ONa4 delta 3928 zcmYk;32;qU9LMpK1n=L{V*%2BFp#Riu=( zmc~qt4z0FoOwCj&Q*_fRGt^8equ<}V|IE1K_dfTWd*9jaxi2mZDjMLw8tGf-I1Z6o zq$t$6JJ{|SJ~;lZ;9Mp?z%MZ)!ntyoP|>p)hEQ&eiI|3EaI)3UKs7Z7`RA7K5svxz ztaE<1nG@Zx2Wi`VYUNW%pYFVse@6bfTYT_E_ZS;vcqQkOFcp26iREz$>c06_&b8|W zR=)wm=-=()q%1ccz^ZrzYvXrTe+yes{s+UbQKWORm|_mYI+S0eN3( z%{;2IH_>P;PyendCmKK+YKC1=GZ|uzu8Or+q1qpS zn)xuhJ`RH^XGO98x-pvyb(n)HFGqc0HP*#-Rz8AND4#@ibP*fiHPkZ?=c25J8c;lH z0*RseX%hz8JA+^o)}MgAZkYQQ7f|uYvM}epWDgDb6A3! z!1t*3elmZt`dg@#zHj<{d`n-bj10=vLd`H4*|4qys-ZzvKO8l)iKv;+N3Gln)Bx95 zIUm(-A!;SJn|o3BeS)l*-yP$Gf9`}`xQH6S6;uO%qB^>VTDl;1oR+!@Y9(r!309ws z>aaCx?{r43a3;o~A7gMA*3|odniKug||^WpNQ|1#`_pKPT#F4{An7QSbjL zRKu504ctIAcoVgB_fU_f3|m|Si$ay7Q7e>$th!4_b)13vTQJeevr+B(7h1(q)C^Xc zd3Hk~YJgi%GcPg^qB=N?8u$fd5#2S^rVFa)z1E?qfz?K}lZd+B2APoGwYQ2MsG0OZ z4P>a5N1;YK*~~_*Ob%)(7o!@^Gq<5S+>aXAanyZhto}0Uhwdgu=>31fi8_pk^>%Mn z)U!>%G)%=nho}KA#=uG;lXZEhl{ti3;v=Y)`2zJ5eGTctJw^>IroQ(mn@IY1tvFE! zolqV3wi`xRITQ6-<)9i^f$C^2YCzlV`abixc@{O$tEd(H)yjXN`n!vP_y0dmv}r=) zybIMagmOL94C1Z66RP9hsLePOwX|c9-xN0+)nOj0y+YKZ*@xPMpP@QFi7bZuCXV&j zrny5!GDgIEOWFxzD38Ymn2TD%{n!Z4qn_;}RD)p&UI&q=j%%Rmo1pGXMXgj9EQ9@V z01ioD{WX)_ROq!kXr8tkFQXpGbyNd)F%%!8Uc(SZC#zyGHpC!&`dCF_x>Y=nyU0c| zN_Bev8i|g;uEl<2geo|+Qx6gT_yvBkHsgBImUJOHULl%oUowR(Bkz-$|||Eiq}t&oln zJ-n6ToIkYwz$>QBpkoi&6gYFPJMws4A<474mUxg1w6fS@=d*A-sYp7K*U1?2^zoJz zLd>$7zn;5}4ALxc#*W2$gulqH2^mV>ByGqd@-j&w3&>QmhUlnEdI!$fWXN`K!$>Rg zHYpN>PCg)Y$YeeLk(`Vrvx$xv(unjTJ&BGNNo(?v3LFU@ZagNFEGvs8WG~UmzC+$1 zJxCd{nhYnU$8xRLR!SR6Yp{87PQ*}O*sScV%$Vt8re*F3i}DquRcjxTl{ve3ezn`d mWt+z&C$~vSEuL2MaA\n" "Language-Team: LANGUAGE \n" @@ -169,7 +169,7 @@ msgid "id" msgstr "id" #: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:93 -#: webapp/models.py:123 webapp/templates/kaehmy_list.html:40 +#: webapp/models.py:126 webapp/templates/kaehmy_list.html:40 msgid "Name" msgstr "Nimi" @@ -209,7 +209,7 @@ msgstr "Etunimi" msgid "Last name" msgstr "Sukunimi" -#: members/models.py:16 webapp/models.py:124 +#: members/models.py:16 webapp/models.py:127 #: webapp/templates/kaehmy_list.html:44 msgid "Email" msgstr "Sähköposti" @@ -544,6 +544,14 @@ msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" #: webapp/forms.py:28 +msgid "Custom roles" +msgstr "Uudet virat" + +#: webapp/forms.py:30 +msgid "Preset roles" +msgstr "Kaehmyvirat" + +#: webapp/forms.py:40 msgid "Invalid value" msgstr "Epäkelpo arvo" @@ -595,63 +603,79 @@ msgstr "Ilmoittautuminen" msgid "Registrations" msgstr "Ilmoittautumiset" -#: webapp/models.py:94 webapp/models.py:163 +#: webapp/models.py:94 webapp/models.py:166 msgid "Board member" msgstr "Hallituksen jäsen" -#: webapp/models.py:97 +#: webapp/models.py:98 msgid "board member" msgstr "Hallituksen jäsen" -#: webapp/models.py:103 +#: webapp/models.py:104 msgid "Description" msgstr "Kuvaus" -#: webapp/models.py:104 +#: webapp/models.py:105 msgid "Summary" msgstr "Tiivistelmä" -#: webapp/models.py:137 +#: webapp/models.py:112 +msgid "Preset kaehmy role" +msgstr "Kaehmyvirka" + +#: webapp/models.py:113 +msgid "Preset kaehmy roles" +msgstr "Kaehmyvirat" + +#: webapp/models.py:120 +msgid "Custom kaehmy role" +msgstr "Uusi virka" + +#: webapp/models.py:121 +msgid "Custom kaehmy roles" +msgstr "Uudet kaehmyvirat" + +#: webapp/models.py:140 msgid "Message" msgstr "Viesti" -#: webapp/models.py:139 +#: webapp/models.py:142 msgid "Timestamp" msgstr "Aikaleima" -#: webapp/models.py:157 webapp/models.py:216 +#: webapp/models.py:160 webapp/models.py:224 msgid "Phone number" msgstr "Puhelinnumero" -#: webapp/models.py:158 +#: webapp/models.py:161 msgid "Year" msgstr "Vuosi" -#: webapp/models.py:159 +#: webapp/models.py:162 msgid "Text" msgstr "Teksti" -#: webapp/models.py:161 +#: webapp/models.py:164 msgid "Custom role name" msgstr "Uusi virka" -#: webapp/models.py:171 +#: webapp/models.py:174 msgid "Kaehmy application: {}" msgstr "Kaehmy: {}" -#: webapp/models.py:201 +#: webapp/models.py:209 msgid "Role" msgstr "Rooli" -#: webapp/models.py:203 +#: webapp/models.py:211 msgid "Start date" msgstr "Alkupäivämäärä" -#: webapp/models.py:204 +#: webapp/models.py:212 msgid "End date" msgstr "Loppupäivämäärä" -#: webapp/models.py:214 +#: webapp/models.py:222 msgid "Official" msgstr "Toimihenkilö" @@ -708,15 +732,11 @@ msgstr "Kommentoidaan viestiin lähettäjältä" msgid "Comment" msgstr "Kommentti" -#: webapp/templates/kaehmy_list.html:63 -msgid "Roles" -msgstr "Roolit" - -#: webapp/templates/kaehmy_list.html:75 +#: webapp/templates/kaehmy_list.html:69 msgid "Show comments" msgstr "Näytä kommentit" -#: webapp/templates/kaehmy_list.html:81 +#: webapp/templates/kaehmy_list.html:75 msgid "Add comment" msgstr "Kommentoi" @@ -785,6 +805,9 @@ msgstr "Kaikki haasteet" msgid "Total challenges:" msgstr "Haasteita yhteensä:" +#~ msgid "Roles" +#~ msgstr "Roolit" + #~ msgid "Apply" #~ msgstr "Hakulomake" diff --git a/webapp/forms.py b/webapp/forms.py index 66afbd8..fc715b0 100644 --- a/webapp/forms.py +++ b/webapp/forms.py @@ -21,12 +21,18 @@ class KaehmyForm_Form(forms.ModelForm): def __init__(self, *args, **kwargs): super(KaehmyForm_Form, self).__init__(*args, **kwargs) - self.fields["custom_roles"].widget = forms.widgets.CheckboxSelectMultiple() + + custom_roles_exist = CustomKaehmyRole.objects.all().exists() + self.fields["custom_roles"].widget = forms.widgets.CheckboxSelectMultiple() if custom_roles_exist else forms.HiddenInput() self.fields["custom_roles"].help_text = "" + self.fields["custom_roles"].label = _('Custom roles') self.fields["custom_roles"].queryset = CustomKaehmyRole.objects.all() - self.fields["preset_roles"].widget = forms.widgets.CheckboxSelectMultiple() + self.fields["preset_roles"].widget = forms.widgets.CheckboxSelectMultiple(attrs={'title': _('Preset roles')}) self.fields["preset_roles"].help_text = "" self.fields["preset_roles"].queryset = PresetKaehmyRole.objects.all() + self.fields["preset_roles"].label = _('Preset roles') + + print(vars(self.fields["custom_roles"])) def clean_phone_number(self): """Clean phone number field.""" diff --git a/webapp/migrations/0027_auto_20171012_0037.py b/webapp/migrations/0027_auto_20171012_0037.py new file mode 100644 index 0000000..00de956 --- /dev/null +++ b/webapp/migrations/0027_auto_20171012_0037.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11 on 2017-10-11 21:37 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('webapp', '0026_auto_20171011_2236'), + ] + + operations = [ + migrations.DeleteModel( + name='KaehmyFormSelectedRole', + ), + migrations.AlterModelOptions( + name='customkaehmyrole', + options={'verbose_name': 'Custom kaehmy role', 'verbose_name_plural': 'Custom kaehmy roles'}, + ), + migrations.AlterModelOptions( + name='presetkaehmyrole', + options={'verbose_name': 'Preset kaehmy role', 'verbose_name_plural': 'Preset kaehmy roles'}, + ), + ] diff --git a/webapp/models.py b/webapp/models.py index 5d65047..0e05a5f 100644 --- a/webapp/models.py +++ b/webapp/models.py @@ -107,16 +107,18 @@ class PresetRole(BaseRole): class PresetKaehmyRole(PresetRole): """Model for kaehmy role.""" - pass + + class Meta: + verbose_name = _('Preset kaehmy role') + verbose_name_plural = _('Preset kaehmy roles') class CustomKaehmyRole(BaseRole): """Model representing a user-specified custom occupation.""" - pass - - -class KaehmyFormSelectedRole(models.Model): - pass + + class Meta: + verbose_name = _('Custom kaehmy role') + verbose_name_plural = _('Custom kaehmy roles') class MessageParent(models.Model): diff --git a/webapp/static/css/webapp.css b/webapp/static/css/webapp.css index 242628d..05be3da 100644 --- a/webapp/static/css/webapp.css +++ b/webapp/static/css/webapp.css @@ -6,7 +6,7 @@ } body { - max-width: 700px; + max-width: 1000px; margin-left: auto !important; margin-right: auto !important; } diff --git a/webapp/templates/kaehmy.html b/webapp/templates/kaehmy.html index 0739479..5f788dc 100644 --- a/webapp/templates/kaehmy.html +++ b/webapp/templates/kaehmy.html @@ -9,7 +9,7 @@ {% block content %}
-

{% trans "Kaehmy" %}

+

{% trans "Kaehmy" %}

{% csrf_token %} diff --git a/webapp/templates/kaehmy_navigation.html b/webapp/templates/kaehmy_navigation.html index 3cdf28a..125652a 100644 --- a/webapp/templates/kaehmy_navigation.html +++ b/webapp/templates/kaehmy_navigation.html @@ -1,7 +1,7 @@ {% load i18n %}
-