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
313f2133
Verified
Commit
313f2133
authored
Feb 25, 2017
by
Sébastiaan Versteeg
Browse files
Make sure the user creation form matches the field order of the paper form
parent
08580021
Changes
5
Hide whitespace changes
Inline
Side-by-side
website/members/admin.py
View file @
313f2133
...
...
@@ -21,6 +21,15 @@ class MembershipInline(admin.StackedInline):
class
MemberInline
(
admin
.
StackedInline
):
fields
=
(
'starting_year'
,
'programme'
,
'address_street'
,
'address_street2'
,
'address_postal_code'
,
'address_city'
,
'student_number'
,
'phone_number'
,
'receive_optin'
,
'receive_newsletter'
,
'birthday'
,
'show_birthday'
,
'direct_debit_authorized'
,
'bank_account'
,
'initials'
,
'nickname'
,
'display_name_preference'
,
'profile_description'
,
'website'
,
'photo'
,
'emergency_contact'
,
'emergency_contact_phone_number'
,
'language'
,
'event_permissions'
)
model
=
models
.
Member
can_delete
=
False
...
...
website/members/locale/nl/LC_MESSAGES/django.mo
View file @
313f2133
No preview for this file type
website/members/locale/nl/LC_MESSAGES/django.po
View file @
313f2133
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 201
6-12-19 21:27
+0100\n"
"PO-Revision-Date: 201
6-12-19 21:28
+0100\n"
"POT-Creation-Date: 201
7-02-25 19:31
+0100\n"
"PO-Revision-Date: 201
7-02-25 19:35
+0100\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
...
...
@@ -16,129 +16,133 @@ 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 1.8.1
1
\n"
"X-Generator: Poedit 1.8.1
2
\n"
#: admin.py:
29
#:
members/
admin.py:
30
msgid "membership type"
msgstr "lidtype"
#: admin.py:5
2
#:
members/
admin.py:5
3
msgid "Age"
msgstr "Leeftijd"
#: admin.py:5
7
#:
members/
admin.py:5
8
msgid "≥ 18"
msgstr "≥ 18"
#: admin.py:5
8
#:
members/
admin.py:5
9
msgid "< 18"
msgstr "< 18"
#: admin.py:
59
#:
members/
admin.py:
60
msgid "Unknown"
msgstr "Onbekend"
#: admin.py:12
7
#:
members/
admin.py:12
8
msgid "Download address label for selected users"
msgstr "Download adreslabels voor geselecteerde gebruikers"
#: forms.py:35
#:
members/
forms.py:35
msgid "Send welcome email"
msgstr "Stuur welkomste-mails"
#: forms.py:36
#:
members/
forms.py:36
msgid "This email will include the generated password"
msgstr "Deze e-mail zal het gegenereerde wachtwoord bevatten"
#: forms.py:
59
#:
members/
forms.py:
60
msgid "Welcome to Study Association Thalia"
msgstr "Welkom bij Studievereniging Thalia"
#: models.py:5
5
#:
members/
models.py:5
6
msgid "Computing Science"
msgstr "Informatica"
#: models.py:5
6
#:
members/
models.py:5
7
msgid "Information Sciences"
msgstr "Informatiekunde"
#: models.py:6
8
templates/members/profile.html:38
#:
members/
models.py:6
9 members/
templates/members/profile.html:38
msgid "Study programme"
msgstr "Studie"
#: models.py:77
#: members/models.py:75
msgid "Student number"
msgstr "Studentnummer"
#: members/models.py:79
msgid "Enter a valid student- or e/z/u-number."
msgstr "Voer een geldig student- of e/z/u-nummer in."
#: models.py:8
3
#:
members/
models.py:8
5
msgid "Starting year"
msgstr "
Eerste lidmaatschaps
jaar"
msgstr "
Start
jaar"
#: models.py:8
4
#:
members/
models.py:8
6
msgid "The year this member started studying."
msgstr "Het jaar waarop dit lid begon met studeren."
#: models.py:12
0
#:
members/
models.py:12
2
msgid "Is this user currently active"
msgstr "Is deze user op dit moment actief"
#: models.py:13
4
#:
members/
models.py:13
6
msgid "Include the house number"
msgstr "Inclusief huisnummer"
#: models.py:13
6
#:
members/
models.py:13
8
msgid "Street and house number"
msgstr "Straat en huisnummer"
#: models.py:14
2
#:
members/
models.py:14
4
msgid "Second address line"
msgstr "Tweede adresregel"
#: models.py:1
49
#:
members/
models.py:1
51
msgid "Postal code"
msgstr "Postcode"
#: models.py:15
5
#:
members/
models.py:15
7
msgid "City"
msgstr "Woonplaats"
#: models.py:16
1
#:
members/
models.py:16
3
msgid "Phone number"
msgstr "Telefoonnummer"
#: models.py:16
2
#:
members/
models.py:16
4
msgid "Enter a phone number so Thalia may reach you"
msgstr "Voer een telefoonnummer in zodat Thalia je kan bereiken"
#: models.py:16
5
models.py:18
7
#:
members/
models.py:16
7
members/
models.py:18
9
msgid "Please enter a valid phone number"
msgstr "Voer svp een geldig telefoonnummer in"
#: models.py:17
5
#:
members/
models.py:17
7
msgid "Emergency contact name"
msgstr "Contact voor noodgevallen"
#: models.py:17
6
#:
members/
models.py:17
8
msgid "Who should we contact in case of emergencies"
msgstr "Wie Thalia moet bereiken in bij noodgevallen"
#: models.py:18
3
#:
members/
models.py:18
5
msgid "Emergency contact phone number"
msgstr "Telefoonnummer noodcontact"
#: models.py:18
4
#:
members/
models.py:18
6
msgid "The phone number for the emergency contact"
msgstr "Het telefoonummer van de noodcontact"
#: models.py:19
6
templates/members/profile.html:45
#:
members/
models.py:19
8 members/
templates/members/profile.html:45
msgid "Birthday"
msgstr "Verjaardag"
#: models.py:20
1
#:
members/
models.py:20
3
msgid "Display birthday"
msgstr "Laat verjaardag zien"
#: models.py:20
3
#:
members/
models.py:20
5
msgid ""
"Show your birthday to other members on your profile page and in the birthday "
"calendar"
...
...
@@ -146,107 +150,107 @@ msgstr ""
"Toon je verjaardag aan andere leden op je profielpagina en in de "
"verjaardagskalender"
#: models.py:21
0
templates/members/profile.html:41
#:
members/
models.py:21
2 members/
templates/members/profile.html:41
msgid "Website"
msgstr "Website"
#: models.py:21
1
#:
members/
models.py:21
3
msgid "Website to display on your profile page"
msgstr "Website om op je profiel te linken"
#: models.py:21
7
#:
members/
models.py:21
9
msgid "Profile text"
msgstr "Profieltekst"
#: models.py:2
18
#:
members/
models.py:2
20
msgid "Text to display on your profile"
msgstr "Tekst om te laten zien op je profielpagina"
#: models.py:22
5
#:
members/
models.py:22
7
msgid "Initials"
msgstr "Initialen"
#: models.py:23
2
#:
members/
models.py:23
4
msgid "Nickname"
msgstr "Bijnaam"
#: models.py:2
39
#:
members/
models.py:2
41
msgid "How to display name"
msgstr "Weergave naam"
#: models.py:24
0
#:
members/
models.py:24
2
msgid "Show full name"
msgstr "Volledige naam"
#: models.py:24
1
#:
members/
models.py:24
3
msgid "Show only nickname"
msgstr "Alleen initialen"
#: models.py:24
2
#:
members/
models.py:24
4
msgid "Show only first name"
msgstr "Alleen voornaam"
#: models.py:24
3
#:
members/
models.py:24
5
msgid "Show initials and last name"
msgstr "Alleen initialen en achternaam"
#: models.py:24
4
#:
members/
models.py:24
6
msgid "Show name like \"John 'nickname' Doe\""
msgstr "Laat zien als \"John 'bijnaam' Doe\""
#: models.py:24
5
#:
members/
models.py:24
7
msgid "Show nickname and last name"
msgstr "Laat bijnaam en achternaam zien"
#: models.py:25
0
#:
members/
models.py:25
2
msgid "Photo"
msgstr "Foto"
#: models.py:2
58
#:
members/
models.py:2
60
msgid "Which events can this member attend"
msgstr "Welke evenementen mag dit lid bijwonen"
#: models.py:2
59
#:
members/
models.py:2
61
msgid "All events"
msgstr "Alle evenementen"
#: models.py:26
0
#:
members/
models.py:26
2
msgid "User may not attend events"
msgstr "Gebruiker mag niet naar evenementen"
#: models.py:26
1
#:
members/
models.py:26
3
msgid "User may not attend drinks"
msgstr "Gebruiker mag niet naar borrels"
#: models.py:26
2
#:
members/
models.py:26
4
msgid "User may not attend anything"
msgstr "Gebruiker mag nergens heen"
#: models.py:27
4
#:
members/
models.py:27
6
msgid "Preferred language"
msgstr "Voorkeurstaal"
#: models.py:27
5
#:
members/
models.py:27
7
msgid "Preferred language for e.g. newsletters"
msgstr "Voorkeurstaal voor b.v.b. nieuwsbrieven"
#: models.py:28
2
#:
members/
models.py:28
4
msgid "Receive opt-in mailings"
msgstr "Ontvang opt-in mailings"
#: models.py:28
3
#:
members/
models.py:28
5
msgid "Receive mailings about vacancies and events from Thalia's sponsors."
msgstr "Ontvang mailings over vacatures en evenmenten van Thalia's sponsoren"
#: models.py:2
8
9
#:
members/
models.py:29
1
msgid "Receive newsletter"
msgstr "Ontvang nieuwsbrief"
#: models.py:29
0
#:
members/
models.py:29
2
msgid "Receive the Thalia Newsletter"
msgstr "Ontvang de Thalia nieuwsbrief"
#: models.py:29
7
#:
members/
models.py:29
9
msgid ""
"Yes, I want Thalia to take the membership fees from my bank account through "
"direct debit for each year."
...
...
@@ -254,132 +258,136 @@ msgstr ""
"Ja, ik wil dat Thalia verschuldigde lidmaatschapsgelden elk jaar van mijn "
"bankrekening afschrijft."
#: models.py:30
0
#:
members/
models.py:30
2
msgid "No, I will pay the contribution myself"
msgstr "Nee, ik zal de contributie zelf betalen"
#: models.py:30
1
#:
members/
models.py:30
3
msgid "Direct debit"
msgstr "Automatische afschijving"
#: models.py:30
2
#:
members/
models.py:30
4
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:30
8
#:
members/
models.py:3
1
0
msgid "Bank account"
msgstr "Bankrekening"
#: models.py:3
09
#:
members/
models.py:3
11
msgid "Bank account for direct debit"
msgstr "Bankrekening voor automatische afschrijving"
#: models.py:33
3
#:
members/
models.py:33
8
msgid "Display name"
msgstr "Weergavenaam"
#: models.py:36
1
#:
members/
models.py:36
6
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:37
2
#:
members/
models.py:37
7
msgid "Member"
msgstr "Lid"
#: models.py:37
3
#:
members/
models.py:37
8
msgid "Supporter"
msgstr "Begunstiger"
#: models.py:37
4
#:
members/
models.py:37
9
msgid "Honorary Member"
msgstr "Erelid"
#: models.py:3
79
#:
members/
models.py:3
84
msgid "Membership type"
msgstr "Lidtype"
#: models.py:3
88
#:
members/
models.py:3
93
msgid "User"
msgstr "Gebruiker"
#: models.py:39
2
#:
members/
models.py:39
7
msgid "Membership since"
msgstr "Lid sinds"
#: models.py:39
3
#:
members/
models.py:39
8
msgid "The date the member started holding this membership."
msgstr "De datum waarop het lid dit lidmaatschap is begonnen."
#: models.py:
398
#:
members/
models.py:
403
msgid "Membership until"
msgstr "Lid tot"
#: models.py:
399
#:
members/
models.py:
404
msgid "The date the member stops holding this membership."
msgstr "De datum waarop het lid dit lidmaatschap beëindigd."
#: templates/members/account.html:6 templates/members/edit_profile.html:5
#: templates/members/index.html:7 templates/members/index.html:10
#: templates/members/profile.html:6
#: members/templates/members/account.html:6
#: members/templates/members/edit_profile.html:5
#: members/templates/members/index.html:7
#: members/templates/members/index.html:10
#: members/templates/members/profile.html:6
msgid "members"
msgstr "leden"
#: templates/members/account.html:9
#:
members/
templates/members/account.html:9
msgid "Account"
msgstr "Account"
#: templates/members/account.html:14
#:
members/
templates/members/account.html:14
#, python-format
msgid "You’re currently logged in as <strong>%(user)s</strong>"
msgstr "U bent momenteel ingelogd als <strong>%(user)s</strong>"
#: templates/members/account.html:19
#:
members/
templates/members/account.html:19
msgid "show public profile"
msgstr "bekijk publieke profielpagina"
#: templates/members/account.html:20
#:
members/
templates/members/account.html:20
msgid "Take a look at your own profile."
msgstr "Bekijk je eigen profielpagina."
#: templates/members/account.html:26 templates/members/edit_profile.html:5
#: templates/members/edit_profile.html:8
#: members/templates/members/account.html:26
#: members/templates/members/edit_profile.html:5
#: members/templates/members/edit_profile.html:8
msgid "edit profile"
msgstr "profiel bewerken"
#: templates/members/account.html:27
#:
members/
templates/members/account.html:27
msgid "Edit your profile and avatar."
msgstr "Bewerk je profiel en profielafbeelding."
#: templates/members/account.html:33
#:
members/
templates/members/account.html:33
msgid "change password"
msgstr "wachtwoord wijzigen"
#: templates/members/account.html:34
#:
members/
templates/members/account.html:34
msgid "Change your accounts' password."
msgstr "Wijzig het wachtwoord van je account."
#: templates/members/account.html:40
#:
members/
templates/members/account.html:40
msgid "logout"
msgstr "uitloggen"
#: templates/members/account.html:41
#:
members/
templates/members/account.html:41
msgid "Leave the restricted area of the website."
msgstr "Verlaat het beveiligde gedeelte van de website."
#: templates/members/edit_profile.html:12
#:
members/
templates/members/edit_profile.html:12
msgid "Your profile has been updated successfully."
msgstr "Je profiel is succesvol opgeslagen."
#: templates/members/edit_profile.html:19
#:
members/
templates/members/edit_profile.html:19
msgid "Please check your profile for errors."
msgstr "Controleer je profiel op fouten."
#: templates/members/edit_profile.html:45
#:
members/
templates/members/edit_profile.html:45
msgid "save"
msgstr "opslaan"
#: templates/members/email/welcome.txt:1
#:
members/
templates/members/email/welcome.txt:1
#, python-format
msgid ""
"Dear %(full_name)s, Welcome to Study Association Thalia! You now have an "
...
...
@@ -393,7 +401,7 @@ msgstr ""
"wachtwoord: %(password)s Controleer alsjeblieft ook de gegevens in je "
"profiel. Groetjes, Thalia"
#: templates/members/index.html:13
#:
members/
templates/members/index.html:13
msgid ""
"Ever wondered what the name of that person in the back row of the lecture "
"room is? Or maybe you're just looking for a group member's email address? "
...
...
@@ -406,106 +414,72 @@ msgstr ""
"spreken. Er bestaat een grote kans dat die persoon lid van Thalia is, en dus "
"is opgenomen in de onderstaande ledenlijst."
#: templates/members/index.html:26
#:
members/
templates/members/index.html:26
msgid "Who are you looking for?"
msgstr "Wie zoek je?"
#: templates/members/index.html:27
#:
members/
templates/members/index.html:27
msgid "Search"
msgstr "Zoeken"
#: templates/members/index.html:35
#:
members/
templates/members/index.html:35
msgid "All members"
msgstr "Alle leden"
#: templates/members/index.html:39
#:
members/
templates/members/index.html:39
msgid "Older"
msgstr "Ouder"
#: templates/members/index.html:40
#:
members/
templates/members/index.html:40
msgid "Honorary Members"
msgstr "Ere-leden"
#: templates/members/index.html:41
#:
members/
templates/members/index.html:41
msgid "Former Members"
msgstr "Ex-leden"
#: templates/members/index.html:47
#:
members/
templates/members/index.html:47
msgid "No members found"
msgstr "Geen leden gevonden"
#: templates/members/index.html:67 templates/members/profile.html:36
#: members/templates/members/index.html:67
#: members/templates/members/profile.html:36
msgid "Cohort"
msgstr "Cohort"
#: templates/members/index.html:104
#:
members/
templates/members/index.html:104
msgid "Next"
msgstr "Volgende"
#: templates/members/profile.html:6
#:
members/
templates/members/profile.html:6
msgid "profile"
msgstr "profiel"
#: templates/members/profile.html:25
#:
members/
templates/members/profile.html:25
msgid "About"
msgstr "Over"
#: templates/members/profile.html:28
#:
members/
templates/members/profile.html:28
msgid "This member has not written a description yet."
msgstr "Dit lid heeft nog geen beschrijving geschreven."
#: templates/members/profile.html:34
#:
members/
templates/members/profile.html:34
msgid "Personal information"
msgstr "Persoonlijke gegevens"
#: templates/members/profile.html:51
#:
members/
templates/members/profile.html:51
msgid "Achievements for Thalia"
msgstr "Verdiensten voor Thalia"
#: templates/members/profile.html:61
#:
members/
templates/members/profile.html:61
msgid "today"
msgstr "heden"
#: templates/members/statistics.html:5 templates/members/statistics.html:8
#: members/templates/members/statistics.html:5
#: members/templates/members/statistics.html:8
msgid "Statistics"
msgstr "Statistieken"
#: templates/members/statistics.html:10
#:
members/
templates/members/statistics.html:10
msgid "Total amount of Thalia members"
msgstr "Totaal aantal Thalialeden"
#~ msgid "First name"
#~ msgstr "Voornaam"
#~ msgid "Last name"
#~ msgstr "Achternaam"
#~ msgid "Address"
#~ msgstr "Adres"
#~ msgid "Address line 2"
#~ msgstr "Tweede adresregel"
#~ msgid "These are the current members:"
#~ msgstr "Dit zijn de huidige leden:"
#~ msgid "Er zijn geen leden"
#~ msgstr "Er zijn geen leden"
#~ msgid "Foto"
#~ msgstr "Foto"
#~ msgid "Benefactor"
#~ msgstr "Begunstiger"
#~ msgid "Expiration date of membership"
#~ msgstr "Verloopdatum van lidmaatschap"
#~ msgid "Let the membership expire after this time"
#~ msgstr "Laat het lidmaatschap na deze datum verlopen"
#~ msgid "English"
#~ msgstr "Engels"
#~ msgid "Dutch"
#~ msgstr "Nederlands"
website/members/migrations/0016_auto_20170225_1949.py
0 → 100644
View file @
313f2133
# -*- coding: utf-8 -*-
# Generated by Django 1.10.3 on 2017-02-25 18:49
from
__future__
import
unicode_literals