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
3fff0ae1
Commit
3fff0ae1
authored
Oct 18, 2017
by
Jim Driessen
Browse files
Do not check the length of the IBAN field, but instead only check if it's empty.
parent
ddc60dd8
Changes
4
Hide whitespace changes
Inline
Side-by-side
website/members/admin.py
View file @
3fff0ae1
...
...
@@ -31,7 +31,7 @@ class ProfileInline(admin.StackedInline):
'emergency_contact_phone_number'
,
'language'
,
'event_permissions'
)
model
=
models
.
Profile
form
=
forms
.
Member
Form
form
=
forms
.
Profile
Form
can_delete
=
False
...
...
website/members/forms.py
View file @
3fff0ae1
...
...
@@ -24,12 +24,15 @@ class ProfileForm(forms.ModelForm):
model
=
Profile
def
clean
(
self
):
super
().
clean
()
errors
=
{}
direct_debit_authorized
=
self
.
cleaned_data
\
.
get
(
'direct_debit_authorized'
)
bank_account
=
self
.
cleaned_data
.
get
(
'bank_account'
)
if
direct_debit_authorized
and
len
(
bank_account
)
<
16
:
raise
forms
.
ValidationError
(
_
(
'Bank account is incorrect'
))
super
().
clean
()
if
direct_debit_authorized
and
not
bank_account
:
errors
.
update
({
'bank_account'
:
_
(
'Please enter a bank account'
)})
raise
forms
.
ValidationError
(
errors
)
class
UserCreationForm
(
BaseUserCreationForm
):
...
...
website/members/locale/nl/LC_MESSAGES/django.mo
View file @
3fff0ae1
No preview for this file type
website/members/locale/nl/LC_MESSAGES/django.po
View file @
3fff0ae1
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-1
3 16:0
1+0200\n"
"PO-Revision-Date: 2017-
09-20
21:
10
+0200\n"
"POT-Creation-Date: 2017-10-1
8 21:3
1+0200\n"
"PO-Revision-Date: 2017-
10-18
21:
32
+0200\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
...
...
@@ -16,61 +16,61 @@ 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.
3
\n"
"X-Generator: Poedit 2.0.
4
\n"
#: admin.py:3
8
#: admin.py:3
9
msgid "membership type"
msgstr "lidtype"
#: admin.py:5
6
#: admin.py:5
7
msgid "Age"
msgstr "Leeftijd"
#: admin.py:6
1
#: admin.py:6
2
msgid "≥ 18"
msgstr "≥ 18"
#: admin.py:6
2
#: admin.py:6
3
msgid "< 18"
msgstr "< 18"
#: admin.py:6
3
#: admin.py:6
4
msgid "Unknown"
msgstr "Onbekend"
#: admin.py:11
1
admin.py:13
0
#: admin.py:11
2
admin.py:13
1
msgid "First name"
msgstr "Voornaam"
#: admin.py:11
1
admin.py:13
0
#: admin.py:11
2
admin.py:13
1
msgid "Last name"
msgstr "Achternaam"
#: admin.py:11
1
#: admin.py:11
2
msgid "Address"
msgstr "Adres"
#: admin.py:11
2
#: admin.py:11
3
msgid "Address line 2"
msgstr "Tweede adresregel"
#: admin.py:11
2
models.py:
189
#: admin.py:11
3
models.py:
202
msgid "Postal code"
msgstr "Postcode"
#: admin.py:11
2
models.py:
195
#: admin.py:11
3
models.py:
208
msgid "City"
msgstr "Woonplaats"
#: admin.py:12
2
#: admin.py:12
3
msgid "Download address label for selected users"
msgstr "Download adreslabels voor geselecteerde gebruikers"
#: admin.py:13
0
models.py:15
2
#: admin.py:13
1
models.py:1
6
5
msgid "Student number"
msgstr "Studentnummer"
#: admin.py:13
7
#: admin.py:13
8
msgid "Download student number label for selected users"
msgstr "Download studentnummers voor geselecteerde gebruikers"
...
...
@@ -98,95 +98,99 @@ msgstr "Verlopen lidmaatschap"
msgid "Membership expiration announcement sent"
msgstr "Meldingen vervallen lidmaatschap verzonden"
#: forms.py:42
#: forms.py:33
msgid "Please enter a bank account"
msgstr "Voer een bankrekening in"
#: forms.py:53
msgid "Send welcome email"
msgstr "Stuur welkomste-mails"
#: forms.py:4
3
#: forms.py:
5
4
msgid "This email will include the generated password"
msgstr "Deze e-mail zal het gegenereerde wachtwoord bevatten"
#: forms.py:
75
#: forms.py:
86
msgid "Welcome to Study Association Thalia"
msgstr "Welkom bij Studievereniging Thalia"
#: models.py:
99
#: models.py:
110
msgid "Is this user currently active"
msgstr "Is deze user op dit moment actief"
#: models.py:1
33
#: models.py:1
44
msgid "Computing Science"
msgstr "Informatica"
#: models.py:1
3
4
#: models.py:14
5
msgid "Information Sciences"
msgstr "Informatiekunde"
#: models.py:1
46
templates/members/profile.html:40
#: models.py:1
59
templates/members/profile.html:40
msgid "Study programme"
msgstr "Studie"
#: models.py:1
5
6
#: models.py:16
9
msgid "Enter a valid student- or e/z/u-number."
msgstr "Voer een geldig student- of e/z/u-nummer in."
#: models.py:1
62
#: models.py:1
75
msgid "Starting year"
msgstr "Startjaar"
#: models.py:16
3
#: models.py:1
7
6
msgid "The year this member started studying."
msgstr "Het jaar waarop dit lid begon met studeren."
#: models.py:17
4
#: models.py:1
8
7
msgid "Include the house number"
msgstr "Inclusief huisnummer"
#: models.py:1
76
#: models.py:1
89
msgid "Street and house number"
msgstr "Straat en huisnummer"
#: models.py:1
82
#: models.py:1
95
msgid "Second address line"
msgstr "Tweede adresregel"
#: models.py:2
0
1
#: models.py:21
4
msgid "Phone number"
msgstr "Telefoonnummer"
#: models.py:2
02
#: models.py:2
15
msgid "Enter a phone number so Thalia may reach you"
msgstr "Voer een telefoonnummer in zodat Thalia je kan bereiken"
#: models.py:2
05
models.py:2
27
#: models.py:2
18
models.py:2
40
msgid "Please enter a valid phone number"
msgstr "Voer svp een geldig telefoonnummer in"
#: models.py:2
15
#: models.py:2
28
msgid "Emergency contact name"
msgstr "Contact voor noodgevallen"
#: models.py:2
16
#: models.py:2
29
msgid "Who should we contact in case of emergencies"
msgstr "Wie Thalia moet bereiken in bij noodgevallen"
#: models.py:2
2
3
#: models.py:23
6
msgid "Emergency contact phone number"
msgstr "Telefoonnummer noodcontact"
#: models.py:2
24
#: models.py:2
37
msgid "The phone number for the emergency contact"
msgstr "Het telefoonummer van de noodcontact"
#: models.py:2
36
templates/members/profile.html:47
#: models.py:2
49
templates/members/profile.html:47
msgid "Birthday"
msgstr "Verjaardag"
#: models.py:24
1
#: models.py:2
5
4
msgid "Display birthday"
msgstr "Laat verjaardag zien"
#: models.py:2
43
#: models.py:2
56
msgid ""
"Show your birthday to other members on your profile page and in the birthday "
"calendar"
...
...
@@ -194,107 +198,107 @@ msgstr ""
"Toon je verjaardag aan andere leden op je profielpagina en in de "
"verjaardagskalender"
#: models.py:2
50
templates/members/profile.html:43
#: models.py:2
63
templates/members/profile.html:43
msgid "Website"
msgstr "Website"
#: models.py:2
51
#: models.py:2
64
msgid "Website to display on your profile page"
msgstr "Website om op je profiel te linken"
#: models.py:2
5
7
#: models.py:27
0
msgid "Profile text"
msgstr "Profieltekst"
#: models.py:2
58
#: models.py:2
71
msgid "Text to display on your profile"
msgstr "Tekst om te laten zien op je profielpagina"
#: models.py:2
65
#: models.py:2
78
msgid "Initials"
msgstr "Initialen"
#: models.py:2
72
#: models.py:2
85
msgid "Nickname"
msgstr "Bijnaam"
#: models.py:2
7
9
#: models.py:29
2
msgid "How to display name"
msgstr "Weergave naam"
#: models.py:2
80
#: models.py:2
93
msgid "Show full name"
msgstr "Volledige naam"
#: models.py:2
81
#: models.py:2
94
msgid "Show only nickname"
msgstr "Alleen initialen"
#: models.py:2
82
#: models.py:2
95
msgid "Show only first name"
msgstr "Alleen voornaam"
#: models.py:2
83
#: models.py:2
96
msgid "Show initials and last name"
msgstr "Alleen initialen en achternaam"
#: models.py:2
84
#: models.py:2
97
msgid "Show name like \"John 'nickname' Doe\""
msgstr "Laat zien als \"John 'bijnaam' Doe\""
#: models.py:28
5
#: models.py:2
9
8
msgid "Show nickname and last name"
msgstr "Laat bijnaam en achternaam zien"
#: models.py:
290
#: models.py:
303
msgid "Photo"
msgstr "Foto"
#: models.py:
298
#: models.py:
311
msgid "Which events can this member attend"
msgstr "Welke evenementen mag dit lid bijwonen"
#: models.py:
299
#: models.py:
312
msgid "All events"
msgstr "Alle evenementen"
#: models.py:3
00
#: models.py:3
13
msgid "User may not attend events"
msgstr "Gebruiker mag niet naar evenementen"
#: models.py:3
0
1
#: models.py:31
4
msgid "User may not attend drinks"
msgstr "Gebruiker mag niet naar borrels"
#: models.py:3
02
#: models.py:3
15
msgid "User may not attend anything"
msgstr "Gebruiker mag nergens heen"
#: models.py:3
09
#: models.py:3
22
msgid "Preferred language"
msgstr "Voorkeurstaal"
#: models.py:3
10
#: models.py:3
23
msgid "Preferred language for e.g. newsletters"
msgstr "Voorkeurstaal voor b.v.b. nieuwsbrieven"
#: models.py:3
17
#: models.py:3
30
msgid "Receive opt-in mailings"
msgstr "Ontvang opt-in mailings"
#: models.py:31
8
#: models.py:3
3
1
msgid "Receive mailings about vacancies and events from Thalia's sponsors."
msgstr "Ontvang mailings over vacatures en evenementen van Thalia's sponsoren."
#: models.py:3
24
#: models.py:3
37
msgid "Receive newsletter"
msgstr "Ontvang nieuwsbrief"
#: models.py:3
25
#: models.py:3
38
msgid "Receive the Thalia Newsletter"
msgstr "Ontvang de Thalia nieuwsbrief"
#: models.py:3
32
#: models.py:3
45
msgid ""
"Yes, I want Thalia to take the membership fees from my bank account through "
"direct debit for each year."
...
...
@@ -302,69 +306,69 @@ msgstr ""
"Ja, ik wil dat Thalia verschuldigde lidmaatschapsgelden elk jaar van mijn "
"bankrekening afschrijft."
#: models.py:3
35
#: models.py:3
48
msgid "No, I will pay the contribution myself"
msgstr "Nee, ik zal de contributie zelf betalen"
#: models.py:3
36
#: models.py:3
49
msgid "Direct debit"
msgstr "Automatische afschijving"
#: models.py:3
37
#: models.py:3
50
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
43
#: models.py:3
56
msgid "Bank account"
msgstr "Bankrekening"
#: models.py:3
44
#: models.py:3
57
msgid "Bank account for direct debit"
msgstr "Bankrekening voor automatische afschrijving"
#: models.py:3
7
1
#: models.py:3
8
1
msgid "Display name"
msgstr "Weergavenaam"
#: models.py:
396
#: models.py:
410
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:4
07
#: models.py:4
44
msgid "Member"
msgstr "Lid"
#: models.py:4
08
#: models.py:4
45
msgid "Supporter"
msgstr "Begunstiger"
#: models.py:4
09
#: models.py:4
46
msgid "Honorary Member"
msgstr "Erelid"
#: models.py:41
4
templates/members/profile.html:37
#: models.py:4
5
1 templates/members/profile.html:37
msgid "Membership type"
msgstr "Lidtype"
#: models.py:4
23
#: models.py:4
59
msgid "User"
msgstr "Gebruiker"
#: models.py:4
27
#: models.py:4
63
msgid "Membership since"
msgstr "Lid sinds"
#: models.py:4
28
#: models.py:4
64
msgid "The date the member started holding this membership."
msgstr "De datum waarop het lid dit lidmaatschap is begonnen."
#: models.py:4
33
#: models.py:4
69
msgid "Membership until"
msgstr "Lid tot"
#: models.py:4
34
#: models.py:4
70
msgid "The date the member stops holding this membership."
msgstr "De datum waarop het lid dit lidmaatschap beëindigd."
...
...
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