diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index dde7de5..e96657a 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 267980a..df15f85 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-05-13 10:29+0300\n" +"POT-Creation-Date: 2017-05-18 13:30+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -50,7 +50,7 @@ msgid "External image" msgstr "External image" #: infoscreen/templates/infoscreen_admin.html:23 -#: members/templates/members_base.html:67 +#: members/templates/members_base.html:75 msgid "Log out" msgstr "Log out" @@ -88,6 +88,7 @@ msgstr "Add to rotation" #: infoscreen/templates/infoscreen_admin.html:84 #: infoscreen/templates/infoscreen_admin.html:101 #: infoscreen/templates/infoscreen_admin.html:105 +#: members/templates/member_edit.html:20 members/templates/payment_edit.html:20 msgid "Delete" msgstr "Delete" @@ -150,38 +151,54 @@ msgstr "Instance" msgid "Duration" msgstr "Duration" -#: members/models.py:11 +#: members/models.py:16 msgid "First name" msgstr "First name" -#: members/models.py:12 +#: members/models.py:17 msgid "Last name" msgstr "Last name" -#: members/models.py:13 +#: members/models.py:18 msgid "Email" msgstr "Email" -#: members/models.py:14 +#: members/models.py:19 msgid "Place of residence" msgstr "Place of residence" -#: members/models.py:15 members/models.py:35 +#: members/models.py:20 members/models.py:83 msgid "AYY" msgstr "AYY" -#: members/models.py:16 +#: members/models.py:21 msgid "JAS" msgstr "JAS" -#: members/models.py:36 +#: members/models.py:84 msgid "Cash" msgstr "Cash" -#: members/models.py:37 +#: members/models.py:85 msgid "Bank transfer" msgstr "Bank transfer" +#: members/tables.py:11 members/tables.py:23 members/tables.py:35 +msgid "Edit" +msgstr "Edit" + +#: members/templates/application_edit.html:9 +msgid "Edit application" +msgstr "Edit application" + +#: members/templates/application_edit.html:18 +msgid "Accept" +msgstr "Accept" + +#: members/templates/application_edit.html:20 +msgid "Decline" +msgstr "Decline" + #: members/templates/application_list.html:8 msgid "Member applications" msgstr "Member applications" @@ -194,109 +211,115 @@ msgstr "Error" msgid "Back" msgstr "Back" -#: members/templates/member_add.html:8 members/templates/member_edit.html:8 -#: members/templates/members_base.html:43 +#: members/templates/member_add.html:8 members/templates/members_base.html:51 msgid "Add member" msgstr "Add member" -#: members/templates/member_add.html:15 members/templates/member_edit.html:16 -#: members/templates/payment_add.html:15 +#: members/templates/member_add.html:15 members/templates/member_edit.html:18 +#: members/templates/payment_add.html:15 members/templates/payment_edit.html:18 msgid "Save" msgstr "Save" -#: members/templates/member_delete_confirm.html:8 +#: members/templates/member_add_many.html:13 +msgid "" +"\n" +" Enter member information in CSV format, separate members on " +"separate lines.\n" +" " +msgstr "" + +#: members/templates/member_add_many.html:18 +msgid "" +"\n" +" first_name, last_name, email_address and place_of_origin should " +"be given string values.\n" +" ayy_member and jas_recipient should be given the value 0 (off) " +"or 1 (on).\n" +" " +msgstr "" +"\n" +" first_name, last_name, email_address and place_of_origin should " +"be given string values.\n" +" ayy_member and jas_recipient should be given the value 0 (off) " +"or 1 (on).\n" +" " + +#: members/templates/member_add_many.html:23 +msgid "Syntax" +msgstr "Syntax" + +#: members/templates/member_add_many.html:32 +msgid "Send" +msgstr "Send" + +#: 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?" -#: members/templates/member_delete_confirm.html:17 +#: members/templates/member_delete_confirm.html:19 +#: members/templates/payment_delete_confirm.html:19 msgid "Yes, I'm sure" msgstr "Yes, I'm sure" +#: members/templates/member_edit.html:9 +msgid "Edit member" +msgstr "Edit member" + #: members/templates/member_list.html:11 members/templates/members_base.html:15 msgid "Member register" msgstr "Member register" -#: members/templates/member_list.html:17 members/templates/payment_list.html:14 +#: members/templates/member_list.html:23 msgid "Download CSV" msgstr "Download CSV" -#: members/templates/member_list.html:24 members/templates/payment_list.html:21 -msgid "Search" -msgstr "Search" +#: members/templates/members_base.html:39 +msgid "Member register of SIK ry" +msgstr "Member register of SIK ry" -#: members/templates/member_list.html:29 members/templates/payment_list.html:26 -msgid "Added after" -msgstr "Added after" - -#: members/templates/member_list.html:33 members/templates/payment_list.html:30 -msgid "Added before" -msgstr "Added before" - -#: members/templates/member_list.html:39 members/templates/payment_list.html:36 -msgid "Paid after" -msgstr "Paid after" - -#: members/templates/member_list.html:43 members/templates/payment_list.html:40 -msgid "Paid before" -msgstr "Paid before" - -#: members/templates/member_list.html:49 members/templates/payment_list.html:46 -msgid "Filter" -msgstr "Filter" - -#: members/templates/member_list.html:50 members/templates/payment_list.html:47 -msgid "Reset" -msgstr "Reset" - -#: members/templates/member_list.html:58 members/templates/payment_list.html:55 -msgid "Show filters" -msgstr "Show filters" - -#: members/templates/members_base.html:40 webapp/templates/main_index.html:7 +#: members/templates/members_base.html:48 webapp/templates/main_index.html:7 msgid "Members" msgstr "Members" -#: members/templates/members_base.html:42 -#, fuzzy -#| msgid "Add member" +#: members/templates/members_base.html:50 msgid "List members" -msgstr "Add member" +msgstr "List members" -#: members/templates/members_base.html:44 +#: members/templates/members_base.html:52 msgid "Add multiple" msgstr "Add multiple" -#: members/templates/members_base.html:48 +#: members/templates/members_base.html:56 msgid "Payments" msgstr "Payments" -#: members/templates/members_base.html:50 +#: members/templates/members_base.html:58 msgid "List payments" msgstr "List payments" -#: members/templates/members_base.html:51 members/templates/payment_add.html:8 +#: members/templates/members_base.html:59 members/templates/payment_add.html:8 msgid "Add payment" msgstr "Add payment" -#: members/templates/members_base.html:55 +#: members/templates/members_base.html:63 msgid "Applications" msgstr "Applications" -#: members/templates/members_base.html:57 +#: members/templates/members_base.html:65 msgid "List applications" msgstr "List applications" -#: members/templates/members_base.html:58 +#: members/templates/members_base.html:66 msgid "Application form" msgstr "Application form" -#: members/templates/members_base.html:63 members/templates/settings.html:11 +#: members/templates/members_base.html:71 members/templates/settings.html:11 msgid "Settings" msgstr "Settings" -#: members/templates/members_base.html:80 -msgid "Member register of SIK ry" -msgstr "Member register of SIK ry" +#: members/templates/payment_delete_confirm.html:9 +msgid "Are you sure you want to delete this payment?" +msgstr "Are you sure you want to delete this payment?" #: members/templates/payment_list.html:8 msgid "Payment events" @@ -306,16 +329,98 @@ msgstr "Payment events" msgid "Language" msgstr "Language" -#: members/templates/settings.html:20 sikweb/settings-docker-sample.py:174 -#: sikweb/settings-sample.py:173 sikweb/settings.py:173 +#: members/templates/settings.html:20 sikweb/ci-settings.py:170 +#: sikweb/settings-docker-sample.py:174 sikweb/settings-sample.py:173 +#: sikweb/settings.py:173 msgid "Finnish" msgstr "Finnish" -#: members/templates/settings.html:21 sikweb/settings-docker-sample.py:173 -#: sikweb/settings-sample.py:172 sikweb/settings.py:172 +#: members/templates/settings.html:21 sikweb/ci-settings.py:169 +#: sikweb/settings-docker-sample.py:173 sikweb/settings-sample.py:172 +#: sikweb/settings.py:172 msgid "English" msgstr "English" +#: members/views.py:116 members/views.py:173 members/views.py:192 +msgid "No member id specified" +msgstr "" + +#: members/views.py:138 +msgid "Successfully added member" +msgstr "Successfully added member" + +#: members/views.py:159 +msgid "Successfully updated member" +msgstr "Successfully updated member" + +#: members/views.py:163 +msgid "Could not update member object" +msgstr "Could not update member object" + +#: members/views.py:177 +msgid "Successfully deleted member" +msgstr "Successfully deleted member" + +#: members/views.py:183 +msgid "Could not delete member object" +msgstr "Could not delete member object" + +#: members/views.py:226 members/views.py:260 members/views.py:278 +msgid "No application id specified" +msgstr "No application id specified" + +#: members/views.py:247 +msgid "Successfully accepted application" +msgstr "Successfully accepted application" + +#: members/views.py:250 +msgid "Could not accept application object" +msgstr "Could not accept application object" + +#: members/views.py:264 +msgid "Successfully deleted application" +msgstr "Successfully deleted application" + +#: members/views.py:269 +msgid "Could not delete application object" +msgstr "Could not delete application object" + +#: members/views.py:333 +msgid "Successfully added payment for member" +msgstr "Successfully added payment for member" + +#: members/views.py:346 members/views.py:359 members/views.py:373 +msgid "No payment id specified" +msgstr "No payment id specified" + +#: members/views.py:377 +msgid "Successfully deleted payment" +msgstr "Successfully deleted payment" + +#: members/views.py:382 +msgid "Could not delete payment object" +msgstr "Could not delete payment object" + +#: members/views.py:397 +msgid "Successfully updated payment" +msgstr "Successfully updated payment" + +#: members/views.py:400 +msgid "Could not update payment object" +msgstr "Could not update payment object" + +#: members/views.py:417 +msgid "Missing \"textfield\" POST request field" +msgstr "Missing \"textfield\" POST request field" + +#: members/views.py:422 +msgid "Successfully imported multiple members" +msgstr "Successfully imported multiple members" + +#: members/views.py:425 +msgid "Failed to import members" +msgstr "Failed to import members" + #: templates/footer.html:7 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" @@ -346,4 +451,4 @@ msgstr "Sössö" #: webapp/templates/navigation.html:32 msgid "Contact" -msgstr "Contact" \ No newline at end of file +msgstr "Contact" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index 2733527..33338ba 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 9ba0b3b..a707542 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-05-13 10:29+0300\n" +"POT-Creation-Date: 2017-05-18 13:42+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -51,7 +51,7 @@ msgid "External image" msgstr "Ulkoinen kuva" #: infoscreen/templates/infoscreen_admin.html:23 -#: members/templates/members_base.html:67 +#: members/templates/members_base.html:75 msgid "Log out" msgstr "Kirjaudu ulos" @@ -89,6 +89,7 @@ msgstr "Lisää rotaatioon" #: infoscreen/templates/infoscreen_admin.html:84 #: infoscreen/templates/infoscreen_admin.html:101 #: infoscreen/templates/infoscreen_admin.html:105 +#: members/templates/member_edit.html:20 members/templates/payment_edit.html:20 msgid "Delete" msgstr "Poista" @@ -151,38 +152,54 @@ msgstr "Dia" msgid "Duration" msgstr "Kesto" -#: members/models.py:11 +#: members/models.py:16 msgid "First name" msgstr "Etunimi" -#: members/models.py:12 +#: members/models.py:17 msgid "Last name" msgstr "Sukunimi" -#: members/models.py:13 +#: members/models.py:18 msgid "Email" msgstr "Sähköposti" -#: members/models.py:14 +#: members/models.py:19 msgid "Place of residence" msgstr "Asuinpaikka" -#: members/models.py:15 members/models.py:35 +#: members/models.py:20 members/models.py:83 msgid "AYY" msgstr "AYY" -#: members/models.py:16 +#: members/models.py:21 msgid "JAS" msgstr "JAS" -#: members/models.py:36 +#: members/models.py:84 msgid "Cash" msgstr "Käteinen" -#: members/models.py:37 +#: members/models.py:85 msgid "Bank transfer" msgstr "Tilisiirto" +#: members/tables.py:11 members/tables.py:23 members/tables.py:35 +msgid "Edit" +msgstr "Muokkaa" + +#: members/templates/application_edit.html:9 +msgid "Edit application" +msgstr "Muokkaa hakemusta" + +#: members/templates/application_edit.html:18 +msgid "Accept" +msgstr "Hyväksy" + +#: members/templates/application_edit.html:20 +msgid "Decline" +msgstr "Hylkää" + #: members/templates/application_list.html:8 msgid "Member applications" msgstr "Jäsenhakemukset" @@ -195,107 +212,122 @@ msgstr "Virhe" msgid "Back" msgstr "Takaisin" -#: members/templates/member_add.html:8 members/templates/member_edit.html:8 -#: members/templates/members_base.html:43 +#: members/templates/member_add.html:8 members/templates/members_base.html:51 msgid "Add member" msgstr "Lisää jäsen" -#: members/templates/member_add.html:15 members/templates/member_edit.html:16 -#: members/templates/payment_add.html:15 +#: members/templates/member_add.html:15 members/templates/member_edit.html:18 +#: members/templates/payment_add.html:15 members/templates/payment_edit.html:18 msgid "Save" msgstr "Tallenna" -#: members/templates/member_delete_confirm.html:8 +#: members/templates/member_add_many.html:13 +msgid "" +"\n" +" Enter member information in CSV format, separate members on " +"separate lines.\n" +" " +msgstr "" +"\n" +" Syötä jäsentiedot CSV-formaatissa, erilliset jäsenet omilla " +"riveillään.\n" +" " + +#: members/templates/member_add_many.html:18 +msgid "" +"\n" +" first_name, last_name, email_address and place_of_origin should " +"be given string values.\n" +" ayy_member and jas_recipient should be given the value 0 (off) " +"or 1 (on).\n" +" " +msgstr "" +"\n" +" first_name, last_name, email_address ja place_of_origin ovat " +"merkkijonoja.\n" +" ayy_member ja jas_recipient ovat joko 0 (off) tai 1 (on).\n" +" " + +#: members/templates/member_add_many.html:23 +msgid "Syntax" +msgstr "Syntaksi" + +#: members/templates/member_add_many.html:32 +msgid "Send" +msgstr "Lähetä" + +#: 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?" -#: members/templates/member_delete_confirm.html:17 +#: members/templates/member_delete_confirm.html:19 +#: members/templates/payment_delete_confirm.html:19 msgid "Yes, I'm sure" msgstr "Kyllä, olen varma" +#: members/templates/member_edit.html:9 +msgid "Edit member" +msgstr "Muokkaa jäsentä" + #: members/templates/member_list.html:11 members/templates/members_base.html:15 msgid "Member register" msgstr "Jäsenrekisteri" -#: members/templates/member_list.html:17 members/templates/payment_list.html:14 +#: members/templates/member_list.html:23 msgid "Download CSV" msgstr "Lataa CSV" -#: members/templates/member_list.html:24 members/templates/payment_list.html:21 -msgid "Search" -msgstr "Haku" +#: members/templates/members_base.html:39 +msgid "Member register of SIK ry" +msgstr "Aalto-yliopiston Sähköinsinöörikilta ry:n jäsenrekisteri" -#: members/templates/member_list.html:29 members/templates/payment_list.html:26 -msgid "Added after" -msgstr "Lisätty jälkeen" - -#: members/templates/member_list.html:33 members/templates/payment_list.html:30 -msgid "Added before" -msgstr "Lisätty ennen" - -#: members/templates/member_list.html:39 members/templates/payment_list.html:36 -msgid "Paid after" -msgstr "Maksettu jälkeen" - -#: members/templates/member_list.html:43 members/templates/payment_list.html:40 -msgid "Paid before" -msgstr "Maksettu ennen" - -#: members/templates/member_list.html:49 members/templates/payment_list.html:46 -msgid "Filter" -msgstr "Suodata" - -#: members/templates/member_list.html:50 members/templates/payment_list.html:47 -msgid "Reset" -msgstr "Nollaa" - -#: members/templates/member_list.html:58 members/templates/payment_list.html:55 -msgid "Show filters" -msgstr "Näytä suodattimet" - -#: members/templates/members_base.html:40 webapp/templates/main_index.html:7 +#: members/templates/members_base.html:48 webapp/templates/main_index.html:7 msgid "Members" msgstr "Jäsenet" -#: members/templates/members_base.html:42 +#: members/templates/members_base.html:50 msgid "List members" msgstr "Jäsenlistaus" -#: members/templates/members_base.html:44 +#: members/templates/members_base.html:52 msgid "Add multiple" msgstr "Lisää useita" -#: members/templates/members_base.html:48 +#: members/templates/members_base.html:56 msgid "Payments" msgstr "Maksutapahtumat" -#: members/templates/members_base.html:50 +#: members/templates/members_base.html:58 msgid "List payments" msgstr "Maksulistaus" -#: members/templates/members_base.html:51 members/templates/payment_add.html:8 +#: members/templates/members_base.html:59 members/templates/payment_add.html:8 msgid "Add payment" msgstr "Lisää maksu" -#: members/templates/members_base.html:55 +#: members/templates/members_base.html:63 msgid "Applications" msgstr "Jäsenhakemukset" -#: members/templates/members_base.html:57 +#: members/templates/members_base.html:65 msgid "List applications" msgstr "Hakemuslistaus" -#: members/templates/members_base.html:58 +#: members/templates/members_base.html:66 msgid "Application form" msgstr "Jäsenhakemuslomake" -#: members/templates/members_base.html:63 members/templates/settings.html:11 +#: members/templates/members_base.html:71 members/templates/settings.html:11 msgid "Settings" msgstr "Asetukset" -#: members/templates/members_base.html:80 -msgid "Member register of SIK ry" -msgstr "Aalto-yliopiston Sähköinsinöörikilta ry:n jäsenrekisteri" +#: members/templates/payment_delete_confirm.html:9 +msgid "Are you sure you want to delete this payment?" +msgstr "Oletko varma, että haluat poistaa tämän maksutapahtuman?" + +#: members/templates/payment_edit.html:9 +msgid "Edit payment" +msgstr "Muokkaa maksua" #: members/templates/payment_list.html:8 msgid "Payment events" @@ -305,16 +337,98 @@ msgstr "Maksutapahtumat" msgid "Language" msgstr "Kieli" -#: members/templates/settings.html:20 sikweb/settings-docker-sample.py:174 -#: sikweb/settings-sample.py:173 sikweb/settings.py:173 +#: members/templates/settings.html:20 sikweb/ci-settings.py:170 +#: sikweb/settings-docker-sample.py:174 sikweb/settings-sample.py:173 +#: sikweb/settings.py:173 msgid "Finnish" msgstr "suomi" -#: members/templates/settings.html:21 sikweb/settings-docker-sample.py:173 -#: sikweb/settings-sample.py:172 sikweb/settings.py:172 +#: members/templates/settings.html:21 sikweb/ci-settings.py:169 +#: sikweb/settings-docker-sample.py:173 sikweb/settings-sample.py:172 +#: sikweb/settings.py:172 msgid "English" msgstr "englanti" +#: members/views.py:116 members/views.py:173 members/views.py:192 +msgid "No member id specified" +msgstr "Jäsenen ID ei määritelty" + +#: members/views.py:138 +msgid "Successfully added member" +msgstr "Onnistuneesti lisättiin jäsen" + +#: members/views.py:159 +msgid "Successfully updated member" +msgstr "Onnistuneesti päivitettiin jäsen" + +#: members/views.py:163 +msgid "Could not update member object" +msgstr "Jäsenobjektia ei voitu päivittää" + +#: members/views.py:177 +msgid "Successfully deleted member" +msgstr "Onnistuneesti poistettiin jäsen" + +#: members/views.py:183 +msgid "Could not delete member object" +msgstr "Jäsenobjektia ei voitu poistaa" + +#: members/views.py:226 members/views.py:260 members/views.py:278 +msgid "No application id specified" +msgstr "Hakemuksen ID ei määritelty" + +#: members/views.py:247 +msgid "Successfully accepted application" +msgstr "Onnistuneesti hyväksyttiin hakemus" + +#: members/views.py:250 +msgid "Could not accept application object" +msgstr "Hakemusobjektia ei voitu hyväksyä" + +#: members/views.py:264 +msgid "Successfully deleted application" +msgstr "Onnistuneesti poistettiin hakemus" + +#: members/views.py:269 +msgid "Could not delete application object" +msgstr "Hakemusobjektia ei voitu poistaa" + +#: members/views.py:333 +msgid "Successfully added payment for member" +msgstr "Onnistuneesti lisättiin maksutapahtuma jäsenelle" + +#: members/views.py:346 members/views.py:359 members/views.py:373 +msgid "No payment id specified" +msgstr "Maksutapahtuman ID ei määritelty" + +#: members/views.py:377 +msgid "Successfully deleted payment" +msgstr "Onnistuneesti poistettiin maksutapahtuma" + +#: members/views.py:382 +msgid "Could not delete payment object" +msgstr "Maksutapahtumaobjektia ei voitu poistaa" + +#: members/views.py:397 +msgid "Successfully updated payment" +msgstr "Onnistuneesti päivitettiin maksutapahtuma" + +#: members/views.py:400 +msgid "Could not update payment object" +msgstr "Maksutapahtumaobjektia ei voitu päivittää" + +#: members/views.py:417 +msgid "Missing \"textfield\" POST request field" +msgstr "Puuttuva \"textfield\" POST-kenttä" + +#: members/views.py:422 +msgid "Successfully imported multiple members" +msgstr "Onnistuneesti tuotu useita jäseniä" + +#: members/views.py:425 +msgid "Failed to import members" +msgstr "Jäsenten tuonti epäonnistui" + #: templates/footer.html:7 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"