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
4f502b40
Verified
Commit
4f502b40
authored
Jun 09, 2017
by
Sébastiaan Versteeg
Browse files
Add email and translations
parent
dad31b53
Changes
8
Hide whitespace changes
Inline
Side-by-side
website/members/emails.py
View file @
4f502b40
...
...
@@ -46,24 +46,26 @@ def send_information_request(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/information_request.txt'
,
{
'name'
:
member
.
get_full_name
()})
mail
.
EmailMessage
(
_
(
'Membership 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/information_check.txt'
,
{
'name'
:
member
.
get_full_name
(),
'member'
:
member
})
mail
.
EmailMessage
(
_
(
'Membership information check'
),
email_body
,
settings
.
WEBSITE_FROM_ADDRESS
,
[
member
.
user
.
email
],
bcc
=
[
settings
.
BOARD_NOTIFICATION_ADDRESS
],
connection
=
connection
).
send
()
if
not
dry_run
:
mail
.
mail_managers
(
_
(
'Membership
announcement
sent'
),
_
(
'Membership
information check
sent'
),
loader
.
render_to_string
(
'members/email/information_
request
_notification.txt'
,
'members/email/information_
check
_notification.txt'
,
{
'members'
:
members
}),
connection
=
connection
,
)
website/members/locale/nl/LC_MESSAGES/django.mo
View file @
4f502b40
No preview for this file type
website/members/locale/nl/LC_MESSAGES/django.po
View file @
4f502b40
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-1
4 21
:2
1
+0200\n"
"PO-Revision-Date: 2017-06-1
4 21
:2
2
+0200\n"
"POT-Creation-Date: 2017-06-1
5 12
:2
0
+0200\n"
"PO-Revision-Date: 2017-06-1
5 12
:2
0
+0200\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
...
...
@@ -38,39 +38,39 @@ msgstr "< 18"
msgid "Unknown"
msgstr "Onbekend"
#: admin.py:12
0
admin.py:1
39
#: admin.py:12
1
admin.py:1
40
msgid "First name"
msgstr "Voornaam"
#: admin.py:12
0
admin.py:1
39
#: admin.py:12
1
admin.py:1
40
msgid "Last name"
msgstr "Achternaam"
#: admin.py:12
0
#: admin.py:12
1
msgid "Address"
msgstr "Adres"
#: admin.py:12
1
#: admin.py:12
2
msgid "Address line 2"
msgstr "Tweede adresregel"
#: admin.py:12
1
models.py:152
#: admin.py:12
2
models.py:152
msgid "Postal code"
msgstr "Postcode"
#: admin.py:12
1
models.py:158
#: admin.py:12
2
models.py:158
msgid "City"
msgstr "Woonplaats"
#: admin.py:13
1
#: admin.py:13
2
msgid "Download address label for selected users"
msgstr "Download adreslabels voor geselecteerde gebruikers"
#: admin.py:1
39
models.py:76
#: admin.py:1
40
models.py:76
msgid "Student number"
msgstr "Studentnummer"
#: admin.py:14
6
#: admin.py:14
7
msgid "Download student number label for selected users"
msgstr "Download studentnummers voor geselecteerde gebruikers"
...
...
@@ -82,6 +82,14 @@ msgstr "Mededeling over lidmaatschap"
msgid "Membership announcement sent"
msgstr "Mededeling over lidmaatschap verzonden"
#: emails.py:55
msgid "Membership information check"
msgstr "Controle gegevens lidmaatschap"
#: emails.py:65
msgid "Membership information check sent"
msgstr "Controle gegevens lidmaatschap verzonden"
#: forms.py:42
msgid "Send welcome email"
msgstr "Stuur welkomste-mails"
...
...
@@ -352,6 +360,10 @@ msgstr "Lid tot"
msgid "The date the member stops holding this membership."
msgstr "De datum waarop het lid dit lidmaatschap beëindigd."
#: templates/admin/members/change_list.html:6
msgid "Export IBANs for Direct Debit"
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
...
...
@@ -434,6 +446,72 @@ msgstr ""
msgid "save"
msgstr "opslaan"
#: templates/members/email/information_check.txt:1
#, python-format
msgid ""
"Dear %(name)s,\n"
"\n"
"We currently have the following information about you in our database.\n"
"Via this email we'd like to ask you to check the accuracy of this data.\n"
"\n"
"Username: %(member.user.username)s\n"
"Name: %(member.get_full_name)s\n"
"Address: %(member.address_street)s\n"
" %(member.address_street2)s\n"
" %(member.address_postal_code)s\n"
" %(member.address_city)s\n"
"Phone: %(member.phone_number)s\n"
"Date of birth: %(member.birthday)s\n"
"Email address: %(member.user.email)s\n"
"Student number: %(member.student_number)s\n"
"Cohort: %(member.starting_year)s\n"
"Programme: %(member.programme)s\n"
"\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."
"nu.\n"
"\n"
"With kind regards,\n"
"\n"
"The board of Study Association Thalia\n"
"\n"
"————\n"
"\n"
"This email was automatically generated."
msgstr ""
"Beste %(name)s,\n"
"\n"
"Hieronder vind je de (meeste) gegevens die we op dit moment van je "
"geregistreerd\n"
"hebben. Wil je deze controleren op juistheid?\n"
"\n"
"Gebruikersnaam: %(member.user.username)s\n"
"Naam: %(member.get_full_name)s\n"
"Adres: %(member.address_street)s\n"
" %(member.address_street2)s\n"
" %(member.address_postal_code)s\n"
" %(member.address_city)s\n"
"Telefoonnummer: %(member.phone_number)s\n"
"Geboortedatum: %(member.birthday)s\n"
"Emailadres: %(member.user.email)s\n"
"Studentnummer: %(member.student_number)s\n"
"Cohort: %(member.starting_year)s\n"
"Programma: %(member.programme)s\n"
"\n"
"Je kunt als je ingelogd bent via ‘Mijn gegevens’ de meeste van deze "
"gegevens\n"
"aanpassen. Klopt iets niet wat je niet zelf kunt bewerken? Stuur dan een "
"mailtje\n"
"naar info@thalia.nu.\n"
"\n"
"Met vriendelijke groet,\n"
"Het bestuur der Studievereniging Thalia\n"
"\n"
"————\n"
"\n"
"Deze e-mail is automatisch gegenereerd."
#: templates/members/email/membership_announcement.txt:1
#, python-format
msgid ""
...
...
@@ -575,6 +653,6 @@ msgstr "Statistieken"
msgid "Total amount of Thalia members"
msgstr "Totaal aantal Thalialeden"
#: views.py:10
5
#: views.py:10
8
msgid "Former member"
msgstr "Oud-lid"
website/members/management/commands/sendinformationcheck.py
0 → 100644
View file @
4f502b40
from
django.core.management.base
import
BaseCommand
from
members
import
emails
class
Command
(
BaseCommand
):
def
add_arguments
(
self
,
parser
):
parser
.
add_argument
(
'--dry-run'
,
action
=
'store_true'
,
dest
=
'dry-run'
,
default
=
False
,
help
=
'Dry run instead of sending e-mail'
,
)
def
handle
(
self
,
*
args
,
**
options
):
emails
.
send_information_request
(
bool
(
options
[
'dry-run'
]))
website/members/templates/members/email/information_check.txt
0 → 100644
View file @
4f502b40
{% load i18n %}{% blocktrans %}Dear {{ name }},
We currently have the following information about you in our database.
Via this email we'd like to ask you to check the accuracy of this data.
Username: {{ member.user.username }}
Name: {{ member.get_full_name }}
Address: {{ member.address_street }}
{{ member.address_street2 }}
{{ member.address_postal_code }}
{{ member.address_city }}
Phone: {{ member.phone_number }}
Date of birth: {{ member.birthday }}
Email address: {{ member.user.email }}
Student number: {{ member.student_number }}
Cohort: {{ member.starting_year }}
Programme: {{ member.programme }}
You can change this data by logging into the website and using the 'edit profile' page.
Unable to edit the incorrect information? Then send an email: info@thaliagit.nu.
With kind regards,
The board of Study Association Thalia
————
This email was automatically generated.{% endblocktrans %}
website/members/templates/members/email/information_check_notification.txt
0 → 100644
View file @
4f502b40
Dear board,
It's that time of the year again! The website sent an automatic email to all members.
That email asks them to check their information we currently have in our database.
This means that you can expect an influx of emails from members.
The email was sent to:
{% for member in members %}
* {{ member.full_name }}
{% endfor %}
Kisses,
The website
website/members/templates/members/email/information_request.txt
deleted
100644 → 0
View file @
dad31b53
website/members/templates/members/email/information_request_notification.txt
deleted
100644 → 0
View file @
dad31b53
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