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
ff3211a1
Commit
ff3211a1
authored
Sep 20, 2017
by
Bram in 't Zandt
Browse files
Users without a membership are now marked as Unknown
parent
6b5cb6f4
Changes
4
Hide whitespace changes
Inline
Side-by-side
website/members/locale/nl/LC_MESSAGES/django.mo
View file @
ff3211a1
No preview for this file type
website/members/locale/nl/LC_MESSAGES/django.po
View file @
ff3211a1
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-0
7-05 19:1
7+0200\n"
"PO-Revision-Date: 2017-0
7-05 19:23
+0200\n"
"POT-Creation-Date: 2017-0
9-18 10:5
7+0200\n"
"PO-Revision-Date: 2017-0
9-18 10:57
+0200\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.
2
\n"
"X-Generator: Poedit 2.0.
3
\n"
#: admin.py:36
msgid "membership type"
...
...
@@ -54,11 +54,11 @@ msgstr "Adres"
msgid "Address line 2"
msgstr "Tweede adresregel"
#: admin.py:122 models.py:15
2
#: admin.py:122 models.py:15
9
msgid "Postal code"
msgstr "Postcode"
#: admin.py:122 models.py:15
8
#: admin.py:122 models.py:1
6
5
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:140 models.py:7
6
#: admin.py:140 models.py:7
7
msgid "Student number"
msgstr "Studentnummer"
...
...
@@ -74,27 +74,27 @@ msgstr "Studentnummer"
msgid "Download student number label for selected users"
msgstr "Download studentnummers voor geselecteerde gebruikers"
#: emails.py:2
7
#: emails.py:2
8
msgid "Membership announcement"
msgstr "Mededeling over lidmaatschap"
#: emails.py:3
7
#: emails.py:3
8
msgid "Membership announcement sent"
msgstr "Mededeling over lidmaatschap verzonden"
#: emails.py:
59
#: emails.py:
60
msgid "Membership information check"
msgstr "Controle gegevens lidmaatschap"
#: emails.py:
69
#: emails.py:
70
msgid "Membership information check sent"
msgstr "Controle gegevens lidmaatschap verzonden"
#: emails.py:9
2
#: emails.py:9
4
msgid "Membership expiration announcement"
msgstr "Verlopen lidmaatschap"
#: emails.py:10
2
#: emails.py:10
4
msgid "Membership expiration announcement sent"
msgstr "Meldingen vervallen lidmaatschap verzonden"
...
...
@@ -110,83 +110,83 @@ msgstr "Deze e-mail zal het gegenereerde wachtwoord bevatten"
msgid "Welcome to Study Association Thalia"
msgstr "Welkom bij Studievereniging Thalia"
#: models.py:5
7
#: models.py:5
8
msgid "Computing Science"
msgstr "Informatica"
#: models.py:5
8
#: models.py:5
9
msgid "Information Sciences"
msgstr "Informatiekunde"
#: models.py:7
0
templates/members/profile.html:40
#: models.py:7
1
templates/members/profile.html:40
msgid "Study programme"
msgstr "Studie"
#: models.py:8
0
#: models.py:8
1
msgid "Enter a valid student- or e/z/u-number."
msgstr "Voer een geldig student- of e/z/u-nummer in."
#: models.py:8
6
#: models.py:8
7
msgid "Starting year"
msgstr "Startjaar"
#: models.py:8
7
#: models.py:8
8
msgid "The year this member started studying."
msgstr "Het jaar waarop dit lid begon met studeren."
#: models.py:1
2
3
#: models.py:13
0
msgid "Is this user currently active"
msgstr "Is deze user op dit moment actief"
#: models.py:1
37
#: models.py:1
44
msgid "Include the house number"
msgstr "Inclusief huisnummer"
#: models.py:1
39
#: models.py:1
46
msgid "Street and house number"
msgstr "Straat en huisnummer"
#: models.py:1
4
5
#: models.py:15
2
msgid "Second address line"
msgstr "Tweede adresregel"
#: models.py:1
64
#: models.py:1
71
msgid "Phone number"
msgstr "Telefoonnummer"
#: models.py:1
65
#: models.py:1
72
msgid "Enter a phone number so Thalia may reach you"
msgstr "Voer een telefoonnummer in zodat Thalia je kan bereiken"
#: models.py:1
68
models.py:19
0
#: models.py:1
75
models.py:19
7
msgid "Please enter a valid phone number"
msgstr "Voer svp een geldig telefoonnummer in"
#: models.py:1
7
8
#: models.py:18
5
msgid "Emergency contact name"
msgstr "Contact voor noodgevallen"
#: models.py:1
79
#: models.py:1
86
msgid "Who should we contact in case of emergencies"
msgstr "Wie Thalia moet bereiken in bij noodgevallen"
#: models.py:1
86
#: models.py:1
93
msgid "Emergency contact phone number"
msgstr "Telefoonnummer noodcontact"
#: models.py:1
87
#: models.py:1
94
msgid "The phone number for the emergency contact"
msgstr "Het telefoonummer van de noodcontact"
#: models.py:
199
templates/members/profile.html:47
#: models.py:
206
templates/members/profile.html:47
msgid "Birthday"
msgstr "Verjaardag"
#: models.py:2
04
#: models.py:2
11
msgid "Display birthday"
msgstr "Laat verjaardag zien"
#: models.py:2
06
#: models.py:2
13
msgid ""
"Show your birthday to other members on your profile page and in the birthday "
"calendar"
...
...
@@ -194,107 +194,107 @@ msgstr ""
"Toon je verjaardag aan andere leden op je profielpagina en in de "
"verjaardagskalender"
#: models.py:2
13
templates/members/profile.html:43
#: models.py:2
20
templates/members/profile.html:43
msgid "Website"
msgstr "Website"
#: models.py:21
4
#: models.py:2
2
1
msgid "Website to display on your profile page"
msgstr "Website om op je profiel te linken"
#: models.py:22
0
#: models.py:22
7
msgid "Profile text"
msgstr "Profieltekst"
#: models.py:22
1
#: models.py:22
8
msgid "Text to display on your profile"
msgstr "Tekst om te laten zien op je profielpagina"
#: models.py:2
28
#: models.py:2
35
msgid "Initials"
msgstr "Initialen"
#: models.py:2
35
#: models.py:2
42
msgid "Nickname"
msgstr "Bijnaam"
#: models.py:24
2
#: models.py:24
9
msgid "How to display name"
msgstr "Weergave naam"
#: models.py:2
43
#: models.py:2
50
msgid "Show full name"
msgstr "Volledige naam"
#: models.py:2
44
#: models.py:2
51
msgid "Show only nickname"
msgstr "Alleen initialen"
#: models.py:2
4
5
#: models.py:25
2
msgid "Show only first name"
msgstr "Alleen voornaam"
#: models.py:2
46
#: models.py:2
53
msgid "Show initials and last name"
msgstr "Alleen initialen en achternaam"
#: models.py:24
7
#: models.py:2
5
4
msgid "Show name like \"John 'nickname' Doe\""
msgstr "Laat zien als \"John 'bijnaam' Doe\""
#: models.py:2
48
#: models.py:2
55
msgid "Show nickname and last name"
msgstr "Laat bijnaam en achternaam zien"
#: models.py:2
53
#: models.py:2
60
msgid "Photo"
msgstr "Foto"
#: models.py:26
1
#: models.py:26
8
msgid "Which events can this member attend"
msgstr "Welke evenementen mag dit lid bijwonen"
#: models.py:26
2
#: models.py:26
9
msgid "All events"
msgstr "Alle evenementen"
#: models.py:2
63
#: models.py:2
70
msgid "User may not attend events"
msgstr "Gebruiker mag niet naar evenementen"
#: models.py:2
64
#: models.py:2
71
msgid "User may not attend drinks"
msgstr "Gebruiker mag niet naar borrels"
#: models.py:2
65
#: models.py:2
72
msgid "User may not attend anything"
msgstr "Gebruiker mag nergens heen"
#: models.py:2
77
#: models.py:2
84
msgid "Preferred language"
msgstr "Voorkeurstaal"
#: models.py:2
7
8
#: models.py:28
5
msgid "Preferred language for e.g. newsletters"
msgstr "Voorkeurstaal voor b.v.b. nieuwsbrieven"
#: models.py:2
85
#: models.py:2
92
msgid "Receive opt-in mailings"
msgstr "Ontvang opt-in mailings"
#: models.py:2
86
#: models.py:2
93
msgid "Receive mailings about vacancies and events from Thalia's sponsors."
msgstr "Ontvang mailings over vacatures en evenmenten van Thalia's sponsoren"
msgstr "Ontvang mailings over vacatures en even
e
menten van Thalia's sponsoren
.
"
#: models.py:29
2
#: models.py:29
9
msgid "Receive newsletter"
msgstr "Ontvang nieuwsbrief"
#: models.py:
293
#: models.py:
300
msgid "Receive the Thalia Newsletter"
msgstr "Ontvang de Thalia nieuwsbrief"
#: models.py:30
0
#: models.py:30
7
msgid ""
"Yes, I want Thalia to take the membership fees from my bank account through "
"direct debit for each year."
...
...
@@ -302,75 +302,75 @@ msgstr ""
"Ja, ik wil dat Thalia verschuldigde lidmaatschapsgelden elk jaar van mijn "
"bankrekening afschrijft."
#: models.py:30
3
#: models.py:3
1
0
msgid "No, I will pay the contribution myself"
msgstr "Nee, ik zal de contributie zelf betalen"
#: models.py:3
04
#: models.py:3
11
msgid "Direct debit"
msgstr "Automatische afschijving"
#: models.py:3
05
#: models.py:3
12
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:31
1
#: models.py:31
8
msgid "Bank account"
msgstr "Bankrekening"
#: models.py:31
2
#: models.py:31
9
msgid "Bank account for direct debit"
msgstr "Bankrekening voor automatische afschrijving"
#: models.py:3
39
#: models.py:3
46
msgid "Display name"
msgstr "Weergavenaam"
#: models.py:3
75
#: models.py:3
82
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:3
86
#: models.py:3
93
msgid "Member"
msgstr "Lid"
#: models.py:3
87
#: models.py:3
94
msgid "Supporter"
msgstr "Begunstiger"
#: models.py:3
88
#: models.py:3
95
msgid "Honorary Member"
msgstr "Erelid"
#: models.py:
393
templates/members/profile.html:37
#: models.py:
400
templates/members/profile.html:37
msgid "Membership type"
msgstr "Lidtype"
#: models.py:40
2
#: models.py:40
9
msgid "User"
msgstr "Gebruiker"
#: models.py:4
06
#: models.py:4
13
msgid "Membership since"
msgstr "Lid sinds"
#: models.py:4
07
#: models.py:4
14
msgid "The date the member started holding this membership."
msgstr "De datum waarop het lid dit lidmaatschap is begonnen."
#: models.py:41
2
#: models.py:41
9
msgid "Membership until"
msgstr "Lid tot"
#: models.py:4
13
#: models.py:4
20
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 ""
msgstr "
Exporteer IBANs voor automatische incasso
"
#: templates/members/account.html:6 templates/members/account.html:7
#: templates/members/edit_profile.html:5 templates/members/edit_profile.html:6
...
...
@@ -674,7 +674,7 @@ msgstr "Ere-leden"
#: templates/members/index.html:41
msgid "Former Members"
msgstr "
Ex
-leden"
msgstr "
Oud
-leden"
#: templates/members/index.html:47
msgid "No members found"
...
...
@@ -725,6 +725,21 @@ msgstr "Statistieken"
msgid "Total amount of Thalia members"
msgstr "Totaal aantal Thalialeden"
#: views.py:109
#: views.py:125
msgid "Unknown membership history"
msgstr "Onbekende lidmaatschap geschiedenis"
#: views.py:129
msgid "Former honorary member"
msgstr "Oud-erelid"
#: views.py:131
msgid "Former member"
msgstr "Oud-lid"
#: views.py:133
msgid "Former supporter"
msgstr "Oud-begunstiger"
#~ msgid "Former "
#~ msgstr "Oud-"
website/members/models.py
View file @
ff3211a1
...
...
@@ -113,6 +113,12 @@ class Member(models.Model):
def
membership_set
(
self
):
return
self
.
user
.
membership_set
def
has_been_member
(
self
):
return
self
.
membership_set
.
filter
(
type
=
'member'
).
count
()
>
0
def
has_been_honorary_member
(
self
):
return
self
.
membership_set
.
filter
(
type
=
'honorary'
).
count
()
>
0
def
is_active
(
self
):
"""Is this member currently active
...
...
website/members/views.py
View file @
ff3211a1
...
...
@@ -122,9 +122,16 @@ def profile(request, pk=None):
achievements
=
member_achievements
(
member
)
membership
=
member
.
current_membership
membership_type
=
_
(
"
Former member
"
)
membership_type
=
_
(
"
Unknown membership history
"
)
if
membership
:
membership_type
=
membership
.
get_type_display
()
elif
member
.
has_been_honorary_member
():
membership_type
=
_
(
"Former honorary member"
)
elif
member
.
has_been_member
():
membership_type
=
_
(
"Former member"
)
elif
member
.
latest_membership
:
membership_type
=
_
(
"Former supporter"
)
return
render
(
request
,
'members/profile.html'
,
{
'achievements'
:
achievements
,
...
...
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