Skip to content
GitLab
Verified Commit 313f2133 authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg
Browse files

Make sure the user creation form matches the field order of the paper form

parent 08580021
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.po
View file @ 313f2133
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-12-19 21:27+0100\n"
"PO-Revision-Date: 2016-12-19 21:28+0100\n"
"POT-Creation-Date: 2017-02-25 19:31+0100\n"
"PO-Revision-Date: 2017-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.11\n"
"X-Generator: Poedit 1.8.12\n"
#: admin.py:29
#: members/admin.py:30
msgid "membership type"
msgstr "lidtype"
#: admin.py:52
#: members/admin.py:53
msgid "Age"
msgstr "Leeftijd"
#: admin.py:57
#: members/admin.py:58
msgid "≥ 18"
msgstr "≥ 18"
#: admin.py:58
#: members/admin.py:59
msgid "< 18"
msgstr "< 18"
#: admin.py:59
#: members/admin.py:60
msgid "Unknown"
msgstr "Onbekend"
#: admin.py:127
#: members/admin.py:128
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:55
#: members/models.py:56
msgid "Computing Science"
msgstr "Informatica"
#: models.py:56
#: members/models.py:57
msgid "Information Sciences"
msgstr "Informatiekunde"
#: models.py:68 templates/members/profile.html:38
#: members/models.py:69 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:83
#: members/models.py:85
msgid "Starting year"
msgstr "Eerste lidmaatschapsjaar"
msgstr "Startjaar"
#: models.py:84
#: members/models.py:86
msgid "The year this member started studying."
msgstr "Het jaar waarop dit lid begon met studeren."
#: models.py:120
#: members/models.py:122
msgid "Is this user currently active"
msgstr "Is deze user op dit moment actief"
#: models.py:134
#: members/models.py:136
msgid "Include the house number"
msgstr "Inclusief huisnummer"
#: models.py:136
#: members/models.py:138
msgid "Street and house number"
msgstr "Straat en huisnummer"
#: models.py:142
#: members/models.py:144
msgid "Second address line"
msgstr "Tweede adresregel"
#: models.py:149
#: members/models.py:151
msgid "Postal code"
msgstr "Postcode"
#: models.py:155
#: members/models.py:157
msgid "City"
msgstr "Woonplaats"
#: models.py:161
#: members/models.py:163
msgid "Phone number"
msgstr "Telefoonnummer"
#: models.py:162
#: members/models.py:164
msgid "Enter a phone number so Thalia may reach you"
msgstr "Voer een telefoonnummer in zodat Thalia je kan bereiken"
#: models.py:165 models.py:187
#: members/models.py:167 members/models.py:189
msgid "Please enter a valid phone number"
msgstr "Voer svp een geldig telefoonnummer in"
#: models.py:175
#: members/models.py:177
msgid "Emergency contact name"
msgstr "Contact voor noodgevallen"
#: models.py:176
#: members/models.py:178
msgid "Who should we contact in case of emergencies"
msgstr "Wie Thalia moet bereiken in bij noodgevallen"
#: models.py:183
#: members/models.py:185
msgid "Emergency contact phone number"
msgstr "Telefoonnummer noodcontact"
#: models.py:184
#: members/models.py:186
msgid "The phone number for the emergency contact"
msgstr "Het telefoonummer van de noodcontact"
#: models.py:196 templates/members/profile.html:45
#: members/models.py:198 members/templates/members/profile.html:45
msgid "Birthday"
msgstr "Verjaardag"
#: models.py:201
#: members/models.py:203
msgid "Display birthday"
msgstr "Laat verjaardag zien"
#: models.py:203
#: members/models.py:205
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:210 templates/members/profile.html:41
#: members/models.py:212 members/templates/members/profile.html:41
msgid "Website"
msgstr "Website"
#: models.py:211
#: members/models.py:213
msgid "Website to display on your profile page"
msgstr "Website om op je profiel te linken"
#: models.py:217
#: members/models.py:219
msgid "Profile text"
msgstr "Profieltekst"
#: models.py:218
#: members/models.py:220
msgid "Text to display on your profile"
msgstr "Tekst om te laten zien op je profielpagina"
#: models.py:225
#: members/models.py:227
msgid "Initials"
msgstr "Initialen"
#: models.py:232
#: members/models.py:234
msgid "Nickname"
msgstr "Bijnaam"
#: models.py:239
#: members/models.py:241
msgid "How to display name"
msgstr "Weergave naam"
#: models.py:240
#: members/models.py:242
msgid "Show full name"
msgstr "Volledige naam"
#: models.py:241
#: members/models.py:243
msgid "Show only nickname"
msgstr "Alleen initialen"
#: models.py:242
#: members/models.py:244
msgid "Show only first name"
msgstr "Alleen voornaam"
#: models.py:243
#: members/models.py:245
msgid "Show initials and last name"
msgstr "Alleen initialen en achternaam"
#: models.py:244
#: members/models.py:246
msgid "Show name like \"John 'nickname' Doe\""
msgstr "Laat zien als \"John 'bijnaam' Doe\""
#: models.py:245
#: members/models.py:247
msgid "Show nickname and last name"
msgstr "Laat bijnaam en achternaam zien"
#: models.py:250
#: members/models.py:252
msgid "Photo"
msgstr "Foto"
#: models.py:258
#: members/models.py:260
msgid "Which events can this member attend"
msgstr "Welke evenementen mag dit lid bijwonen"
#: models.py:259
#: members/models.py:261
msgid "All events"
msgstr "Alle evenementen"
#: models.py:260
#: members/models.py:262
msgid "User may not attend events"
msgstr "Gebruiker mag niet naar evenementen"
#: models.py:261
#: members/models.py:263
msgid "User may not attend drinks"
msgstr "Gebruiker mag niet naar borrels"
#: models.py:262
#: members/models.py:264
msgid "User may not attend anything"
msgstr "Gebruiker mag nergens heen"
#: models.py:274
#: members/models.py:276
msgid "Preferred language"
msgstr "Voorkeurstaal"
#: models.py:275
#: members/models.py:277
msgid "Preferred language for e.g. newsletters"
msgstr "Voorkeurstaal voor b.v.b. nieuwsbrieven"
#: models.py:282
#: members/models.py:284
msgid "Receive opt-in mailings"
msgstr "Ontvang opt-in mailings"
#: models.py:283
#: members/models.py:285
msgid "Receive mailings about vacancies and events from Thalia's sponsors."
msgstr "Ontvang mailings over vacatures en evenmenten van Thalia's sponsoren"
#: models.py:289
#: members/models.py:291
msgid "Receive newsletter"
msgstr "Ontvang nieuwsbrief"
#: models.py:290
#: members/models.py:292
msgid "Receive the Thalia Newsletter"
msgstr "Ontvang de Thalia nieuwsbrief"
#: models.py:297
#: members/models.py:299
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:300
#: members/models.py:302
msgid "No, I will pay the contribution myself"
msgstr "Nee, ik zal de contributie zelf betalen"
#: models.py:301
#: members/models.py:303
msgid "Direct debit"
msgstr "Automatische afschijving"
#: models.py:302
#: members/models.py:304
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:308
#: members/models.py:310
msgid "Bank account"
msgstr "Bankrekening"
#: models.py:309
#: members/models.py:311
msgid "Bank account for direct debit"
msgstr "Bankrekening voor automatische afschrijving"
#: models.py:333
#: members/models.py:338
msgid "Display name"
msgstr "Weergavenaam"
#: models.py:361
#: members/models.py:366
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:372
#: members/models.py:377
msgid "Member"
msgstr "Lid"
#: models.py:373
#: members/models.py:378
msgid "Supporter"
msgstr "Begunstiger"
#: models.py:374
#: members/models.py:379
msgid "Honorary Member"
msgstr "Erelid"
#: models.py:379
#: members/models.py:384
msgid "Membership type"
msgstr "Lidtype"
#: models.py:388
#: members/models.py:393
msgid "User"
msgstr "Gebruiker"
#: models.py:392
#: members/models.py:397
msgid "Membership since"
msgstr "Lid sinds"
#: models.py:393
#: members/models.py:398
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