diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index cc3f55d..6614a3f 100644 Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 7978039..86403be 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-02 20:52+0300\n" +"POT-Creation-Date: 2017-10-11 22:32+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -33,7 +33,7 @@ msgstr "External website" msgid "Sössö articles" msgstr "Sössö articles" -#: infoscreen/models.py:199 webapp/models.py:70 +#: infoscreen/models.py:199 webapp/models.py:72 msgid "Events" msgstr "Events" @@ -116,7 +116,8 @@ 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" @@ -167,8 +168,9 @@ msgstr "Select rotation to edit" msgid "id" msgstr "id" -#: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:91 -#: webapp/models.py:125 webapp/models.py:138 +#: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:93 +#: webapp/models.py:134 webapp/models.py:155 +#: webapp/templates/kaehmy_list.html:40 msgid "Name" msgstr "Name" @@ -192,7 +194,7 @@ msgid "English" msgstr "English" #: infoscreen/templates/infoscreen_admin.html:166 -#: members/templates/settings.html:23 +#: members/templates/settings.html:23 webapp/templates/kaehmy.html:19 #, fuzzy #| msgid "Submitted" msgid "Submit" @@ -210,7 +212,8 @@ msgstr "First name" msgid "Last name" msgstr "Last name" -#: members/models.py:16 webapp/models.py:126 webapp/models.py:139 +#: members/models.py:16 webapp/models.py:135 webapp/models.py:156 +#: webapp/templates/kaehmy_list.html:44 msgid "Email" msgstr "Email" @@ -292,7 +295,8 @@ 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" @@ -358,6 +362,7 @@ msgstr "" #: members/templates/member_add_many.html:48 #: members/templates/member_add_many_confirm.html:22 +#: webapp/templates/kaehmy_list.html:52 msgid "Send" msgstr "Send" @@ -388,7 +393,8 @@ 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" @@ -398,11 +404,13 @@ 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 "" @@ -427,7 +435,8 @@ 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" @@ -536,7 +545,7 @@ msgstr "Successfully updated payment" msgid "Could not update payment object" msgstr "Could not update payment object" -#: members/views/utils.py:116 +#: members/views/utils.py:117 msgid "Missing \"textfield\" POST request field" msgstr "Missing \"textfield\" POST request field" @@ -548,106 +557,134 @@ msgstr "" msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" -#: webapp/models.py:15 +#: webapp/forms.py:28 +msgid "Invalid value" +msgstr "" + +#: webapp/models.py:17 msgid "Webapp" msgstr "" -#: webapp/models.py:26 +#: webapp/models.py:28 msgid "Tag" msgstr "" -#: webapp/models.py:27 +#: webapp/models.py:29 msgid "Tags" msgstr "" -#: webapp/models.py:30 +#: webapp/models.py:32 msgid "Tag: {}" msgstr "" -#: webapp/models.py:50 +#: webapp/models.py:52 msgid "Feed: {}" msgstr "" -#: webapp/models.py:53 +#: webapp/models.py:55 msgid "Feed" msgstr "" -#: webapp/models.py:54 +#: webapp/models.py:56 msgid "Feeds" msgstr "" -#: webapp/models.py:66 +#: webapp/models.py:68 #, fuzzy #| msgid "Events" msgid "Event: {}" msgstr "Events" -#: webapp/models.py:69 +#: webapp/models.py:71 #, fuzzy #| msgid "Events" msgid "Event" msgstr "Events" -#: webapp/models.py:81 +#: webapp/models.py:83 msgid "Registration: {}" msgstr "" -#: webapp/models.py:84 +#: webapp/models.py:86 #, fuzzy #| msgid "Rotation" msgid "Registration" msgstr "Rotation" -#: webapp/models.py:85 +#: webapp/models.py:87 #, fuzzy #| msgid "Rotations" msgid "Registrations" msgstr "Rotations" -#: webapp/models.py:92 +#: webapp/models.py:94 webapp/models.py:164 #, fuzzy #| msgid "Add member" msgid "Board member" msgstr "Add member" -#: webapp/models.py:98 +#: webapp/models.py:97 +#, fuzzy +#| msgid "Add member" +msgid "board member" +msgstr "Add member" + +#: webapp/models.py:103 #, fuzzy #| msgid "Duration" msgid "Description" msgstr "Duration" -#: webapp/models.py:99 +#: webapp/models.py:104 msgid "Summary" msgstr "" -#: webapp/models.py:127 +#: webapp/models.py:136 msgid "Message" msgstr "" -#: webapp/models.py:140 +#: webapp/models.py:138 +msgid "Timestamp" +msgstr "" + +#: webapp/models.py:158 webapp/models.py:217 +msgid "Phone number" +msgstr "" + +#: webapp/models.py:159 msgid "Year" msgstr "" -#: webapp/models.py:154 +#: webapp/models.py:160 +msgid "Text" +msgstr "" + +#: webapp/models.py:162 +msgid "Custom role name" +msgstr "" + +#: webapp/models.py:172 +#, fuzzy +#| msgid "Member applications" +msgid "Kaehmy application: {}" +msgstr "Member applications" + +#: webapp/models.py:202 msgid "Role" msgstr "" -#: webapp/models.py:156 +#: webapp/models.py:204 msgid "Start date" msgstr "" -#: webapp/models.py:157 +#: webapp/models.py:205 msgid "End date" msgstr "" -#: webapp/models.py:167 +#: webapp/models.py:215 msgid "Official" msgstr "" -#: webapp/models.py:169 -msgid "Phone number" -msgstr "" - #: webapp/templates/admin_index.html:6 msgid "SIK Admin" msgstr "SIK Admin" @@ -680,6 +717,56 @@ msgstr "International" msgid "Jobs" msgstr "Jobs" +#: webapp/templates/kaehmy.html:12 +msgid "Kaehmy" +msgstr "" + +#: webapp/templates/kaehmy_list.html:24 +msgid "All kaehmys" +msgstr "" + +#: webapp/templates/kaehmy_list.html:28 +#: webapp/templates/kaehmy_statistics.html:14 +#, fuzzy +#| msgid "Total challenges:" +msgid "Total kaehmys:" +msgstr "Total challenges:" + +#: webapp/templates/kaehmy_list.html:36 +msgid "Commenting on post by " +msgstr "" + +#: webapp/templates/kaehmy_list.html:48 +msgid "Comment" +msgstr "" + +#: webapp/templates/kaehmy_list.html:63 +msgid "Roles" +msgstr "" + +#: webapp/templates/kaehmy_list.html:75 +msgid "Show comments" +msgstr "" + +#: webapp/templates/kaehmy_list.html:81 +#, fuzzy +#| msgid "Add payment" +msgid "Add comment" +msgstr "Add payment" + +#: webapp/templates/kaehmy_message.html:11 +msgid "Reply" +msgstr "" + +#: webapp/templates/kaehmy_navigation.html:16 +msgid "Apply" +msgstr "" + +#: webapp/templates/kaehmy_navigation.html:17 +#: webapp/templates/kaehmy_statistics.html:12 +msgid "Statistics" +msgstr "" + #: webapp/templates/login.html:25 webapp/templates/login.html:27 msgid "Username" msgstr "Username" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index fbdf6e5..def1676 100644 Binary files a/locale/fi/LC_MESSAGES/django.mo and b/locale/fi/LC_MESSAGES/django.mo differ diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index df65fb7..c832e78 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-02 20:52+0300\n" +"POT-Creation-Date: 2017-10-11 22:32+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -34,7 +34,7 @@ msgstr "Ulkoinen verkkosivu" msgid "Sössö articles" msgstr "Sössön artikkelit" -#: infoscreen/models.py:199 webapp/models.py:70 +#: infoscreen/models.py:199 webapp/models.py:72 msgid "Events" msgstr "Tapahtumat" @@ -117,7 +117,8 @@ 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" @@ -168,8 +169,9 @@ msgstr "Valitse muokattava rotaatio" msgid "id" msgstr "id" -#: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:91 -#: webapp/models.py:125 webapp/models.py:138 +#: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:93 +#: webapp/models.py:134 webapp/models.py:155 +#: webapp/templates/kaehmy_list.html:40 msgid "Name" msgstr "Nimi" @@ -193,7 +195,7 @@ msgid "English" msgstr "englanti" #: infoscreen/templates/infoscreen_admin.html:166 -#: members/templates/settings.html:23 +#: members/templates/settings.html:23 webapp/templates/kaehmy.html:19 msgid "Submit" msgstr "Lisää" @@ -209,7 +211,8 @@ msgstr "Etunimi" msgid "Last name" msgstr "Sukunimi" -#: members/models.py:16 webapp/models.py:126 webapp/models.py:139 +#: members/models.py:16 webapp/models.py:135 webapp/models.py:156 +#: webapp/templates/kaehmy_list.html:44 msgid "Email" msgstr "Sähköposti" @@ -291,7 +294,8 @@ 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" @@ -351,11 +355,11 @@ msgid "" "The symbol that is used to separate items in one line. Defaults to " "';' (semicolon)." msgstr "" -"Merkki, jota käytetään rivin osien erottamiseen. Oletuksena " -"';' (puolipiste)." +"Merkki, jota käytetään rivin osien erottamiseen. Oletuksena ';' (puolipiste)." #: members/templates/member_add_many.html:48 #: members/templates/member_add_many_confirm.html:22 +#: webapp/templates/kaehmy_list.html:52 msgid "Send" msgstr "Lähetä" @@ -386,7 +390,8 @@ 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" @@ -394,11 +399,13 @@ 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" @@ -423,7 +430,8 @@ 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" @@ -530,7 +538,7 @@ msgstr "Onnistuneesti päivitettiin maksutapahtuma" msgid "Could not update payment object" msgstr "Maksutapahtumaobjektia ei voitu päivittää" -#: members/views/utils.py:116 +#: members/views/utils.py:117 msgid "Missing \"textfield\" POST request field" msgstr "Puuttuva \"textfield\" POST-kenttä" @@ -542,94 +550,118 @@ msgstr "Vaihda" msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" -#: webapp/models.py:15 +#: webapp/forms.py:28 +msgid "Invalid value" +msgstr "Epäkelpo arvo" + +#: webapp/models.py:17 msgid "Webapp" msgstr "Nettisivut" -#: webapp/models.py:26 +#: webapp/models.py:28 msgid "Tag" msgstr "Tunniste" -#: webapp/models.py:27 +#: webapp/models.py:29 msgid "Tags" msgstr "Tunnisteet" -#: webapp/models.py:30 +#: webapp/models.py:32 msgid "Tag: {}" msgstr "Tunniste: {}" -#: webapp/models.py:50 +#: webapp/models.py:52 msgid "Feed: {}" msgstr "Uutinen: {}" -#: webapp/models.py:53 +#: webapp/models.py:55 msgid "Feed" msgstr "Uutinen" -#: webapp/models.py:54 +#: webapp/models.py:56 msgid "Feeds" msgstr "Uutiset" -#: webapp/models.py:66 +#: webapp/models.py:68 msgid "Event: {}" msgstr "Tapahtuma: {}" -#: webapp/models.py:69 +#: webapp/models.py:71 msgid "Event" msgstr "Tapahtuma" -#: webapp/models.py:81 +#: webapp/models.py:83 msgid "Registration: {}" msgstr "Registration: {}" -#: webapp/models.py:84 +#: webapp/models.py:86 msgid "Registration" msgstr "Ilmoittautuminen" -#: webapp/models.py:85 +#: webapp/models.py:87 msgid "Registrations" msgstr "Ilmoittautumiset" -#: webapp/models.py:92 +#: webapp/models.py:94 webapp/models.py:164 msgid "Board member" msgstr "Hallituksen jäsen" -#: webapp/models.py:98 +#: webapp/models.py:97 +msgid "board member" +msgstr "Hallituksen jäsen" + +#: webapp/models.py:103 msgid "Description" msgstr "Kuvaus" -#: webapp/models.py:99 +#: webapp/models.py:104 msgid "Summary" msgstr "Tiivistelmä" -#: webapp/models.py:127 +#: webapp/models.py:136 msgid "Message" msgstr "Viesti" -#: webapp/models.py:140 +#: webapp/models.py:138 +msgid "Timestamp" +msgstr "Aikaleima" + +#: webapp/models.py:158 webapp/models.py:217 +msgid "Phone number" +msgstr "Puhelinnumero" + +#: webapp/models.py:159 msgid "Year" msgstr "Vuosi" -#: webapp/models.py:154 +#: webapp/models.py:160 +msgid "Text" +msgstr "Teksti" + +#: webapp/models.py:162 +msgid "Custom role name" +msgstr "Uusi virka" + +#: webapp/models.py:172 +msgid "Kaehmy application: {}" +msgstr "Kaehmy: {}" + +#: webapp/models.py:202 msgid "Role" msgstr "Rooli" -#: webapp/models.py:156 +#: webapp/models.py:204 msgid "Start date" msgstr "Alkupäivämäärä" -#: webapp/models.py:157 +#: webapp/models.py:205 msgid "End date" msgstr "Loppupäivämäärä" -#: webapp/models.py:167 +#: webapp/models.py:215 msgid "Official" msgstr "Toimihenkilö" -#: webapp/models.py:169 -msgid "Phone number" -msgstr "Puhelinnumero" - #: webapp/templates/admin_index.html:6 msgid "SIK Admin" msgstr "SIK Hallintapaneeli" @@ -662,6 +694,52 @@ msgstr "International" msgid "Jobs" msgstr "Työpaikat" +#: webapp/templates/kaehmy.html:12 +msgid "Kaehmy" +msgstr "Kaehmy" + +#: webapp/templates/kaehmy_list.html:24 +msgid "All kaehmys" +msgstr "Kaikki kaehmyt" + +#: webapp/templates/kaehmy_list.html:28 +#: webapp/templates/kaehmy_statistics.html:14 +msgid "Total kaehmys:" +msgstr "Kaehmyjä yhteensä:" + +#: webapp/templates/kaehmy_list.html:36 +msgid "Commenting on post by " +msgstr "Kommentoidaan viestiin lähettäjältä" + +#: webapp/templates/kaehmy_list.html:48 +msgid "Comment" +msgstr "Kommentti" + +#: webapp/templates/kaehmy_list.html:63 +msgid "Roles" +msgstr "Roolit" + +#: webapp/templates/kaehmy_list.html:75 +msgid "Show comments" +msgstr "Näytä kommentit" + +#: webapp/templates/kaehmy_list.html:81 +msgid "Add comment" +msgstr "Kommentoi" + +#: webapp/templates/kaehmy_message.html:11 +msgid "Reply" +msgstr "Vastaa" + +#: webapp/templates/kaehmy_navigation.html:16 +msgid "Apply" +msgstr "Hakulomake" + +#: webapp/templates/kaehmy_navigation.html:17 +#: webapp/templates/kaehmy_statistics.html:12 +msgid "Statistics" +msgstr "Kaehmytilastot" + #: webapp/templates/login.html:25 webapp/templates/login.html:27 msgid "Username" msgstr "Käyttäjänimi" diff --git a/webapp/templates/kaehmy_list.html b/webapp/templates/kaehmy_list.html index 2bcd48e..84dcb47 100644 --- a/webapp/templates/kaehmy_list.html +++ b/webapp/templates/kaehmy_list.html @@ -49,7 +49,7 @@
- +
diff --git a/webapp/templates/kaehmy_statistics.html b/webapp/templates/kaehmy_statistics.html index c5e1eb8..be3e26d 100644 --- a/webapp/templates/kaehmy_statistics.html +++ b/webapp/templates/kaehmy_statistics.html @@ -10,10 +10,6 @@ {% block content %}

{% trans "Statistics" %}

-
-

{% trans "All kaehmys" %}

-
-
{% trans "Total kaehmys:" %} {{ application_count }}