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
99a450dd
Commit
99a450dd
authored
Jul 11, 2018
by
Thom Wiggers
📐
Browse files
Merge branch 'fix/member-expiration-email' into 'master'
Fix member expiration emails See merge request
!856
parents
379ae9a1
3b251f1b
Changes
5
Hide whitespace changes
Inline
Side-by-side
website/members/emails.py
View file @
99a450dd
...
...
@@ -90,10 +90,13 @@ def send_expiration_announcement(dry_run=False):
with
translation
.
override
(
member
.
language
):
email_body
=
loader
.
render_to_string
(
'members/email/expiration_announcement.txt'
,
{
'name'
:
member
.
get_full_name
(),
'membership_price'
:
floatformat
(
settings
.
MEMBERSHIP_PRICES
[
'year'
],
2
)})
{
'name'
:
member
.
get_full_name
(),
'membership_price'
:
floatformat
(
settings
.
MEMBERSHIP_PRICES
[
'year'
],
2
),
'renewal_url'
:
reverse
(
'registrations:renew'
)
})
mail
.
EmailMessage
(
_
(
'Membership expiration announcement'
),
email_body
,
...
...
website/members/locale/nl/LC_MESSAGES/django.mo
View file @
99a450dd
No preview for this file type
website/members/locale/nl/LC_MESSAGES/django.po
View file @
99a450dd
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-0
6-07
1
4
:1
7
+0200\n"
"PO-Revision-Date: 2018-0
6-07 14:25
+0200\n"
"POT-Creation-Date: 2018-0
7-11
1
9
:1
2
+0200\n"
"PO-Revision-Date: 2018-0
7-11 18:52
+0200\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
...
...
@@ -18,59 +18,59 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.0.4\n"
#: admin.py:
40
#: admin.py:
39
msgid "membership type"
msgstr "lidtype"
#: admin.py:5
8
#: admin.py:5
7
msgid "Age"
msgstr "Leeftijd"
#: admin.py:6
3
#: admin.py:6
2
msgid "≥ 18"
msgstr "≥ 18"
#: admin.py:6
4
#: admin.py:6
3
msgid "< 18"
msgstr "< 18"
#: admin.py:6
5
#: admin.py:6
4
msgid "Unknown"
msgstr "Onbekend"
#: admin.py:11
3
admin.py:13
2
forms.py:87
#: admin.py:11
2
admin.py:13
1
forms.py:87
msgid "First name"
msgstr "Voornaam"
#: admin.py:11
3
admin.py:13
2
forms.py:95
#: admin.py:11
2
admin.py:13
1
forms.py:95
msgid "Last name"
msgstr "Achternaam"
#: admin.py:11
3
#: admin.py:11
2
msgid "Address"
msgstr "Adres"
#: admin.py:11
4
#: admin.py:11
3
msgid "Address line 2"
msgstr "Tweede adresregel"
#: admin.py:11
4
models.py:21
8
#: admin.py:11
3
models.py:21
6
msgid "Postal code"
msgstr "Postcode"
#: admin.py:11
4
models.py:22
4
#: admin.py:11
3
models.py:22
2
msgid "City"
msgstr "Woonplaats"
#: admin.py:12
4
#: admin.py:12
3
msgid "Download address label for selected users"
msgstr "Download adreslabels voor geselecteerde gebruikers"
#: admin.py:13
2
models.py:1
81
#: admin.py:13
1
models.py:1
79
msgid "Student number"
msgstr "Studentnummer"
#: admin.py:13
9
#: admin.py:13
8
msgid "Download student number label for selected users"
msgstr "Download studentnummers voor geselecteerde gebruikers"
...
...
@@ -78,43 +78,43 @@ msgstr "Download studentnummers voor geselecteerde gebruikers"
msgid "Members"
msgstr "Leden"
#: emails.py:
30
#: emails.py:
29
msgid "Membership announcement"
msgstr "Mededeling over lidmaatschap"
#: emails.py:
40
#: emails.py:
39
msgid "Membership announcement sent"
msgstr "Mededeling over lidmaatschap verzonden"
#: emails.py:6
2
#: emails.py:6
1
msgid "Membership information check"
msgstr "Controle gegevens lidmaatschap"
#: emails.py:7
2
#: emails.py:7
1
msgid "Membership information check sent"
msgstr "Controle gegevens lidmaatschap verzonden"
#: emails.py:
99
#: emails.py:
101
msgid "Membership expiration announcement"
msgstr "Verlopen lidmaatschap"
#: emails.py:1
09
#: emails.py:1
11
msgid "Membership expiration announcement sent"
msgstr "Meldingen vervallen lidmaatschap verzonden"
#: emails.py:12
7
#: emails.py:12
9
msgid "Welcome to Study Association Thalia"
msgstr "Welkom bij Studievereniging Thalia"
#: emails.py:13
5
#: emails.py:13
7
msgid "Please confirm your email change"
msgstr "Bevestig de verandering van je e-mailadres"
#: emails.py:15
3
#: emails.py:15
5
msgid "Please verify your email address"
msgstr "Verifieer je nieuwe e-mailadres"
#: emails.py:17
3
#: emails.py:17
5
msgid "Your email address has been changed"
msgstr "Je e-mailadres is aangepast"
...
...
@@ -134,83 +134,83 @@ msgstr "Deze e-mail zal het gegenereerde wachtwoord bevatten"
msgid "Email address"
msgstr "E-mailadres"
#: models.py:12
6
#: models.py:12
4
msgid "Is this user currently active"
msgstr "Is deze user op dit moment actief"
#: models.py:1
60
#: models.py:1
58
msgid "Computing Science"
msgstr "Informatica"
#: models.py:1
61
#: models.py:1
59
msgid "Information Sciences"
msgstr "Informatiekunde"
#: models.py:17
5
templates/members/profile.html:44
#: models.py:17
3
templates/members/profile.html:44
msgid "Study programme"
msgstr "Studie"
#: models.py:18
5
#: models.py:18
3
msgid "Enter a valid student- or e/z/u-number."
msgstr "Voer een geldig student- of e/z/u-nummer in."
#: models.py:19
1
#: models.py:1
8
9
msgid "Starting year"
msgstr "Startjaar"
#: models.py:19
2
#: models.py:19
0
msgid "The year this member started studying."
msgstr "Het jaar waarop dit lid begon met studeren."
#: models.py:20
3
#: models.py:20
1
msgid "Include the house number"
msgstr "Inclusief huisnummer"
#: models.py:20
5
#: models.py:20
3
msgid "Street and house number"
msgstr "Straat en huisnummer"
#: models.py:2
11
#: models.py:2
09
msgid "Second address line"
msgstr "Tweede adresregel"
#: models.py:2
30
#: models.py:2
28
msgid "Phone number"
msgstr "Telefoonnummer"
#: models.py:2
31
#: models.py:2
29
msgid "Enter a phone number so Thalia may reach you"
msgstr "Voer een telefoonnummer in zodat Thalia je kan bereiken"
#: models.py:23
4
models.py:25
6
#: models.py:23
2
models.py:25
4
msgid "Please enter a valid phone number"
msgstr "Voer svp een geldig telefoonnummer in"
#: models.py:24
4
#: models.py:24
2
msgid "Emergency contact name"
msgstr "Contact voor noodgevallen"
#: models.py:24
5
#: models.py:24
3
msgid "Who should we contact in case of emergencies"
msgstr "Wie Thalia moet bereiken in bij noodgevallen"
#: models.py:25
2
#: models.py:25
0
msgid "Emergency contact phone number"
msgstr "Telefoonnummer noodcontact"
#: models.py:25
3
#: models.py:25
1
msgid "The phone number for the emergency contact"
msgstr "Het telefoonummer van de noodcontact"
#: models.py:26
5
templates/members/profile.html:52
#: models.py:26
3
templates/members/profile.html:52
msgid "Birthday"
msgstr "Verjaardag"
#: models.py:2
70
#: models.py:2
68
msgid "Display birthday"
msgstr "Laat verjaardag zien"
#: models.py:27
2
#: models.py:27
0
msgid ""
"Show your birthday to other members on your profile page and in the birthday "
"calendar"
...
...
@@ -218,107 +218,107 @@ msgstr ""
"Toon je verjaardag aan andere leden op je profielpagina en in de "
"verjaardagskalender"
#: models.py:27
9
templates/members/profile.html:48
#: models.py:27
7
templates/members/profile.html:48
msgid "Website"
msgstr "Website"
#: models.py:28
0
#: models.py:2
7
8
msgid "Website to display on your profile page"
msgstr "Website om op je profiel te linken"
#: models.py:28
6
#: models.py:28
4
msgid "Profile text"
msgstr "Profieltekst"
#: models.py:28
7
#: models.py:28
5
msgid "Text to display on your profile"
msgstr "Tekst om te laten zien op je profielpagina"
#: models.py:29
5
#: models.py:29
3
msgid "Initials"
msgstr "Initialen"
#: models.py:30
2
#: models.py:30
0
msgid "Nickname"
msgstr "Bijnaam"
#: models.py:30
9
#: models.py:30
7
msgid "How to display name"
msgstr "Weergave naam"
#: models.py:3
1
0
#: models.py:30
8
msgid "Show full name"
msgstr "Volledige naam"
#: models.py:3
11
#: models.py:3
09
msgid "Show only nickname"
msgstr "Alleen initialen"
#: models.py:31
2
#: models.py:31
0
msgid "Show only first name"
msgstr "Alleen voornaam"
#: models.py:31
3
#: models.py:31
1
msgid "Show initials and last name"
msgstr "Alleen initialen en achternaam"
#: models.py:31
4
#: models.py:31
2
msgid "Show name like \"John 'nickname' Doe\""
msgstr "Laat zien als \"John 'bijnaam' Doe\""
#: models.py:31
5
#: models.py:31
3
msgid "Show nickname and last name"
msgstr "Laat bijnaam en achternaam zien"
#: models.py:3
20
#: models.py:3
18
msgid "Photo"
msgstr "Foto"
#: models.py:32
8
#: models.py:32
6
msgid "Which events can this member attend"
msgstr "Welke evenementen mag dit lid bijwonen"
#: models.py:32
9
#: models.py:32
7
msgid "All events"
msgstr "Alle evenementen"
#: models.py:3
30
#: models.py:3
28
msgid "User may not attend events"
msgstr "Gebruiker mag niet naar evenementen"
#: models.py:3
31
#: models.py:3
29
msgid "User may not attend drinks"
msgstr "Gebruiker mag niet naar borrels"
#: models.py:33
2
#: models.py:33
0
msgid "User may not attend anything"
msgstr "Gebruiker mag nergens heen"
#: models.py:33
9
#: models.py:33
7
msgid "Preferred language"
msgstr "Voorkeurstaal"
#: models.py:3
40
#: models.py:3
38
msgid "Preferred language for e.g. newsletters"
msgstr "Voorkeurstaal voor b.v.b. nieuwsbrieven"
#: models.py:34
7
#: models.py:34
5
msgid "Receive opt-in mailings"
msgstr "Ontvang opt-in mailings"
#: models.py:34
8
#: models.py:34
6
msgid "Receive mailings about vacancies and events from Thalia's sponsors."
msgstr "Ontvang mailings over vacatures en evenementen van Thalia's sponsoren."
#: models.py:35
4
#: models.py:35
2
msgid "Receive newsletter"
msgstr "Ontvang nieuwsbrief"
#: models.py:35
5
#: models.py:35
3
msgid "Receive the Thalia Newsletter"
msgstr "Ontvang de Thalia nieuwsbrief"
#: models.py:36
2
#: models.py:36
0
msgid ""
"Yes, I want Thalia to take the membership fees from my bank account through "
"direct debit for each year."
...
...
@@ -326,113 +326,113 @@ msgstr ""
"Ja, ik wil dat Thalia verschuldigde lidmaatschapsgelden elk jaar van mijn "
"bankrekening afschrijft."
#: models.py:36
5
#: models.py:36
3
msgid "No, I will pay the contribution myself"
msgstr "Nee, ik zal de contributie zelf betalen"
#: models.py:36
6
#: models.py:36
4
msgid "Direct debit"
msgstr "Automatische afschijving"
#: models.py:36
7
#: models.py:36
5
msgid "Each year, have Thalia take the membership fees from my bank account"
msgstr ""
"Laat Thalia elk jaar het lidmaatschapsgeld van mijn bankrekening afschrijven"
#: models.py:37
3
#: models.py:37
1
msgid "Bank account"
msgstr "Bankrekening"
#: models.py:37
4
#: models.py:37
2
msgid "Bank account for direct debit"
msgstr "Bankrekening voor automatische afschrijving"
#: models.py:39
8
#: models.py:39
6
msgid "Display name"
msgstr "Weergavenaam"
#: models.py:42
7
#: models.py:42
5
msgid "You need to enter a nickname to use it as display name"
msgstr ""
"Je moet een bijnaam invoeren voordat je deze kunt gebruiken als weergavenaam"
#: models.py:43
2
#: models.py:43
0
msgid "A birthday cannot be in the future."
msgstr "Een verjaardag kan niet in de toekomst liggen."
#: models.py:48
2
#: models.py:48
0
msgid "Member"
msgstr "Lid"
#: models.py:48
3
#: models.py:48
1
msgid "Supporter"
msgstr "Begunstiger"
#: models.py:48
4
#: models.py:48
2
msgid "Honorary Member"
msgstr "Erelid"
#: models.py:48
9
templates/members/profile.html:37
#: models.py:48
7
templates/members/profile.html:37
msgid "Membership type"
msgstr "Lidtype"
#: models.py:49
5
#: models.py:49
3
msgid "User"
msgstr "Gebruiker"
#: models.py:49
9
#: models.py:49
7
msgid "Membership since"
msgstr "Lid sinds"
#: models.py:
500
#: models.py:
498
msgid "The date the member started holding this membership."
msgstr "De datum waarop het lid dit lidmaatschap is begonnen."
#: models.py:50
5
#: models.py:50
3
msgid "Membership until"
msgstr "Lid tot"
#: models.py:50
6
#: models.py:50
4
msgid "The date the member stops holding this membership."
msgstr "De datum waarop het lid dit lidmaatschap beëindigd."
#: models.py:51
7
#: models.py:51
5
msgid "End date can't be before start date"
msgstr "De einddatum kan niet eerder zijn dan de startdatum"
#: models.py:5
31
models.py:53
3
#: models.py:5
29
models.py:53
1
msgid "A membership already exists for that period"
msgstr "Er bestaat al een lidmaatschap voor deze periode"
#: models.py:54
4
#: models.py:54
2
msgid "created at"
msgstr "gemaakt op"
#: models.py:54
9
#: models.py:54
7
msgid "member"
msgstr "lid"
#: models.py:55
4
#: models.py:55
0
msgid "email"
msgstr "e-mail"
#: models.py:5
62
#: models.py:5
58
msgid "verified"
msgstr "geverifieerd"
#: models.py:5
63
#: models.py:5
59
msgid "the new email address is valid"
msgstr "het nieuwe e-mailadres is geverifieerd"
#: models.py:56
6
#: models.py:56
2
msgid "confirmed"
msgstr "bevestigd"
#: models.py:56
7
#: models.py:56
3
msgid "the old email address was checked"
msgstr "het oude e-mailadres is gecontroleerd"
#: models.py:57
9
#: models.py:57
5
msgid "Please enter a new email address."
msgstr "Vul een nieuw e-mailadres in."
...
...
@@ -644,7 +644,44 @@ msgstr ""
"Deze e-mail is automatisch gegenereerd."
#: templates/members/email/expiration_announcement.txt:1
#, python-format
#, fuzzy, 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.\n"
#| "\n"
#| "Renewing your membership is easy. Open the renewal page on the website "
#| "and\n"
#| "select the right option: %(renewal_url)s.\n"
#| "\n"
#| "Note that if you upgrade your yearly membership to a study membership "
#| "before August 31,\n"
#| "you will get a discount of €%(membership_price)s.\n"
#| "\n"
#| "Are you not unable to renew your membership via the website? Then 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."
msgid ""
"Dear %(name)s,\n"
"\n"
...
...
@@ -658,15 +695,17 @@ msgid ""
"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"
"our exam collection and a symposium.\n"
"\n"
"Note that if you upgrade your yearly membership to a study membership this "
"year,\n"
"Renewing your membership is easy. Open the renewal page on the website and\n"
"select the right option: %(renewal_url)s.\n"
"\n"
"Note that if you upgrade your yearly membership to a study membership before "
"August 31,\n"
"you will get a discount of €%(membership_price)s.\n"
"\n"
"Are you not able to come by? Then just send us an email: info@thalia.nu.\n"
"Are you unable to renew your membership via the website? Then send us an "
"email: info@thalia.nu.\n"
"\n"
"With kind regards,\n"
"\n"
...
...
@@ -690,12 +729,14 @@ msgstr ""
"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"
"Thabloid en een symposium, dan zul je je lidmaatschap moeten verlengen.\n"
"\n"
"Het vernieuwen van je lidmaatschap is makkelijk. Open de vernieuwingspagina "
"op de website en\n"
"selecteer de juiste optie: %(renewal_url)s.\n"
"\n"
"Als je je jaarlidmaatschap
dit jaar
nog omzet naar een
studielidmaatschap
"
"krijg je\n"
"Als je je jaarlidmaatschap
voor 31 augustus
nog omzet naar een "
"
studielidmaatschap
krijg je\n"
"daarvoor €%(membership_price)s korting.\n"
"\n"
"Ook op een later moment kun je je nog inschrijven, neem dan even contact op "
...
...
@@ -738,7 +779,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
git
."
"Unable to edit the incorrect information? Then send an email: info@thalia."
"nu.\n"
"\n"
"With kind regards,\n"
...
...
@@ -987,19 +1028,19 @@ msgstr "Statistieken"
msgid "Total amount of Thalia members"
msgstr "Totaal aantal Thalialeden"
#: views.py:14
6
#: views.py:14
5
msgid "Unknown membership history"
msgstr "Onbekende lidmaatschap geschiedenis"