Change stuff to use excel files

2017-10-31 22:36:31 +02:00
parent 0e3e117f25
commit e709570f22
18 changed files with 248 additions and 118 deletions
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-30 13:41+0100\n"
-"PO-Revision-Date: 2017-10-30 14:42+0200\n"
+"POT-Creation-Date: 2017-10-31 21:09+0100\n"
+"PO-Revision-Date: 2017-10-31 22:11+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fi\n"
@@ -202,7 +202,7 @@ msgid "Place of residence"
 msgstr "Asuinpaikka"

 #: .\members\models.py:19 .\members\models.py:70
-#: .\members\templates\member_add_many.html:35
+#: .\members\templates\member_add_many.html:39
 msgid "AYY"
 msgstr "AYY"

@@ -226,7 +226,7 @@ msgstr "Lähde"
 msgid "Cash"
 msgstr "Käteinen"

-#: .\members\models.py:72 .\members\templates\member_add_many.html:36
+#: .\members\models.py:72 .\members\templates\member_add_many.html:40
 msgid "Bank transfer"
 msgstr "Tilisiirto"

@@ -283,7 +283,7 @@ msgid "Muista myös maksaa jäsenmaksusi!"
 msgstr "Muista myös maksaa jäsenmaksusi!"

 #: .\members\templates\application_index.html:16
-#: .\members\templates\member_add_many.html:48
+#: .\members\templates\member_add_many.html:55
 #: .\members\templates\member_add_many_confirm.html:22
 #: .\webapp\templates\kaehmy_list.html:48
 msgid "Send"
@@ -321,50 +321,58 @@ msgstr "Lisää useita"
 msgid ""
 "\n"
 "            Enter member information in CSV format, separate members on "
-"separate lines.\n"
+"separate lines. \n"
+"            If a new member already exists in the database, a new payment "
+"event will be created for that member instead.\n"
 "            "
 msgstr ""
 "\n"
 "            Syötä jäsentiedot CSV-formaatissa, erilliset jäsenet omilla "
 "riveillään.\n"
-"            "
+"            Jos jäsenen tiedot ovat jo tietokannassa, tehdään tälle "
+"jäsenelle uusi maksutapahtuma."

-#: .\members\templates\member_add_many.html:18
+#: .\members\templates\member_add_many.html:21
+msgid "Format the member table like this:"
+msgstr "Jäsentele taulukko seuraavasti:"
+
+#: .\members\templates\member_add_many.html:25
 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"
-"            "
+"Columns: First name, last name, email address, place of origin, AYY member, "
+"JAS recipient"
 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"
-"            "
+"Kolumnit: Etunimi, sukunimi, sähköpostiosoite, asuinpaikka, AYY:n jäsen, "
+"jäsenmailin vastaanottaja"

-#: .\members\templates\member_add_many.html:23
-msgid "Syntax"
-msgstr "Syntaksi"
-
-#: .\members\templates\member_add_many.html:29
-msgid "Data"
-msgstr "Data"
+#: .\members\templates\member_add_many.html:28
+msgid "Save the file as CSV"
+msgstr "Tallenna tiedosto CSV-formaatissa"

 #: .\members\templates\member_add_many.html:33
+msgid "Upload file"
+msgstr "Lataa tiedosto"
+
+#: .\members\templates\member_add_many.html:37
 msgid "Payment source"
 msgstr "Maksutapa"

-#: .\members\templates\member_add_many.html:37
+#: .\members\templates\member_add_many.html:41
 msgid "Cash payment"
 msgstr "Käteismaksu"

-#: .\members\templates\member_add_many.html:41
+#: .\members\templates\member_add_many.html:44
+msgid ""
+"This payment source will be used to create any payments for new members that "
+"already exist in the database."
+msgstr ""
+"Tätä maksutapaa käytetään, kun jo tietokannassa oleville jäsenille luodaan "
+"maksutapahtuma."
+
+#: .\members\templates\member_add_many.html:48
 msgid "CSV delimiter"
 msgstr "CSV-erotin"

-#: .\members\templates\member_add_many.html:44
+#: .\members\templates\member_add_many.html:51
 msgid ""
 "The symbol that is used to separate items in one line. Defaults to "
 "';' (semicolon)."
@@ -470,11 +478,11 @@ msgstr "Maksutapahtumia:"
 msgid "Language"
 msgstr "Kieli"

-#: .\members\templates\settings.html:20 .\sikweb\base.py:222
+#: .\members\templates\settings.html:20 .\sikweb\base.py:226
 msgid "Finnish"
 msgstr "suomi"

-#: .\members\templates\settings.html:21 .\sikweb\base.py:223
+#: .\members\templates\settings.html:21 .\sikweb\base.py:227
 msgid "English"
 msgstr "englanti"

@@ -561,9 +569,9 @@ msgstr "Onnistuneesti päivitettiin maksutapahtuma"
 msgid "Could not update payment object"
 msgstr "Maksutapahtumaobjektia ei voitu päivittää"

-#: .\members\views\utils.py:117
-msgid "Missing \"textfield\" POST request field"
-msgstr "Puuttuva \"textfield\" POST-kenttä"
+#: .\members\views\utils.py:121
+msgid "Missing CSV file"
+msgstr "Puuttuva CSV-tiedosto"

 #: .\templates\admin\base_site.html:43
 msgid "Go"
@@ -577,7 +585,7 @@ msgstr "Virhe"
 msgid "Back"
 msgstr "Takaisin"

-#: .\templates\footer.html:23
+#: .\templates\footer.html:23 .\webapp\templates\kaehmy_footer.html:23
 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
 msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"

@@ -831,7 +839,7 @@ msgstr "Telegram-kanavat"
 msgid "SIK Admin"
 msgstr "SIK Hallintapaneeli"

-#: .\webapp\templates\base.html:15
+#: .\webapp\templates\base.html:15 .\webapp\templates\kaehmy_base.html:14
 msgid "Aalto-yliopiston Sähköinsinöörikilta ry"
 msgstr "Aalto-yliopiston Sähköinsinöörikilta ry"

@@ -1023,5 +1031,28 @@ msgstr "Kaikki haasteet"
 msgid "Total challenges:"
 msgstr "Haasteita yhteensä:"

+#~ 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"
+#~ "            "
+
+#~ msgid "Syntax"
+#~ msgstr "Syntaksi"
+
+#~ msgid "Data"
+#~ msgstr "Data"
+
+#~ msgid "Missing \"textfield\" POST request field"
+#~ msgstr "Puuttuva \"textfield\" POST-kenttä"
+
 #~ msgid "Applied for board"
 #~ msgstr "Hakenut hallitukseen"