diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 213409b..2808dcf 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 b9a67b3..ae88ae4 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-06-07 18:22+0300\n" +"POT-Creation-Date: 2017-09-25 13:38+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,35 +17,35 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: infoscreen/models.py:77 +#: infoscreen/models.py:97 msgid "ABB jobs" msgstr "ABB jobs" -#: infoscreen/models.py:88 +#: infoscreen/models.py:112 msgid "APY Item" msgstr "ÄPY Item" -#: infoscreen/models.py:99 +#: infoscreen/models.py:127 msgid "External website" msgstr "External website" -#: infoscreen/models.py:147 +#: infoscreen/models.py:184 msgid "Sössö articles" msgstr "Sössö articles" -#: infoscreen/models.py:158 +#: infoscreen/models.py:199 msgid "Events" msgstr "Events" -#: infoscreen/models.py:169 +#: infoscreen/models.py:214 msgid "Image" msgstr "Image" -#: infoscreen/models.py:204 +#: infoscreen/models.py:260 msgid "HSL timetables" msgstr "HSL timetables" -#: infoscreen/models.py:215 +#: infoscreen/models.py:275 msgid "External image" msgstr "External image" @@ -169,7 +169,8 @@ msgstr "Select rotation to edit" msgid "id" msgstr "id" -#: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:46 +#: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:60 +#: webapp/models.py:94 webapp/models.py:107 msgid "Name" msgstr "Name" @@ -183,14 +184,12 @@ msgid "Language" msgstr "Language" #: infoscreen/templates/infoscreen_admin.html:161 -#: members/templates/settings.html:20 sikweb/settings-sample.py:179 -#: sikweb/settings.py:178 +#: members/templates/settings.html:20 sikweb/base.py:214 msgid "Finnish" msgstr "Finnish" #: infoscreen/templates/infoscreen_admin.html:162 -#: members/templates/settings.html:21 sikweb/settings-sample.py:178 -#: sikweb/settings.py:177 +#: members/templates/settings.html:21 sikweb/base.py:215 msgid "English" msgstr "English" @@ -201,67 +200,68 @@ msgstr "English" msgid "Submit" msgstr "Submitted" -#: members/forms.py:20 members/tables.py:24 +#: members/forms.py:97 members/tables.py:32 msgid "Member" msgstr "Member" -#: members/models.py:16 +#: members/models.py:14 msgid "First name" msgstr "First name" -#: members/models.py:17 +#: members/models.py:15 msgid "Last name" msgstr "Last name" -#: members/models.py:18 +#: members/models.py:16 webapp/models.py:95 webapp/models.py:108 msgid "Email" msgstr "Email" -#: members/models.py:19 +#: members/models.py:17 msgid "Place of residence" msgstr "Place of residence" -#: members/models.py:20 members/models.py:83 +#: members/models.py:19 members/models.py:84 +#: members/templates/member_add_many.html:35 msgid "AYY" msgstr "AYY" -#: members/models.py:21 +#: members/models.py:20 msgid "JAS" msgstr "JAS" -#: members/models.py:69 +#: members/models.py:70 msgid "Submitted" msgstr "Submitted" -#: members/models.py:81 +#: members/models.py:82 msgid "Date" msgstr "Date" -#: members/models.py:82 +#: members/models.py:83 msgid "Source" msgstr "Source" -#: members/models.py:84 +#: members/models.py:85 msgid "Cash" msgstr "Cash" -#: members/models.py:85 +#: members/models.py:86 members/templates/member_add_many.html:36 msgid "Bank transfer" msgstr "Bank transfer" -#: members/models.py:102 +#: members/models.py:103 msgid "Created" msgstr "Created" -#: members/tables.py:9 +#: members/tables.py:13 msgid "Last paid" msgstr "Last paid" -#: members/tables.py:13 members/tables.py:28 members/tables.py:41 +#: members/tables.py:18 members/tables.py:37 members/tables.py:54 msgid "Edit" msgstr "Edit" -#: members/tables.py:15 members/tables.py:30 members/tables.py:43 +#: members/tables.py:20 members/tables.py:39 members/tables.py:56 msgid "Options" msgstr "Options" @@ -298,6 +298,12 @@ msgstr "Add member" msgid "Save" msgstr "Save" +#: members/templates/member_add_many.html:8 +#, fuzzy +#| msgid "Add member" +msgid "Add many members" +msgstr "Add member" + #: members/templates/member_add_many.html:13 msgid "" "\n" @@ -326,10 +332,41 @@ msgstr "" msgid "Syntax" msgstr "Syntax" -#: members/templates/member_add_many.html:32 +#: members/templates/member_add_many.html:29 +msgid "Data" +msgstr "" + +#: members/templates/member_add_many.html:33 +#, fuzzy +#| msgid "Payments" +msgid "Payment source" +msgstr "Payments" + +#: members/templates/member_add_many.html:37 +#, fuzzy +#| msgid "List payments" +msgid "Cash payment" +msgstr "List payments" + +#: members/templates/member_add_many.html:41 +#: members/templates/member_add_many_confirm.html:22 msgid "Send" msgstr "Send" +#: members/templates/member_add_many_confirm.html:8 +msgid "Confirm adding these entries?" +msgstr "" + +#: members/templates/member_add_many_confirm.html:12 +#: members/templates/members_base.html:52 webapp/templates/main_index.html:7 +msgid "Members" +msgstr "Members" + +#: 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?" @@ -339,31 +376,6 @@ msgstr "Are you sure you want to delete this member?" msgid "Yes, I'm sure" msgstr "Yes, I'm sure" -#: members/templates/member_duplicates.html:9 -msgid "Conflicting member entries" -msgstr "" - -#: members/templates/member_duplicates.html:13 -msgid "" -"Found conflicting member entries. Choose how to handle the problematic data." -msgstr "" - -#: members/templates/member_duplicates.html:29 -msgid "Which one has the correct information for this member?" -msgstr "" - -#: members/templates/member_duplicates.html:31 -msgid "Accept first and remove second" -msgstr "" - -#: members/templates/member_duplicates.html:32 -msgid "Accept second and remove first" -msgstr "" - -#: members/templates/member_duplicates.html:33 -msgid "Accept both as two members" -msgstr "" - #: members/templates/member_edit.html:9 msgid "Edit member" msgstr "Edit member" @@ -372,19 +384,13 @@ msgstr "Edit member" msgid "Member register" msgstr "Member register" -#: members/templates/member_list.html:16 -msgid "" -"There are duplicate member entries in the register.\n" -" Please visit duplicate resolver." -msgstr "" - -#: members/templates/member_list.html:28 +#: members/templates/member_list.html:21 #, fuzzy #| msgid "Member register" msgid "Members in register:" msgstr "Member register" -#: members/templates/member_list.html:34 +#: members/templates/member_list.html:27 msgid "Download CSV" msgstr "Download CSV" @@ -393,10 +399,6 @@ msgstr "Download CSV" msgid "Member register of SIK ry" msgstr "Member register of SIK ry" -#: members/templates/members_base.html:52 webapp/templates/main_index.html:7 -msgid "Members" -msgstr "Members" - #: members/templates/members_base.html:54 msgid "List members" msgstr "List members" @@ -405,10 +407,6 @@ msgstr "List members" msgid "Add multiple" msgstr "Add multiple" -#: members/templates/members_base.html:60 -msgid "Payments" -msgstr "Payments" - #: members/templates/members_base.html:62 msgid "List payments" msgstr "List payments" @@ -441,121 +439,127 @@ msgstr "Edit payment" msgid "Payment events" msgstr "Payment events" -#: members/views.py:129 members/views.py:186 members/views.py:205 +#: members/views.py:138 members/views.py:209 members/views.py:235 msgid "No member id specified" msgstr "No member id specified" -#: members/views.py:151 +#: members/views.py:164 msgid "Successfully added member" msgstr "Successfully added member" -#: members/views.py:172 +#: members/views.py:189 msgid "Successfully updated member" msgstr "Successfully updated member" -#: members/views.py:176 +#: members/views.py:197 msgid "Could not update member object" msgstr "Could not update member object" -#: members/views.py:190 +#: members/views.py:213 msgid "Successfully deleted member" msgstr "Successfully deleted member" -#: members/views.py:196 +#: members/views.py:224 msgid "Could not delete member object" msgstr "Could not delete member object" -#: members/views.py:239 members/views.py:273 members/views.py:291 +#: members/views.py:273 members/views.py:320 members/views.py:348 msgid "No application id specified" msgstr "No application id specified" -#: members/views.py:260 +#: members/views.py:301 msgid "Successfully accepted application" msgstr "Successfully accepted application" -#: members/views.py:263 +#: members/views.py:308 msgid "Could not accept application object" msgstr "Could not accept application object" -#: members/views.py:277 +#: members/views.py:324 msgid "Successfully deleted application" msgstr "Successfully deleted application" -#: members/views.py:282 +#: members/views.py:336 msgid "Could not delete application object" msgstr "Could not delete application object" -#: members/views.py:346 +#: members/views.py:413 msgid "Successfully added payment for member" msgstr "Successfully added payment for member" -#: members/views.py:359 members/views.py:372 members/views.py:386 +#: members/views.py:431 members/views.py:449 members/views.py:468 msgid "No payment id specified" msgstr "No payment id specified" -#: members/views.py:390 +#: members/views.py:473 msgid "Successfully deleted payment" msgstr "Successfully deleted payment" -#: members/views.py:395 +#: members/views.py:483 msgid "Could not delete payment object" msgstr "Could not delete payment object" -#: members/views.py:410 +#: members/views.py:502 msgid "Successfully updated payment" msgstr "Successfully updated payment" -#: members/views.py:413 +#: members/views.py:509 msgid "Could not update payment object" msgstr "Could not update payment object" -#: members/views.py:430 +#: members/views.py:531 msgid "Missing \"textfield\" POST request field" msgstr "Missing \"textfield\" POST request field" -#: members/views.py:435 -msgid "Successfully imported multiple members" -msgstr "Successfully imported multiple members" - -#: members/views.py:438 +#: members/views.py:583 msgid "Failed to import members" msgstr "Failed to import members" -#: members/views.py:504 -#, fuzzy -#| msgid "Successfully deleted member" -msgid "Successfully resolved all member conflicts." -msgstr "Successfully deleted member" - #: templates/footer.html:7 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" -#: webapp/models.py:47 +#: webapp/models.py:61 #, fuzzy #| msgid "Add member" msgid "Board member" msgstr "Add member" -#: webapp/models.py:54 +#: webapp/models.py:67 #, fuzzy #| msgid "Duration" msgid "Description" msgstr "Duration" -#: webapp/models.py:55 +#: webapp/models.py:68 msgid "Summary" msgstr "" -#: webapp/models.py:70 +#: webapp/models.py:96 +msgid "Message" +msgstr "" + +#: webapp/models.py:109 +msgid "Year" +msgstr "" + +#: webapp/models.py:123 +msgid "Role" +msgstr "" + +#: webapp/models.py:125 msgid "Start date" msgstr "" -#: webapp/models.py:71 +#: webapp/models.py:126 msgid "End date" msgstr "" -#: webapp/models.py:79 +#: webapp/models.py:136 +msgid "Official" +msgstr "" + +#: webapp/models.py:138 msgid "Phone number" msgstr "" @@ -603,5 +607,29 @@ msgstr "Sössö" msgid "Contact" msgstr "Contact" +#: webapp/templates/ohlhafv.html:8 +msgid "Ohlhafv" +msgstr "" + +#: webapp/templates/ohlhafv.html:15 +msgid "Challenge" +msgstr "" + +#: webapp/templates/ohlhafv_list.html:11 +msgid "All challenges" +msgstr "" + +#: webapp/templates/ohlhafv_list.html:15 +msgid "Total challenges:" +msgstr "" + +#~ msgid "Successfully imported multiple members" +#~ msgstr "Successfully imported multiple members" + +#, fuzzy +#~| msgid "Successfully deleted member" +#~ msgid "Successfully resolved all member conflicts." +#~ msgstr "Successfully deleted member" + #~ msgid "Select" #~ msgstr "Select" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index d36e122..c81386c 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 5c39c26..ae4d24a 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-06-07 18:22+0300\n" +"POT-Creation-Date: 2017-09-25 13:38+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,35 +18,35 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: infoscreen/models.py:77 +#: infoscreen/models.py:97 msgid "ABB jobs" msgstr "ABB-työpaikat" -#: infoscreen/models.py:88 +#: infoscreen/models.py:112 msgid "APY Item" msgstr "ÄPY-tilastot" -#: infoscreen/models.py:99 +#: infoscreen/models.py:127 msgid "External website" msgstr "Ulkoinen verkkosivu" -#: infoscreen/models.py:147 +#: infoscreen/models.py:184 msgid "Sössö articles" msgstr "Sössön artikkelit" -#: infoscreen/models.py:158 +#: infoscreen/models.py:199 msgid "Events" msgstr "Tapahtumat" -#: infoscreen/models.py:169 +#: infoscreen/models.py:214 msgid "Image" msgstr "Kuva" -#: infoscreen/models.py:204 +#: infoscreen/models.py:260 msgid "HSL timetables" msgstr "HSL-aikataulut" -#: infoscreen/models.py:215 +#: infoscreen/models.py:275 msgid "External image" msgstr "Ulkoinen kuva" @@ -168,7 +168,8 @@ msgstr "Valitse muokattava rotaatio" msgid "id" msgstr "id" -#: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:46 +#: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:60 +#: webapp/models.py:94 webapp/models.py:107 msgid "Name" msgstr "Nimi" @@ -182,14 +183,12 @@ msgid "Language" msgstr "Kieli" #: infoscreen/templates/infoscreen_admin.html:161 -#: members/templates/settings.html:20 sikweb/settings-sample.py:179 -#: sikweb/settings.py:178 +#: members/templates/settings.html:20 sikweb/base.py:214 msgid "Finnish" msgstr "suomi" #: infoscreen/templates/infoscreen_admin.html:162 -#: members/templates/settings.html:21 sikweb/settings-sample.py:178 -#: sikweb/settings.py:177 +#: members/templates/settings.html:21 sikweb/base.py:215 msgid "English" msgstr "englanti" @@ -198,67 +197,68 @@ msgstr "englanti" msgid "Submit" msgstr "Lisää" -#: members/forms.py:20 members/tables.py:24 +#: members/forms.py:97 members/tables.py:32 msgid "Member" msgstr "Jäsen" -#: members/models.py:16 +#: members/models.py:14 msgid "First name" msgstr "Etunimi" -#: members/models.py:17 +#: members/models.py:15 msgid "Last name" msgstr "Sukunimi" -#: members/models.py:18 +#: members/models.py:16 webapp/models.py:95 webapp/models.py:108 msgid "Email" msgstr "Sähköposti" -#: members/models.py:19 +#: members/models.py:17 msgid "Place of residence" msgstr "Asuinpaikka" -#: members/models.py:20 members/models.py:83 +#: members/models.py:19 members/models.py:84 +#: members/templates/member_add_many.html:35 msgid "AYY" msgstr "AYY" -#: members/models.py:21 +#: members/models.py:20 msgid "JAS" msgstr "JAS" -#: members/models.py:69 +#: members/models.py:70 msgid "Submitted" msgstr "Lisätty" -#: members/models.py:81 +#: members/models.py:82 msgid "Date" msgstr "Päivämäärä" -#: members/models.py:82 +#: members/models.py:83 msgid "Source" msgstr "Lähde" -#: members/models.py:84 +#: members/models.py:85 msgid "Cash" msgstr "Käteinen" -#: members/models.py:85 +#: members/models.py:86 members/templates/member_add_many.html:36 msgid "Bank transfer" msgstr "Tilisiirto" -#: members/models.py:102 +#: members/models.py:103 msgid "Created" msgstr "Lisätty" -#: members/tables.py:9 +#: members/tables.py:13 msgid "Last paid" msgstr "Viimeksi maksettu" -#: members/tables.py:13 members/tables.py:28 members/tables.py:41 +#: members/tables.py:18 members/tables.py:37 members/tables.py:54 msgid "Edit" msgstr "Muokkaa" -#: members/tables.py:15 members/tables.py:30 members/tables.py:43 +#: members/tables.py:20 members/tables.py:39 members/tables.py:56 msgid "Options" msgstr "Asetukset" @@ -295,6 +295,10 @@ msgstr "Lisää jäsen" msgid "Save" msgstr "Tallenna" +#: members/templates/member_add_many.html:8 +msgid "Add many members" +msgstr "Lisää useita" + #: members/templates/member_add_many.html:13 msgid "" "\n" @@ -326,10 +330,37 @@ msgstr "" msgid "Syntax" msgstr "Syntaksi" -#: members/templates/member_add_many.html:32 +#: members/templates/member_add_many.html:29 +msgid "Data" +msgstr "Data" + +#: members/templates/member_add_many.html:33 +msgid "Payment source" +msgstr "Maksutapa" + +#: members/templates/member_add_many.html:37 +msgid "Cash payment" +msgstr "Käteismaksu" + +#: members/templates/member_add_many.html:41 +#: members/templates/member_add_many_confirm.html:22 msgid "Send" msgstr "Lähetä" +#: members/templates/member_add_many_confirm.html:8 +msgid "Confirm adding these entries?" +msgstr "Vahvista muutokset?" + +#: members/templates/member_add_many_confirm.html:12 +#: members/templates/members_base.html:52 webapp/templates/main_index.html:7 +msgid "Members" +msgstr "Jäsenet" + +#: 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?" @@ -339,32 +370,6 @@ msgstr "Oletko varma, että haluat poistaa tämän jäsenen?" msgid "Yes, I'm sure" msgstr "Kyllä, olen varma" -#: members/templates/member_duplicates.html:9 -msgid "Conflicting member entries" -msgstr "Ongelmalliset jäsentiedot" - -#: members/templates/member_duplicates.html:13 -msgid "" -"Found conflicting member entries. Choose how to handle the problematic data." -msgstr "" -"Ongelmallista jäsendataa havaittu. Valitse, miten ongelmat ratkaistaan." - -#: members/templates/member_duplicates.html:29 -msgid "Which one has the correct information for this member?" -msgstr "Kummassa on jäsenen oikeat tiedot?" - -#: members/templates/member_duplicates.html:31 -msgid "Accept first and remove second" -msgstr "Hyväksy ensimmäinen ja poista toinen" - -#: members/templates/member_duplicates.html:32 -msgid "Accept second and remove first" -msgstr "Hyväksy toinen ja poista ensimmäinen" - -#: members/templates/member_duplicates.html:33 -msgid "Accept both as two members" -msgstr "Hyväksy molemmat kahtena jäsenenä" - #: members/templates/member_edit.html:9 msgid "Edit member" msgstr "Muokkaa jäsentä" @@ -373,20 +378,11 @@ msgstr "Muokkaa jäsentä" msgid "Member register" msgstr "Jäsenrekisteri" -#: members/templates/member_list.html:16 -msgid "" -"There are duplicate member entries in the register.\n" -" Please visit duplicate resolver." -msgstr "" -"Jäsenrekisterissä on duplikaattijäseniä.\n" -" Käytä ongelman ratkaisuun duplikaattityökalua." - -#: members/templates/member_list.html:28 +#: members/templates/member_list.html:21 msgid "Members in register:" msgstr "Jäseniä:" -#: members/templates/member_list.html:34 +#: members/templates/member_list.html:27 msgid "Download CSV" msgstr "Lataa CSV" @@ -395,10 +391,6 @@ msgstr "Lataa CSV" msgid "Member register of SIK ry" msgstr "Aalto-yliopiston Sähköinsinöörikilta ry:n jäsenrekisteri" -#: members/templates/members_base.html:52 webapp/templates/main_index.html:7 -msgid "Members" -msgstr "Jäsenet" - #: members/templates/members_base.html:54 msgid "List members" msgstr "Jäsenlistaus" @@ -407,10 +399,6 @@ msgstr "Jäsenlistaus" msgid "Add multiple" msgstr "Lisää useita" -#: members/templates/members_base.html:60 -msgid "Payments" -msgstr "Maksutapahtumat" - #: members/templates/members_base.html:62 msgid "List payments" msgstr "Maksulistaus" @@ -443,115 +431,123 @@ msgstr "Muokkaa maksua" msgid "Payment events" msgstr "Maksutapahtumat" -#: members/views.py:129 members/views.py:186 members/views.py:205 +#: members/views.py:138 members/views.py:209 members/views.py:235 msgid "No member id specified" msgstr "Jäsenen ID ei määritelty" -#: members/views.py:151 +#: members/views.py:164 msgid "Successfully added member" msgstr "Onnistuneesti lisättiin jäsen" -#: members/views.py:172 +#: members/views.py:189 msgid "Successfully updated member" msgstr "Onnistuneesti päivitettiin jäsen" -#: members/views.py:176 +#: members/views.py:197 msgid "Could not update member object" msgstr "Jäsenobjektia ei voitu päivittää" -#: members/views.py:190 +#: members/views.py:213 msgid "Successfully deleted member" msgstr "Onnistuneesti poistettiin jäsen" -#: members/views.py:196 +#: members/views.py:224 msgid "Could not delete member object" msgstr "Jäsenobjektia ei voitu poistaa" -#: members/views.py:239 members/views.py:273 members/views.py:291 +#: members/views.py:273 members/views.py:320 members/views.py:348 msgid "No application id specified" msgstr "Hakemuksen ID ei määritelty" -#: members/views.py:260 +#: members/views.py:301 msgid "Successfully accepted application" msgstr "Onnistuneesti hyväksyttiin hakemus" -#: members/views.py:263 +#: members/views.py:308 msgid "Could not accept application object" msgstr "Hakemusobjektia ei voitu hyväksyä" -#: members/views.py:277 +#: members/views.py:324 msgid "Successfully deleted application" msgstr "Onnistuneesti poistettiin hakemus" -#: members/views.py:282 +#: members/views.py:336 msgid "Could not delete application object" msgstr "Hakemusobjektia ei voitu poistaa" -#: members/views.py:346 +#: members/views.py:413 msgid "Successfully added payment for member" msgstr "Onnistuneesti lisättiin maksutapahtuma jäsenelle" -#: members/views.py:359 members/views.py:372 members/views.py:386 +#: members/views.py:431 members/views.py:449 members/views.py:468 msgid "No payment id specified" msgstr "Maksutapahtuman ID ei määritelty" -#: members/views.py:390 +#: members/views.py:473 msgid "Successfully deleted payment" msgstr "Onnistuneesti poistettiin maksutapahtuma" -#: members/views.py:395 +#: members/views.py:483 msgid "Could not delete payment object" msgstr "Maksutapahtumaobjektia ei voitu poistaa" -#: members/views.py:410 +#: members/views.py:502 msgid "Successfully updated payment" msgstr "Onnistuneesti päivitettiin maksutapahtuma" -#: members/views.py:413 +#: members/views.py:509 msgid "Could not update payment object" msgstr "Maksutapahtumaobjektia ei voitu päivittää" -#: members/views.py:430 +#: members/views.py:531 msgid "Missing \"textfield\" POST request field" msgstr "Puuttuva \"textfield\" POST-kenttä" -#: members/views.py:435 -msgid "Successfully imported multiple members" -msgstr "Onnistuneesti tuotu useita jäseniä" - -#: members/views.py:438 +#: members/views.py:583 msgid "Failed to import members" msgstr "Jäsenten tuonti epäonnistui" -#: members/views.py:504 -msgid "Successfully resolved all member conflicts." -msgstr "Kaikki jäsenkonfliktit ratkaistu onnistuneesti." - #: templates/footer.html:7 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" -#: webapp/models.py:47 +#: webapp/models.py:61 msgid "Board member" msgstr "Hallituksen jäsen" -#: webapp/models.py:54 +#: webapp/models.py:67 msgid "Description" msgstr "Kuvaus" -#: webapp/models.py:55 +#: webapp/models.py:68 msgid "Summary" msgstr "Tiivistelmä" -#: webapp/models.py:70 +#: webapp/models.py:96 +msgid "Message" +msgstr "Viesti" + +#: webapp/models.py:109 +msgid "Year" +msgstr "Vuosi" + +#: webapp/models.py:123 +msgid "Role" +msgstr "Rooli" + +#: webapp/models.py:125 msgid "Start date" msgstr "Alkupäivämäärä" -#: webapp/models.py:71 +#: webapp/models.py:126 msgid "End date" msgstr "Loppupäivämäärä" -#: webapp/models.py:79 +#: webapp/models.py:136 +msgid "Official" +msgstr "Toimihenkilö" + +#: webapp/models.py:138 msgid "Phone number" msgstr "Puhelinnumero" @@ -598,3 +594,19 @@ msgstr "Sössö" #: webapp/templates/navigation.html:32 msgid "Contact" msgstr "Yhteystiedot" + +#: webapp/templates/ohlhafv.html:8 +msgid "Ohlhafv" +msgstr "Øhlhäfv" + +#: webapp/templates/ohlhafv.html:15 +msgid "Challenge" +msgstr "Haaste" + +#: webapp/templates/ohlhafv_list.html:11 +msgid "All challenges" +msgstr "Kaikki haasteet" + +#: webapp/templates/ohlhafv_list.html:15 +msgid "Total challenges:" +msgstr "Haasteita yhteensä:" diff --git a/members/templates/member_list.html b/members/templates/member_list.html index 7aa6d71..9a665fc 100644 --- a/members/templates/member_list.html +++ b/members/templates/member_list.html @@ -11,13 +11,6 @@

{% trans "Member register" %}

- {% if is_member_conflict %} -
- {% blocktrans %}There are duplicate member entries in the register. - Please visit duplicate resolver.{% endblocktrans %} -
- {% endif %} - {% if notification %}
{{ notification }}