Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
e6dda59c
Verified
Commit
e6dda59c
authored
Jun 14, 2017
by
Sébastiaan Versteeg
Browse files
Improve emails, fix dry-run and change website from mail
parent
4cec183f
Changes
5
Hide whitespace changes
Inline
Side-by-side
website/members/emails.py
View file @
e6dda59c
...
...
@@ -83,18 +83,19 @@ def send_expiration_announcement(dry_run=False):
for
member
in
members
:
print
(
"Send email to {} ({})"
.
format
(
member
.
get_full_name
(),
member
.
user
.
email
))
with
translation
.
override
(
member
.
language
):
email_body
=
loader
.
render_to_string
(
'members/email/expiration_announcement.txt'
,
{
'name'
:
member
.
get_full_name
()})
mail
.
EmailMessage
(
_
(
'Membership expiration announcement'
),
email_body
,
settings
.
WEBSITE_FROM_ADDRESS
,
[
member
.
user
.
email
],
bcc
=
[
settings
.
BOARD_NOTIFICATION_ADDRESS
],
connection
=
connection
).
send
()
if
not
dry_run
:
with
translation
.
override
(
member
.
language
):
email_body
=
loader
.
render_to_string
(
'members/email/expiration_announcement.txt'
,
{
'name'
:
member
.
get_full_name
()})
mail
.
EmailMessage
(
_
(
'Membership expiration announcement'
),
email_body
,
settings
.
WEBSITE_FROM_ADDRESS
,
[
member
.
user
.
email
],
bcc
=
[
settings
.
BOARD_NOTIFICATION_ADDRESS
],
connection
=
connection
).
send
()
if
not
dry_run
:
mail
.
mail_managers
(
...
...
website/members/locale/nl/LC_MESSAGES/django.mo
View file @
e6dda59c
No preview for this file type
website/members/locale/nl/LC_MESSAGES/django.po
View file @
e6dda59c
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-0
6-15 12:20
+0200\n"
"PO-Revision-Date: 2017-0
6-1
5 1
2
:2
0
+0200\n"
"POT-Creation-Date: 2017-0
7-05 19:17
+0200\n"
"PO-Revision-Date: 2017-0
7-0
5 1
9
:2
3
+0200\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
...
...
@@ -74,22 +74,30 @@ msgstr "Studentnummer"
msgid "Download student number label for selected users"
msgstr "Download studentnummers voor geselecteerde gebruikers"
#: emails.py:2
4
#: emails.py:2
7
msgid "Membership announcement"
msgstr "Mededeling over lidmaatschap"
#: emails.py:3
4
#: emails.py:3
7
msgid "Membership announcement sent"
msgstr "Mededeling over lidmaatschap verzonden"
#: emails.py:5
5
#: emails.py:5
9
msgid "Membership information check"
msgstr "Controle gegevens lidmaatschap"
#: emails.py:6
5
#: emails.py:6
9
msgid "Membership information check sent"
msgstr "Controle gegevens lidmaatschap verzonden"
#: emails.py:92
msgid "Membership expiration announcement"
msgstr "Verlopen lidmaatschap"
#: emails.py:102
msgid "Membership expiration announcement sent"
msgstr "Meldingen vervallen lidmaatschap verzonden"
#: forms.py:42
msgid "Send welcome email"
msgstr "Stuur welkomste-mails"
...
...
@@ -367,7 +375,7 @@ msgstr ""
#: templates/members/account.html:6 templates/members/account.html:7
#: templates/members/edit_profile.html:5 templates/members/edit_profile.html:6
#: templates/members/index.html:7 templates/members/index.html:8
#: templates/members/index.html:1
1
templates/members/profile.html:6
#: templates/members/index.html:1
2
templates/members/profile.html:6
#: templates/members/profile.html:7
msgid "members"
msgstr "leden"
...
...
@@ -446,6 +454,70 @@ msgstr ""
msgid "save"
msgstr "opslaan"
#: templates/members/email/expiration_announcement.txt:1
#, python-format
msgid ""
"Dear %(name)s,\n"
"\n"
"The past year you've been a member or benificiary of Study Association "
"Thalia.\n"
"You've not given us permission to prolong it automatically, thus your "
"membership will\n"
"end on the 1st of September.\n"
"\n"
"If you still want to enjoy all the benefits a membership gives you the "
"coming year\n"
"then you'll have to renew it. This'll give you access to activities, the "
"book sale,\n"
"our exam collection and a symposium. Come by the board room and we'll help "
"you\n"
"to extend your membership.\n"
"\n"
"Are you not able to come by? Then just send us an email: info@thalia.nu.\n"
"\n"
"With kind regards,\n"
"\n"
"The board of Study Association Thalia\n"
"\n"
"————\n"
"\n"
"This email was automatically generated. It's possible that you've already "
"renewed\n"
"your membership and that it hasn't been processed yet. If that's the case "
"then\n"
"you don't need to do anything."
msgstr ""
"Beste %(name)s,\n"
"\n"
"Het afgelopen collegejaar ben je lid of begunstiger geweest van "
"Studievereniging\n"
"Thalia. Je hebt daarbij geen doorlopende machtiging afgegeven, dus je\n"
"lidmaatschap loopt op 1 september af.\n"
"\n"
"Wil je volgend jaar ook nog van de voordelen van een Thalialidmaatschap\n"
"genieten, zoals de borrels, boekverkoop, activiteiten, de tentamenbundel, "
"de\n"
"Thabloid en een symposium, dan zul je je lidmaatschap moeten verlengen. Dit "
"kun\n"
"je doen door langs de bestuurskamer te komen.\n"
"\n"
"Ook op een later moment kun je je nog inschrijven, neem dan even contact op "
"met\n"
"het bestuur om te bespreken wat een handig moment is. Mail hiervoor naar\n"
"info@thalia.nu.\n"
"\n"
"Met vriendelijke groeten,\n"
"\n"
"Het bestuur der Studievereniging Thalia\n"
"\n"
"\n"
"————\n"
"\n"
"Deze e-mail is automatisch gegenereerd. Het kan zijn dat je je lidmaatschap "
"al\n"
"verlengd hebt, maar dat dit nog niet is verwerkt: in dat geval hoef je niets "
"te doen."
#: templates/members/email/information_check.txt:1
#, python-format
msgid ""
...
...
@@ -469,7 +541,7 @@ msgid ""
"\n"
"You can change this data by logging into the website and using the 'edit "
"profile' page.\n"
"Unable to edit the incorrect information? Then send an email: info@thalia."
"Unable to edit the incorrect information? Then send an email: info@thalia
git
."
"nu.\n"
"\n"
"With kind regards,\n"
...
...
@@ -570,7 +642,7 @@ msgstr ""
"wachtwoord: %(password)s Controleer alsjeblieft ook de gegevens in je "
"profiel. Groetjes, Thalia"
#: templates/members/index.html:1
4
#: templates/members/index.html:1
5
msgid ""
"Ever wondered what the name of that person in the back row of the lecture "
"room is? There is a high probability that this person is a member of Thalia, "
...
...
@@ -580,39 +652,39 @@ msgstr ""
"ziet lopen? Er bestaat een grote kans dat die persoon lid van Thalia is, en "
"dus is opgenomen in de onderstaande ledenlijst."
#: templates/members/index.html:2
5
#: templates/members/index.html:2
6
msgid "Who are you looking for?"
msgstr "Wie zoek je?"
#: templates/members/index.html:2
6
#: templates/members/index.html:2
7
msgid "Search"
msgstr "Zoeken"
#: templates/members/index.html:3
4
#: templates/members/index.html:3
5
msgid "All members"
msgstr "Alle leden"
#: templates/members/index.html:3
8
#: templates/members/index.html:3
9
msgid "Older"
msgstr "Ouder"
#: templates/members/index.html:
39
#: templates/members/index.html:
40
msgid "Honorary Members"
msgstr "Ere-leden"
#: templates/members/index.html:4
0
#: templates/members/index.html:4
1
msgid "Former Members"
msgstr "Ex-leden"
#: templates/members/index.html:4
6
#: templates/members/index.html:4
7
msgid "No members found"
msgstr "Geen leden gevonden"
#: templates/members/index.html:6
6
templates/members/profile.html:38
#: templates/members/index.html:6
7
templates/members/profile.html:38
msgid "Cohort"
msgstr "Cohort"
#: templates/members/index.html:10
3
#: templates/members/index.html:10
4
msgid "Next"
msgstr "Volgende"
...
...
@@ -653,6 +725,6 @@ msgstr "Statistieken"
msgid "Total amount of Thalia members"
msgstr "Totaal aantal Thalialeden"
#: views.py:10
8
#: views.py:10
9
msgid "Former member"
msgstr "Oud-lid"
website/members/templates/members/email/expiration_announcement.txt
View file @
e6dda59c
...
...
@@ -15,5 +15,8 @@ With kind regards,
The board of Study Association Thalia
P.S. It's possible that you've already renewed your membership and that it hasn't been processed yet.
If that's the case then you don't need to do anything.{% endblocktrans %}
————
This email was automatically generated. It's possible that you've already renewed
your membership and that it hasn't been processed yet. If that's the case then
you don't need to do anything.{% endblocktrans %}
website/members/templates/members/email/expiration_announcement_notification.txt
View file @
e6dda59c
G
ea
cht bestuur
,
D
ea
r board
,
Vanwege de tijd van het jaar heeft de website automatisch iedereen waarvan het lidmaatschap verloopt een email gestuurd.
It's that time of the year again! The website sent an automatic email to
everybody whose membership is expiring.
In die email staat dat het lidmaatschap verloopt met hierbij de instructies om het te kunnen verlengen.
The email explains how they can prolong their membership.
So you can expect an influx of people who want to extend their memberships.
Dez
e email
is gestuurd naar
:
Th
e email
was sent to
:
{% for member in members %}
* {{ member.full_name }}
{% endfor %}
K
usj
es,
K
iss
es,
D
e website
Th
e website
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment