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
5427cae9
Commit
5427cae9
authored
May 28, 2018
by
Gijs Hendriksen
Browse files
Add a reminder that people can upgrade to a study membership in the expiration email
parent
24780481
Changes
4
Hide whitespace changes
Inline
Side-by-side
website/members/emails.py
View file @
5427cae9
...
...
@@ -5,6 +5,7 @@ from django.template import loader
from
django.utils
import
translation
from
django.utils.datetime_safe
import
datetime
from
django.utils.translation
import
ugettext
as
_
from
django.template.defaultfilters
import
floatformat
from
members.models
import
Member
from
thaliawebsite.settings
import
settings
...
...
@@ -89,7 +90,10 @@ 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
()})
{
'name'
:
member
.
get_full_name
(),
'membership_price'
:
floatformat
(
settings
.
MEMBERSHIP_PRICES
[
'year'
],
2
)})
mail
.
EmailMessage
(
_
(
'Membership expiration announcement'
),
email_body
,
...
...
website/members/locale/nl/LC_MESSAGES/django.mo
View file @
5427cae9
No preview for this file type
website/members/locale/nl/LC_MESSAGES/django.po
View file @
5427cae9
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-0
2-12 14:06
+0
1
00\n"
"PO-Revision-Date: 2018-0
2-12 13:44
+0
1
00\n"
"POT-Creation-Date: 2018-0
5-29 16:25
+0
2
00\n"
"PO-Revision-Date: 2018-0
5-29 16:26
+0
2
00\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
...
...
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit
2.0.6
\n"
"X-Generator: Poedit
1.8.7.1
\n"
#: admin.py:39
msgid "membership type"
...
...
@@ -54,11 +54,11 @@ msgstr "Adres"
msgid "Address line 2"
msgstr "Tweede adresregel"
#: admin.py:113 models.py:
199
#: admin.py:113 models.py:
217
msgid "Postal code"
msgstr "Postcode"
#: admin.py:113 models.py:2
05
#: admin.py:113 models.py:2
23
msgid "City"
msgstr "Woonplaats"
...
...
@@ -66,7 +66,7 @@ msgstr "Woonplaats"
msgid "Download address label for selected users"
msgstr "Download adreslabels voor geselecteerde gebruikers"
#: admin.py:131 models.py:1
62
#: admin.py:131 models.py:1
80
msgid "Student number"
msgstr "Studentnummer"
...
...
@@ -122,83 +122,83 @@ msgstr "Deze e-mail zal het gegenereerde wachtwoord bevatten"
msgid "Email address"
msgstr "E-mailadres"
#: models.py:1
07
#: models.py:1
25
msgid "Is this user currently active"
msgstr "Is deze user op dit moment actief"
#: models.py:1
41
#: models.py:1
59
msgid "Computing Science"
msgstr "Informatica"
#: models.py:1
42
#: models.py:1
60
msgid "Information Sciences"
msgstr "Informatiekunde"
#: models.py:1
56
templates/members/profile.html:44
#: models.py:1
74
templates/members/profile.html:44
msgid "Study programme"
msgstr "Studie"
#: models.py:1
66
#: models.py:1
84
msgid "Enter a valid student- or e/z/u-number."
msgstr "Voer een geldig student- of e/z/u-nummer in."
#: models.py:1
72
#: models.py:1
90
msgid "Starting year"
msgstr "Startjaar"
#: models.py:1
73
#: models.py:1
91
msgid "The year this member started studying."
msgstr "Het jaar waarop dit lid begon met studeren."
#: models.py:
184
#: models.py:
202
msgid "Include the house number"
msgstr "Inclusief huisnummer"
#: models.py:
186
#: models.py:
204
msgid "Street and house number"
msgstr "Straat en huisnummer"
#: models.py:
192
#: models.py:
210
msgid "Second address line"
msgstr "Tweede adresregel"
#: models.py:2
11
#: models.py:2
29
msgid "Phone number"
msgstr "Telefoonnummer"
#: models.py:2
12
#: models.py:2
30
msgid "Enter a phone number so Thalia may reach you"
msgstr "Voer een telefoonnummer in zodat Thalia je kan bereiken"
#: models.py:2
15
models.py:2
37
#: models.py:2
33
models.py:2
55
msgid "Please enter a valid phone number"
msgstr "Voer svp een geldig telefoonnummer in"
#: models.py:2
25
#: models.py:2
43
msgid "Emergency contact name"
msgstr "Contact voor noodgevallen"
#: models.py:2
26
#: models.py:2
44
msgid "Who should we contact in case of emergencies"
msgstr "Wie Thalia moet bereiken in bij noodgevallen"
#: models.py:2
33
#: models.py:2
51
msgid "Emergency contact phone number"
msgstr "Telefoonnummer noodcontact"
#: models.py:2
34
#: models.py:2
52
msgid "The phone number for the emergency contact"
msgstr "Het telefoonummer van de noodcontact"
#: models.py:2
4
6 templates/members/profile.html:52
#: models.py:26
4
templates/members/profile.html:52
msgid "Birthday"
msgstr "Verjaardag"
#: models.py:2
51
#: models.py:2
69
msgid "Display birthday"
msgstr "Laat verjaardag zien"
#: models.py:2
53
#: models.py:2
71
msgid ""
"Show your birthday to other members on your profile page and in the birthday "
"calendar"
...
...
@@ -206,107 +206,107 @@ msgstr ""
"Toon je verjaardag aan andere leden op je profielpagina en in de "
"verjaardagskalender"
#: models.py:2
60
templates/members/profile.html:48
#: models.py:2
78
templates/members/profile.html:48
msgid "Website"
msgstr "Website"
#: models.py:2
61
#: models.py:2
79
msgid "Website to display on your profile page"
msgstr "Website om op je profiel te linken"
#: models.py:2
67
#: models.py:2
85
msgid "Profile text"
msgstr "Profieltekst"
#: models.py:2
6
8
#: models.py:28
6
msgid "Text to display on your profile"
msgstr "Tekst om te laten zien op je profielpagina"
#: models.py:2
75
#: models.py:2
94
msgid "Initials"
msgstr "Initialen"
#: models.py:
282
#: models.py:
301
msgid "Nickname"
msgstr "Bijnaam"
#: models.py:
289
#: models.py:
308
msgid "How to display name"
msgstr "Weergave naam"
#: models.py:
290
#: models.py:
309
msgid "Show full name"
msgstr "Volledige naam"
#: models.py:
291
#: models.py:
310
msgid "Show only nickname"
msgstr "Alleen initialen"
#: models.py:
292
#: models.py:
311
msgid "Show only first name"
msgstr "Alleen voornaam"
#: models.py:
293
#: models.py:
312
msgid "Show initials and last name"
msgstr "Alleen initialen en achternaam"
#: models.py:
294
#: models.py:
313
msgid "Show name like \"John 'nickname' Doe\""
msgstr "Laat zien als \"John 'bijnaam' Doe\""
#: models.py:
295
#: models.py:
314
msgid "Show nickname and last name"
msgstr "Laat bijnaam en achternaam zien"
#: models.py:3
00
#: models.py:3
19
msgid "Photo"
msgstr "Foto"
#: models.py:3
08
#: models.py:3
27
msgid "Which events can this member attend"
msgstr "Welke evenementen mag dit lid bijwonen"
#: models.py:3
09
#: models.py:3
28
msgid "All events"
msgstr "Alle evenementen"
#: models.py:3
10
#: models.py:3
29
msgid "User may not attend events"
msgstr "Gebruiker mag niet naar evenementen"
#: models.py:3
11
#: models.py:3
30
msgid "User may not attend drinks"
msgstr "Gebruiker mag niet naar borrels"
#: models.py:31
2
#: models.py:3
3
1
msgid "User may not attend anything"
msgstr "Gebruiker mag nergens heen"
#: models.py:3
19
#: models.py:3
38
msgid "Preferred language"
msgstr "Voorkeurstaal"
#: models.py:3
20
#: models.py:3
39
msgid "Preferred language for e.g. newsletters"
msgstr "Voorkeurstaal voor b.v.b. nieuwsbrieven"
#: models.py:3
27
#: models.py:3
46
msgid "Receive opt-in mailings"
msgstr "Ontvang opt-in mailings"
#: models.py:3
28
#: models.py:3
47
msgid "Receive mailings about vacancies and events from Thalia's sponsors."
msgstr "Ontvang mailings over vacatures en evenementen van Thalia's sponsoren."
#: models.py:33
4
#: models.py:3
5
3
msgid "Receive newsletter"
msgstr "Ontvang nieuwsbrief"
#: models.py:3
3
5
#: models.py:35
4
msgid "Receive the Thalia Newsletter"
msgstr "Ontvang de Thalia nieuwsbrief"
#: models.py:3
42
#: models.py:3
61
msgid ""
"Yes, I want Thalia to take the membership fees from my bank account through "
"direct debit for each year."
...
...
@@ -314,81 +314,81 @@ msgstr ""
"Ja, ik wil dat Thalia verschuldigde lidmaatschapsgelden elk jaar van mijn "
"bankrekening afschrijft."
#: models.py:34
5
#: models.py:3
6
4
msgid "No, I will pay the contribution myself"
msgstr "Nee, ik zal de contributie zelf betalen"
#: models.py:3
4
6
#: models.py:36
5
msgid "Direct debit"
msgstr "Automatische afschijving"
#: models.py:3
47
#: models.py:3
66
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:3
53
#: models.py:3
72
msgid "Bank account"
msgstr "Bankrekening"
#: models.py:3
54
#: models.py:3
73
msgid "Bank account for direct debit"
msgstr "Bankrekening voor automatische afschrijving"
#: models.py:37
8
#: models.py:3
9
7
msgid "Display name"
msgstr "Weergavenaam"
#: models.py:4
07
#: models.py:4
26
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:41
2
#: models.py:4
3
1
msgid "A birthday cannot be in the future."
msgstr "Een verjaardag kan niet in de toekomst liggen."
#: models.py:4
5
1
#: models.py:4
8
1
msgid "Member"
msgstr "Lid"
#: models.py:4
5
2
#: models.py:4
8
2
msgid "Supporter"
msgstr "Begunstiger"
#: models.py:4
5
3
#: models.py:4
8
3
msgid "Honorary Member"
msgstr "Erelid"
#: models.py:4
5
8 templates/members/profile.html:37
#: models.py:4
8
8 templates/members/profile.html:37
msgid "Membership type"
msgstr "Lidtype"
#: models.py:4
6
4
#: models.py:4
9
4
msgid "User"
msgstr "Gebruiker"
#: models.py:4
6
8
#: models.py:4
9
8
msgid "Membership since"
msgstr "Lid sinds"
#: models.py:4
6
9
#: models.py:4
9
9
msgid "The date the member started holding this membership."
msgstr "De datum waarop het lid dit lidmaatschap is begonnen."
#: models.py:
47
4
#: models.py:
50
4
msgid "Membership until"
msgstr "Lid tot"
#: models.py:
47
5
#: models.py:
50
5
msgid "The date the member stops holding this membership."
msgstr "De datum waarop het lid dit lidmaatschap beëindigd."
#: models.py:
48
6
#: models.py:
51
6
msgid "End date can't be before start date"
msgstr "De einddatum kan niet eerder zijn dan de startdatum"
#: models.py:5
0
0 models.py:5
0
2
#: models.py:5
3
0 models.py:5
3
2
msgid "A membership already exists for that period"
msgstr "Er bestaat al een lidmaatschap voor deze periode"
...
...
@@ -421,36 +421,36 @@ msgstr "bekijk publieke profielpagina"
msgid "Take a look at your own profile."
msgstr "Bekijk je eigen profielpagina."
#: templates/members/account.html:2
5
#: templates/members/account.html:2
7
msgid "manage membership"
msgstr "lidmaatschap beheren"
#: templates/members/account.html:2
6
#: templates/members/account.html:2
8
msgid "Get information about your membership or renew it."
msgstr "Bekijk je lidmaatschap of vernieuw deze indien nodig."
#: templates/members/account.html:3
2
templates/members/edit_profile.html:5
#: templates/members/account.html:3
4
templates/members/edit_profile.html:5
#: templates/members/edit_profile.html:6 templates/members/edit_profile.html:9
msgid "edit profile"
msgstr "profiel bewerken"
#: templates/members/account.html:3
3
#: templates/members/account.html:3
5
msgid "Edit your profile and avatar."
msgstr "Bewerk je profiel en profielafbeelding."
#: templates/members/account.html:
39
#: templates/members/account.html:
41
msgid "change password"
msgstr "wachtwoord wijzigen"
#: templates/members/account.html:4
0
#: templates/members/account.html:4
2
msgid "Change your accounts' password."
msgstr "Wijzig het wachtwoord van je account."
#: templates/members/account.html:4
6
#: templates/members/account.html:4
8
msgid "logout"
msgstr "uitloggen"
#: templates/members/account.html:4
7
#: templates/members/account.html:4
9
msgid "Leave the restricted area of the website."
msgstr "Verlaat het beveiligde gedeelte van de website."
...
...
@@ -505,6 +505,10 @@ msgid ""
"you\n"
"to extend your membership.\n"
"\n"
"Note that if you upgrade your yearly membership to a study membership this "
"year,\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"
"\n"
"With kind regards,\n"
...
...
@@ -533,6 +537,10 @@ msgstr ""
"kun\n"
"je doen door langs de bestuurskamer te komen.\n"
"\n"
"Als je je jaarlidmaatschap dit jaar 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 "
"met\n"
"het bestuur om te bespreken wat een handig moment is. Mail hiervoor naar\n"
...
...
@@ -738,11 +746,11 @@ msgstr "Oud-leden"
msgid "No members found"
msgstr "Geen leden gevonden"
#: templates/members/index.html:6
7
templates/members/profile.html:40
#: templates/members/index.html:6
8
templates/members/profile.html:40
msgid "Cohort"
msgstr "Cohort"
#: templates/members/index.html:10
4
#: templates/members/index.html:10
6
msgid "Next"
msgstr "Volgende"
...
...
@@ -783,19 +791,19 @@ msgstr "Statistieken"
msgid "Total amount of Thalia members"
msgstr "Totaal aantal Thalialeden"
#: views.py:14
0
#: views.py:14
1
msgid "Unknown membership history"
msgstr "Onbekende lidmaatschap geschiedenis"
#: views.py:14
4
#: views.py:14
5
msgid "Former honorary member"
msgstr "Oud-erelid"
#: views.py:14
6
#: views.py:14
7
msgid "Former member"
msgstr "Oud-lid"
#: views.py:14
8
#: views.py:14
9
msgid "Former supporter"
msgstr "Oud-begunstiger"
...
...
website/members/templates/members/email/expiration_announcement.txt
View file @
5427cae9
...
...
@@ -9,6 +9,9 @@ then you'll have to renew it. This'll give you access to activities, the book sa
our exam collection and a symposium. Come by the board room and we'll help you
to extend your membership.
Note that if you upgrade your yearly membership to a study membership this year,
you will get a discount of €{{ membership_price }}.
Are you not able to come by? Then just send us an email: info@thalia.nu.
With kind regards,
...
...
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