From 9f664737b62dc33e23dd3ed3e2f93b249a667786 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Mon, 16 Sep 2019 19:44:14 +0300 Subject: [PATCH] Add Member application emails --- locale/en/LC_MESSAGES/django.mo | Bin 14152 -> 16042 bytes locale/en/LC_MESSAGES/django.po | 150 ++++++++++++++++-- locale/fi/LC_MESSAGES/django.mo | Bin 16647 -> 16647 bytes locale/fi/LC_MESSAGES/django.po | 141 ++++++++++++++-- members/templates/application_success.html | 1 + .../templates/email_application_accept.html | 11 ++ .../templates/email_application_submit.html | 21 +++ members/views/applications.py | 30 +++- 8 files changed, 325 insertions(+), 29 deletions(-) create mode 100644 members/templates/email_application_accept.html create mode 100644 members/templates/email_application_submit.html diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 794c384e9aeb145c39b11d19b5a3c9ba01afd668..ce8fde80325bd50d5bb4fda27513239a94593ec9 100644 GIT binary patch literal 16042 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 diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index a006242..f0ed178 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-26 17:32+0200\n" +"POT-Creation-Date: 2019-09-16 19:33+0300\n" "PO-Revision-Date: 2017-11-02 23:09+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -634,6 +634,14 @@ msgid "Hienoa! Jäsenhakemuksesi on nyt lähetetty." msgstr "Amazing! Your membership application has been sent." #: members/templates/application_success.html:9 +msgid "" +"Vahvistusviesti on lähetetty sähköpostiisi. Ota yhteyttä sik-vtmk@list.ayy." +"fi jos viestiä ei näy." +msgstr "" +"Confirmation email is sent to given email address. Contact sik-vtmk@list.ayy." +"fi if you didn't receive it." + +#: members/templates/application_success.html:10 msgid "Takaisin Sähköinsinöörikillan web-sivuille" msgstr "Back to the front page" @@ -687,6 +695,107 @@ msgstr "Application form" msgid "Settings" msgstr "Settings" +#: members/templates/email_application_accept.html:2 +#, fuzzy +#| msgid "Moikka" +msgid "Moi" +msgstr "Hi" + +#: members/templates/email_application_accept.html:4 +msgid "Onnittelut! Sinut on hyväksytty Sähköinsinöörikillan jäseneksi." +msgstr "" + +#: members/templates/email_application_accept.html:6 +#, fuzzy +#| msgid "Käy kurkkaamassa muutkin haasteet osoitteessa" +msgid "Käy kurkkaamassa killan nettisivuilta" +msgstr "Also go and check other challenges at" + +#: members/templates/email_application_accept.html:6 +msgid "" +"tulevia tapahtumia ja piipahda kiltahuoneella tutustumassa uusiin " +"kiltatovereihisi!" +msgstr "" + +#: members/templates/email_application_accept.html:8 +msgid "Liity myös killan TG-kanaville" +msgstr "Join Guild's Telegram channels" + +#: members/templates/email_application_accept.html:9 +msgid "SIK" +msgstr "SIK" + +#: members/templates/email_application_accept.html:10 +msgid "SIK-fuksit 2019" +msgstr "SIK Freshmen 2019" + +#: members/templates/email_application_accept.html:11 +msgid "SIK-fuksit 2019 -tiedotuskanava" +msgstr "SIK Freshmen 2019 Notification channel" + +#: members/templates/email_application_submit.html:2 +#: ohlhafv/templates/email.html:2 +msgid "Moikka" +msgstr "Hi" + +#: members/templates/email_application_submit.html:4 +msgid "" +"Sait tämän viestin, sillä olet lähettänyt hakemuksen Aalto-yliopiston " +"Sähköinsinöörikillan jäseneksi alla olevin tiedoin. Siistiä!" +msgstr "" +"You received this email, since you sent a membership application to the " +"Guild of Electrical Engineering. That's so cool!" + +#: members/templates/email_application_submit.html:6 +msgid "Etunimi" +msgstr "First name" + +#: members/templates/email_application_submit.html:7 +msgid "Sukunimi" +msgstr "Last name" + +#: members/templates/email_application_submit.html:8 +msgid "Sähköposti" +msgstr "Email" + +#: members/templates/email_application_submit.html:9 +msgid "Kotipaikkakunta" +msgstr "Place of origin" + +#: members/templates/email_application_submit.html:10 +msgid "AYY:n jäsen" +msgstr "Member of AYY" + +#: members/templates/email_application_submit.html:11 +msgid "Haluan jäsenmailin" +msgstr "I want to receive weekly member email" + +#: members/templates/email_application_submit.html:13 +msgid "" +"Saat sähköpostiisi tiedon, kun sinut on hallituksen kokouksessa hyväksytty " +"jäseneksi" +msgstr "You will be notified via email once your application has been accepted" + +#: members/templates/email_application_submit.html:15 +msgid "Muistathan maksaa jäsenmaksun! Alla maksutiedot" +msgstr "Don't forget to pay your membership fee!" + +#: members/templates/email_application_submit.html:17 +msgid "Saaja" +msgstr "Recepient" + +#: members/templates/email_application_submit.html:18 +msgid "Tilinumero" +msgstr "Account number" + +#: members/templates/email_application_submit.html:20 +msgid "Viite" +msgstr "Reference Number" + +#: members/templates/email_application_submit.html:21 +msgid "Summa" +msgstr "Amount" + #: members/templates/member_add.html:15 members/templates/member_edit.html:18 #: members/templates/payment_add.html:20 members/templates/payment_edit.html:18 msgid "Save" @@ -812,32 +921,48 @@ msgstr "Finnish" msgid "English" msgstr "English" -#: members/views/applications.py:51 members/views/applications.py:112 -#: members/views/applications.py:137 +#: members/views/applications.py:54 members/views/applications.py:125 +#: members/views/applications.py:150 msgid "No application id specified" msgstr "No application id specified" -#: members/views/applications.py:71 +#: members/views/applications.py:74 msgid "Application missing 'id' field." msgstr "Application missing 'id' field." -#: members/views/applications.py:80 +#: members/views/applications.py:83 msgid "Email {} is already in use by a member. Application cannot be accepted." msgstr "" "Email {} is already in use by a member. Application cannot be accepted." -#: members/views/applications.py:91 +#: members/views/applications.py:94 msgid "Successfully accepted application" msgstr "Successfully accepted application" -#: members/views/applications.py:116 +#: members/views/applications.py:97 +msgid "Jäsenhakemuksesi Sähköinsinöörikiltaan on hyväksytty!" +msgstr "" + +#: members/views/applications.py:129 msgid "Successfully deleted application" msgstr "Successfully deleted application" -#: members/views/applications.py:126 +#: members/views/applications.py:139 msgid "Could not delete application object" msgstr "Could not delete application object" +#: members/views/applications.py:177 +msgid "Jäsenhakemuksesi Sähköinsinöörikiltaan on lähetetty onnistuneesti!" +msgstr "Your membership application was sent successfully!" + +#: members/views/applications.py:182 members/views/applications.py:183 +msgid "Kyllä" +msgstr "Yes" + +#: members/views/applications.py:182 members/views/applications.py:183 +msgid "Ei" +msgstr "No" + #: members/views/members.py:86 members/views/members.py:188 #: members/views/members.py:212 msgid "No member id specified" @@ -932,10 +1057,6 @@ msgstr "" msgid "Ohlhafv challenge: {} vs. {}" msgstr "" -#: ohlhafv/templates/email.html:2 -msgid "Moikka" -msgstr "Hi" - #: ohlhafv/templates/email.html:4 msgid "on haastanut sinut oluenjuontimittelöön" msgstr "has challenged you to a beer drinking contest" @@ -945,12 +1066,9 @@ msgid "-sarjassa" msgstr "series" #: ohlhafv/templates/email.html:8 -#, fuzzy -#| msgid "" -#| "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 15.2" msgid "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 14.2" msgstr "" -"Remeber to confirm the challenge at Smökki on Thursday 15.2. at the event" +"Remeber to confirm the challenge at Smökki on Thursday 14.2. at the event" #: ohlhafv/templates/email.html:10 msgid "Käy kurkkaamassa muutkin haasteet osoitteessa" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index 1c09845d8824af8098584cb5f60eccfdaa1dfc87..118a138435a50268936aff3ca9b73dd7d176f420 100644 GIT binary patch delta 28 jcmZo~Vr*|>+`y^DYpH8!reJ7kWo)c%V7ysO>!TO|Zqf&Y delta 28 jcmZo~Vr*|>+`y^DYpiQzreJ7pWo)EvV6<6G>!TO|Zchh$ diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index 9037226..25eee0e 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/locale/fi/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-26 17:32+0200\n" +"POT-Creation-Date: 2019-09-16 19:33+0300\n" "PO-Revision-Date: 2017-11-02 23:04+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -632,6 +632,12 @@ msgid "Hienoa! Jäsenhakemuksesi on nyt lähetetty." msgstr "Hienoa! Jäsenhakemuksesi on nyt lähetetty." #: members/templates/application_success.html:9 +msgid "" +"Vahvistusviesti on lähetetty sähköpostiisi. Ota yhteyttä sik-vtmk@list.ayy." +"fi jos viestiä ei näy." +msgstr "" + +#: members/templates/application_success.html:10 msgid "Takaisin Sähköinsinöörikillan web-sivuille" msgstr "Takaisin Sähköinsinöörikillan web-sivuille" @@ -685,6 +691,103 @@ msgstr "Jäsenhakemuslomake" msgid "Settings" msgstr "Asetukset" +#: members/templates/email_application_accept.html:2 +msgid "Moi" +msgstr "" + +#: members/templates/email_application_accept.html:4 +msgid "Onnittelut! Sinut on hyväksytty Sähköinsinöörikillan jäseneksi." +msgstr "" + +#: members/templates/email_application_accept.html:6 +msgid "Käy kurkkaamassa killan nettisivuilta" +msgstr "" + +#: members/templates/email_application_accept.html:6 +msgid "" +"tulevia tapahtumia ja piipahda kiltahuoneella tutustumassa uusiin " +"kiltatovereihisi!" +msgstr "" + +#: members/templates/email_application_accept.html:8 +msgid "Liity myös killan TG-kanaville" +msgstr "" + +#: members/templates/email_application_accept.html:9 +msgid "SIK" +msgstr "" + +#: members/templates/email_application_accept.html:10 +msgid "SIK-fuksit 2019" +msgstr "" + +#: members/templates/email_application_accept.html:11 +msgid "SIK-fuksit 2019 -tiedotuskanava" +msgstr "" + +#: members/templates/email_application_submit.html:2 +#: ohlhafv/templates/email.html:2 +msgid "Moikka" +msgstr "" + +#: members/templates/email_application_submit.html:4 +msgid "" +"Sait tämän viestin, sillä olet lähettänyt hakemuksen Aalto-yliopiston " +"Sähköinsinöörikillan jäseneksi alla olevin tiedoin. Siistiä!" +msgstr "" + +#: members/templates/email_application_submit.html:6 +msgid "Etunimi" +msgstr "" + +#: members/templates/email_application_submit.html:7 +msgid "Sukunimi" +msgstr "" + +#: members/templates/email_application_submit.html:8 +msgid "Sähköposti" +msgstr "" + +#: members/templates/email_application_submit.html:9 +msgid "Kotipaikkakunta" +msgstr "" + +#: members/templates/email_application_submit.html:10 +msgid "AYY:n jäsen" +msgstr "" + +#: members/templates/email_application_submit.html:11 +msgid "Haluan jäsenmailin" +msgstr "" + +#: members/templates/email_application_submit.html:13 +msgid "" +"Saat sähköpostiisi tiedon, kun sinut on hallituksen kokouksessa hyväksytty " +"jäseneksi" +msgstr "" + +#: members/templates/email_application_submit.html:15 +#, fuzzy +#| msgid "Muista myös maksaa jäsenmaksusi!" +msgid "Muistathan maksaa jäsenmaksun! Alla maksutiedot" +msgstr "Muista myös maksaa jäsenmaksusi!" + +#: members/templates/email_application_submit.html:17 +msgid "Saaja" +msgstr "" + +#: members/templates/email_application_submit.html:18 +msgid "Tilinumero" +msgstr "" + +#: members/templates/email_application_submit.html:20 +msgid "Viite" +msgstr "" + +#: members/templates/email_application_submit.html:21 +msgid "Summa" +msgstr "" + #: members/templates/member_add.html:15 members/templates/member_edit.html:18 #: members/templates/payment_add.html:20 members/templates/payment_edit.html:18 msgid "Save" @@ -808,31 +911,49 @@ msgstr "suomi" msgid "English" msgstr "englanti" -#: members/views/applications.py:51 members/views/applications.py:112 -#: members/views/applications.py:137 +#: members/views/applications.py:54 members/views/applications.py:125 +#: members/views/applications.py:150 msgid "No application id specified" msgstr "Hakemuksen ID ei määritelty" -#: members/views/applications.py:71 +#: members/views/applications.py:74 msgid "Application missing 'id' field." msgstr "Hakemuksen ID ei määritelty." -#: members/views/applications.py:80 +#: members/views/applications.py:83 msgid "Email {} is already in use by a member. Application cannot be accepted." msgstr "Sähköpostiosoite {} on jo käytössä. Hakemusta ei hyväksytty." -#: members/views/applications.py:91 +#: members/views/applications.py:94 msgid "Successfully accepted application" msgstr "Onnistuneesti hyväksyttiin hakemus" -#: members/views/applications.py:116 +#: members/views/applications.py:97 +msgid "Jäsenhakemuksesi Sähköinsinöörikiltaan on hyväksytty!" +msgstr "" + +#: members/views/applications.py:129 msgid "Successfully deleted application" msgstr "Onnistuneesti poistettiin hakemus" -#: members/views/applications.py:126 +#: members/views/applications.py:139 msgid "Could not delete application object" msgstr "Hakemusobjektia ei voitu poistaa" +#: members/views/applications.py:177 +msgid "Jäsenhakemuksesi Sähköinsinöörikiltaan on lähetetty onnistuneesti!" +msgstr "" + +#: members/views/applications.py:182 members/views/applications.py:183 +msgid "Kyllä" +msgstr "" + +#: members/views/applications.py:182 members/views/applications.py:183 +#, fuzzy +#| msgid "Edit" +msgid "Ei" +msgstr "Muokkaa" + #: members/views/members.py:86 members/views/members.py:188 #: members/views/members.py:212 msgid "No member id specified" @@ -927,10 +1048,6 @@ msgstr "Sarja" msgid "Ohlhafv challenge: {} vs. {}" msgstr "Ohlhafv-haaste: {} vs. {}" -#: ohlhafv/templates/email.html:2 -msgid "Moikka" -msgstr "" - #: ohlhafv/templates/email.html:4 msgid "on haastanut sinut oluenjuontimittelöön" msgstr "" diff --git a/members/templates/application_success.html b/members/templates/application_success.html index 66078b7..57b7a19 100644 --- a/members/templates/application_success.html +++ b/members/templates/application_success.html @@ -6,5 +6,6 @@ {% block content %}

{% trans "Hienoa! Jäsenhakemuksesi on nyt lähetetty." %}

+

{% trans "Vahvistusviesti on lähetetty sähköpostiisi. Ota yhteyttä sik-vtmk@list.ayy.fi jos viestiä ei näy." %}

{% trans "Takaisin Sähköinsinöörikillan web-sivuille" %}

 {% endblock content %} diff --git a/members/templates/email_application_accept.html b/members/templates/email_application_accept.html new file mode 100644 index 0000000..23a0bd9 --- /dev/null +++ b/members/templates/email_application_accept.html @@ -0,0 +1,11 @@ +{% load i18n %} +{% trans "Moi" %} {{ first_name }}! + +{% trans "Onnittelut! Sinut on hyväksytty Sähköinsinöörikillan jäseneksi." %} + +{% trans "Käy kurkkaamassa killan nettisivuilta" %} (https://sik.ayy.fi) {% trans "tulevia tapahtumia ja piipahda kiltahuoneella tutustumassa uusiin kiltatovereihisi!" %} + +{% trans "Liity myös killan TG-kanaville" %}: +{% trans "SIK" %}: https://t.me/joinchat/A6EViD5FCWLxPcXCggY7hw +{% trans "SIK-fuksit 2019" %}: http://tinyurl.com/sikfuksit19-tg +{% trans "SIK-fuksit 2019 -tiedotuskanava" %}: http://tinyurl.com/sikfuksit19-tiedotus diff --git a/members/templates/email_application_submit.html b/members/templates/email_application_submit.html new file mode 100644 index 0000000..68046e5 --- /dev/null +++ b/members/templates/email_application_submit.html @@ -0,0 +1,21 @@ +{% load i18n %} +{% trans "Moikka" %} {{ application.first_name }}, + +{% trans "Sait tämän viestin, sillä olet lähettänyt hakemuksen Aalto-yliopiston Sähköinsinöörikillan jäseneksi alla olevin tiedoin. Siistiä!" %} + +{% trans "Etunimi" %}: {{ application.first_name }} +{% trans "Sukunimi" %}: {{ application.last_name }} +{% trans "Sähköposti" %}: {{ application.email }} +{% trans "Kotipaikkakunta" %}: {{ application.POR }} +{% trans "AYY:n jäsen" %}: {{ ayy }} +{% trans "Haluan jäsenmailin" %}: {{ jas }} + +{% trans "Saat sähköpostiisi tiedon, kun sinut on hallituksen kokouksessa hyväksytty jäseneksi" %}. + +{% trans "Muistathan maksaa jäsenmaksun! Alla maksutiedot" %}: + +{% trans "Saaja" %}: Aalto-yliopiston Sähköinsinöörikilta ry +{% trans "Tilinumero" %}: FI97 1309 3000 1118 23 +BIC: NDEAFIHH +{% trans "Viite" %}: 1313 +{% trans "Summa" %}: 8 € diff --git a/members/views/applications.py b/members/views/applications.py index 4e00113..104e113 100644 --- a/members/views/applications.py +++ b/members/views/applications.py @@ -7,10 +7,13 @@ from django.core.mail import send_mail from django.conf import settings from django.utils.translation import ugettext as _ from django.forms.models import model_to_dict +from django.template.loader import render_to_string import logging import html +from webapp.utils import send_email + from members.views.utils import * from members.tables import RequestTable from members.forms import ApplicationForm @@ -90,6 +93,16 @@ def application_accept(request, *args, **kwargs): .format(form)) notification = "{} {}.".format(_("Successfully accepted application"), str(application)) + + subject = _('Jäsenhakemuksesi Sähköinsinöörikiltaan on hyväksytty!') + + message = render_to_string( + 'members:email_application_accept.html', { + 'first_name': application.first_name + } + ) + send_email(member.email, subject, message) + return HttpResponseRedirect( '/members/list?notification={}'.format(html.escape(notification))) except Exception as ex: @@ -157,6 +170,21 @@ def application_submit(request, *args, **kwargs): form = ApplicationForm(request.POST) if form.is_valid(): form.save() - return render(request, 'application_success.html', {}) + try: + application = form.instance + email = form.cleaned_data.get('email', '') + + subject = _('Jäsenhakemuksesi Sähköinsinöörikiltaan on lähetetty onnistuneesti!') + + message = render_to_string( + 'members:email_application_submit.html', { + 'application': application, + 'ayy': _('Kyllä') if application.AYY else _('Ei'), + 'jas': _('Kyllä') if application.jas else _('Ei') + } + ) + send_email(email, subject, message) + finally: + return render(request, 'application_success.html', {}) else: return error_view(request, form.errors)