Skip to content
GitLab
Menu
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
032eb8f0
Commit
032eb8f0
authored
Dec 07, 2016
by
Sébastiaan Versteeg
Browse files
🐛
Fix problem that prevented errors from being shown in the profile edit form
parent
661d107a
Changes
4
Hide whitespace changes
Inline
Side-by-side
website/members/locale/nl/LC_MESSAGES/django.mo
View file @
032eb8f0
No preview for this file type
website/members/locale/nl/LC_MESSAGES/django.po
View file @
032eb8f0
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-1
1-10 11:4
7+0100\n"
"PO-Revision-Date: 2016-1
1-10 11:49
+0100\n"
"POT-Creation-Date: 2016-1
2-07 20:5
7+0100\n"
"PO-Revision-Date: 2016-1
2-07 20:57
+0100\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
...
...
@@ -18,123 +18,123 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.8.11\n"
#:
members/
admin.py:29
#: admin.py:29
msgid "membership type"
msgstr "lidtype"
#:
members/
admin.py:52
#: admin.py:52
msgid "Age"
msgstr "Leeftijd"
#:
members/
admin.py:57
#: admin.py:57
msgid "≥ 18"
msgstr "≥ 18"
#:
members/
admin.py:58
#: admin.py:58
msgid "< 18"
msgstr "< 18"
#:
members/
admin.py:59
#: admin.py:59
msgid "Unknown"
msgstr "Onbekend"
#:
members/
admin.py:127
#: admin.py:127
msgid "Download address label for selected users"
msgstr "Download adreslabels voor geselecteerde gebruikers"
#:
members/
forms.py:35
#: forms.py:35
msgid "Send welcome email"
msgstr "Stuur welkomste-mails"
#:
members/
forms.py:36
#: forms.py:36
msgid "This email will include the generated password"
msgstr "Deze e-mail zal het gegenereerde wachtwoord bevatten"
#:
members/
models.py:5
4
#: models.py:5
5
msgid "Computing Science"
msgstr "Informatica"
#:
members/
models.py:5
5
#: models.py:5
6
msgid "Information Sciences"
msgstr "Informatiekunde"
#:
members/
models.py:6
7 members/
templates/members/profile.html:38
#: models.py:6
8
templates/members/profile.html:38
msgid "Study programme"
msgstr "Studie"
#:
members/
models.py:7
6
#: models.py:7
7
msgid "Enter a valid student- or e/z/u-number."
msgstr "Voer een geldig student- of e/z/u-nummer in."
#:
members/
models.py:8
2
#: models.py:8
3
msgid "Starting year"
msgstr "Eerste lidmaatschapsjaar"
#:
members/
models.py:8
3
#: models.py:8
4
msgid "The year this member started studying."
msgstr "Het jaar waarop dit lid begon met studeren."
#:
members/
models.py:1
19
#: models.py:1
20
msgid "Is this user currently active"
msgstr "Is deze user op dit moment actief"
#:
members/
models.py:13
3
#: models.py:13
4
msgid "Include the house number"
msgstr "Inclusief huisnummer"
#:
members/
models.py:13
5
#: models.py:13
6
msgid "Street and house number"
msgstr "Straat en huisnummer"
#:
members/
models.py:14
1
#: models.py:14
2
msgid "Second address line"
msgstr "Tweede adresregel"
#:
members/
models.py:14
8
#: models.py:14
9
msgid "Postal code"
msgstr "Postcode"
#:
members/
models.py:15
4
#: models.py:15
5
msgid "City"
msgstr "Woonplaats"
#:
members/
models.py:16
0
#: models.py:16
1
msgid "Phone number"
msgstr "Telefoonnummer"
#:
members/
models.py:16
1
#: models.py:16
2
msgid "Enter a phone number so Thalia may reach you"
msgstr "Voer een telefoonnummer in zodat Thalia je kan bereiken"
#:
members/
models.py:16
4
members/
models.py:18
6
#: models.py:16
5
models.py:18
7
msgid "Please enter a valid phone number"
msgstr "Voer svp een geldig telefoonnummer in"
#:
members/
models.py:17
4
#: models.py:17
5
msgid "Emergency contact name"
msgstr "Contact voor noodgevallen"
#:
members/
models.py:17
5
#: models.py:17
6
msgid "Who should we contact in case of emergencies"
msgstr "Wie Thalia moet bereiken in bij noodgevallen"
#:
members/
models.py:18
2
#: models.py:18
3
msgid "Emergency contact phone number"
msgstr "Telefoonnummer noodcontact"
#:
members/
models.py:18
3
#: models.py:18
4
msgid "The phone number for the emergency contact"
msgstr "Het telefoonummer van de noodcontact"
#:
members/
models.py:19
5 members/
templates/members/profile.html:45
#: models.py:19
6
templates/members/profile.html:45
msgid "Birthday"
msgstr "Verjaardag"
#:
members/
models.py:20
0
#: models.py:20
1
msgid "Display birthday"
msgstr "Laat verjaardag zien"
#:
members/
models.py:20
2
#: models.py:20
3
msgid ""
"Show your birthday to other members on your profile page and in the birthday "
"calendar"
...
...
@@ -142,107 +142,107 @@ msgstr ""
"Toon je verjaardag aan andere leden op je profielpagina en in de "
"verjaardagskalender"
#:
members/
models.py:2
09 members/
templates/members/profile.html:41
#: models.py:2
10
templates/members/profile.html:41
msgid "Website"
msgstr "Website"
#:
members/
models.py:21
0
#: models.py:21
1
msgid "Website to display on your profile page"
msgstr "Website om op je profiel te linken"
#:
members/
models.py:21
6
#: models.py:21
7
msgid "Profile text"
msgstr "Profieltekst"
#:
members/
models.py:21
7
#: models.py:21
8
msgid "Text to display on your profile"
msgstr "Tekst om te laten zien op je profielpagina"
#:
members/
models.py:22
4
#: models.py:22
5
msgid "Initials"
msgstr "Initialen"
#:
members/
models.py:23
1
#: models.py:23
2
msgid "Nickname"
msgstr "Bijnaam"
#:
members/
models.py:23
8
#: models.py:23
9
msgid "How to display name"
msgstr "Weergave naam"
#:
members/
models.py:2
39
#: models.py:2
40
msgid "Show full name"
msgstr "Volledige naam"
#:
members/
models.py:24
0
#: models.py:24
1
msgid "Show only nickname"
msgstr "Alleen initialen"
#:
members/
models.py:24
1
#: models.py:24
2
msgid "Show only first name"
msgstr "Alleen voornaam"
#:
members/
models.py:24
2
#: models.py:24
3
msgid "Show initials and last name"
msgstr "Alleen initialen en achternaam"
#:
members/
models.py:24
3
#: models.py:24
4
msgid "Show name like \"John 'nickname' Doe\""
msgstr "Laat zien als \"John 'bijnaam' Doe\""
#:
members/
models.py:24
4
#: models.py:24
5
msgid "Show nickname and last name"
msgstr "Laat bijnaam en achternaam zien"
#:
members/
models.py:2
49
#: models.py:2
50
msgid "Photo"
msgstr "Foto"
#:
members/
models.py:25
7
#: models.py:25
8
msgid "Which events can this member attend"
msgstr "Welke evenementen mag dit lid bijwonen"
#:
members/
models.py:25
8
#: models.py:25
9
msgid "All events"
msgstr "Alle evenementen"
#:
members/
models.py:2
59
#: models.py:2
60
msgid "User may not attend events"
msgstr "Gebruiker mag niet naar evenementen"
#:
members/
models.py:26
0
#: models.py:26
1
msgid "User may not attend drinks"
msgstr "Gebruiker mag niet naar borrels"
#:
members/
models.py:26
1
#: models.py:26
2
msgid "User may not attend anything"
msgstr "Gebruiker mag nergens heen"
#:
members/
models.py:27
3
#: models.py:27
4
msgid "Preferred language"
msgstr "Voorkeurstaal"
#:
members/
models.py:27
4
#: models.py:27
5
msgid "Preferred language for e.g. newsletters"
msgstr "Voorkeurstaal voor b.v.b. nieuwsbrieven"
#:
members/
models.py:28
1
#: models.py:28
2
msgid "Receive opt-in mailings"
msgstr "Ontvang opt-in mailings"
#:
members/
models.py:28
2
#: models.py:28
3
msgid "Receive mailings about vacancies and events from Thalia's sponsors."
msgstr "Ontvang mailings over vacatures en evenmenten van Thalia's sponsoren"
#:
members/
models.py:28
8
#: models.py:28
9
msgid "Receive newsletter"
msgstr "Ontvang nieuwsbrief"
#:
members/
models.py:2
8
9
#: models.py:29
0
msgid "Receive the Thalia Newsletter"
msgstr "Ontvang de Thalia nieuwsbrief"
#:
members/
models.py:29
6
#: models.py:29
7
msgid ""
"Yes, I want Thalia to take the membership fees from my bank account through "
"direct debit for each year."
...
...
@@ -250,127 +250,132 @@ msgstr ""
"Ja, ik wil dat Thalia verschuldigde lidmaatschapsgelden elk jaar van mijn "
"bankrekening afschrijft."
#:
members/
models.py:
299
#: models.py:
300
msgid "No, I will pay the contribution myself"
msgstr "Nee, ik zal de contributie zelf betalen"
#:
members/
models.py:30
0
#: models.py:30
1
msgid "Direct debit"
msgstr "Automatische afschijving"
#:
members/
models.py:30
1
#: models.py:30
2
msgid "Each year, have Thalia take the membership fees from my bank account"
msgstr ""
"Laat Thalia elk jaar het lidmaatschapsgeld van mijn bankrekening afschrijven"
#:
members/
models.py:30
7
#: models.py:30
8
msgid "Bank account"
msgstr "Bankrekening"
#:
members/
models.py:30
8
#: models.py:30
9
msgid "Bank account for direct debit"
msgstr "Bankrekening voor automatische afschrijving"
#:
members/
models.py:33
0
#: models.py:33
3
msgid "Display name"
msgstr "Weergavenaam"
#: members/models.py:355
#: models.py:361
msgid "You need to enter a nickname to use it as display name"
msgstr ""
#: models.py:372
msgid "Member"
msgstr "Lid"
#:
members/
models.py:3
56
#: models.py:3
73
msgid "Supporter"
msgstr "Begunstiger"
#:
members/
models.py:3
5
7
#: models.py:37
4
msgid "Honorary Member"
msgstr "Erelid"
#:
members/
models.py:3
62
#: models.py:3
79
msgid "Membership type"
msgstr "Lidtype"
#:
members/
models.py:3
71
#: models.py:3
88
msgid "User"
msgstr "Gebruiker"
#:
members/
models.py:3
75
#: models.py:3
92
msgid "Membership since"
msgstr "Lid sinds"
#:
members/
models.py:3
76
#: models.py:3
93
msgid "The date the member started holding this membership."
msgstr "De datum waarop het lid dit lidmaatschap is begonnen."
#:
members/
models.py:38
1
#: models.py:3
9
8
msgid "Membership until"
msgstr "Lid tot"
#:
members/
models.py:3
82
#: models.py:3
99
msgid "The date the member stops holding this membership."
msgstr "De datum waarop het lid dit lidmaatschap beëindigd."
#: members/templates/members/account.html:6
#: members/templates/members/edit_profile.html:5
#: members/templates/members/index.html:6
#: members/templates/members/index.html:9
#: members/templates/members/profile.html:6
#: 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
msgid "members"
msgstr "leden"
#:
members/
templates/members/account.html:9
#: templates/members/account.html:9
msgid "Account"
msgstr "Account"
#:
members/
templates/members/account.html:14
#: 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>"
#:
members/
templates/members/account.html:19
#: templates/members/account.html:19
msgid "show public profile"
msgstr "bekijk publieke profielpagina"
#:
members/
templates/members/account.html:20
#: templates/members/account.html:20
msgid "Take a look at your own profile."
msgstr "Bekijk je eigen profielpagina."
#: members/templates/members/account.html:26
#: members/templates/members/edit_profile.html:5
#: members/templates/members/edit_profile.html:8
#: templates/members/account.html:26 templates/members/edit_profile.html:5
#: templates/members/edit_profile.html:8
msgid "edit profile"
msgstr "profiel bewerken"
#:
members/
templates/members/account.html:27
#: templates/members/account.html:27
msgid "Edit your profile and avatar."
msgstr "Bewerk je profiel en profielafbeelding."
#:
members/
templates/members/account.html:33
#: templates/members/account.html:33
msgid "change password"
msgstr "wachtwoord wijzigen"
#:
members/
templates/members/account.html:34
#: templates/members/account.html:34
msgid "Change your accounts' password."
msgstr "Wijzig het wachtwoord van je account."
#:
members/
templates/members/account.html:40
#: templates/members/account.html:40
msgid "logout"
msgstr "uitloggen"
#:
members/
templates/members/account.html:41
#: templates/members/account.html:41
msgid "Leave the restricted area of the website."
msgstr "Verlaat het beveiligde gedeelte van de website."
#:
members/
templates/members/edit_profile.html:12
#: templates/members/edit_profile.html:12
msgid "Your profile has been updated successfully."
msgstr "Je profiel is succesvol opgeslagen."
#: members/templates/members/edit_profile.html:38
#: 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
msgid "save"
msgstr "opslaan"
#:
members/
templates/members/email/welcome.txt:1
#: templates/members/email/welcome.txt:1
#, python-format
msgid ""
"Dear %(user.get_full_name)s, Welcome to Study Association Thalia! You now "
...
...
@@ -385,7 +390,7 @@ msgstr ""
"wachtwoord: %(password)s Controleer alsjeblieft ook de gegevens in je "
"profiel. Groetjes, Thalia"
#:
members/
templates/members/index.html:1
2
#: templates/members/index.html:1
3
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? "
...
...
@@ -398,73 +403,71 @@ msgstr ""
"spreken. Er bestaat een grote kans dat die persoon lid van Thalia is, en dus "
"is opgenomen in de onderstaande ledenlijst."
#:
members/
templates/members/index.html:2
5
#: templates/members/index.html:2
6
msgid "Who are you looking for?"
msgstr "Wie zoek je?"
#:
members/
templates/members/index.html:2
6
#: templates/members/index.html:2
7
msgid "Search"
msgstr "Zoeken"
#:
members/
templates/members/index.html:3
4
#: templates/members/index.html:3
5
msgid "All members"
msgstr "Alle leden"
#:
members/
templates/members/index.html:3
8
#: templates/members/index.html:3
9
msgid "Older"
msgstr "Ouder"
#:
members/
templates/members/index.html:
39
#: templates/members/index.html:
40
msgid "Honorary Members"
msgstr "Ere-leden"
#:
members/
templates/members/index.html:4
0
#: templates/members/index.html:4
1
msgid "Former Members"
msgstr "Ex-leden"
#:
members/
templates/members/index.html:4
6
#: templates/members/index.html:4
7
msgid "No members found"
msgstr "Geen leden gevonden"
#: members/templates/members/index.html:62
#: members/templates/members/profile.html:36
#: templates/members/index.html:67 templates/members/profile.html:36
msgid "Cohort"
msgstr "Cohort"
#:
members/
templates/members/index.html:
99
#: templates/members/index.html:
104
msgid "Next"
msgstr "Volgende"
#:
members/
templates/members/profile.html:6
#: templates/members/profile.html:6
msgid "profile"
msgstr "profiel"
#:
members/
templates/members/profile.html:25
#: templates/members/profile.html:25
msgid "About"
msgstr "Over"
#:
members/
templates/members/profile.html:28
#: templates/members/profile.html:28
msgid "This member has not written a description yet."
msgstr "Dit lid heeft nog geen beschrijving geschreven."
#:
members/
templates/members/profile.html:34
#: templates/members/profile.html:34
msgid "Personal information"
msgstr "Persoonlijke gegevens"
#:
members/
templates/members/profile.html:51
#: templates/members/profile.html:51
msgid "Achievements for Thalia"
msgstr "Verdiensten voor Thalia"
#:
members/
templates/members/profile.html:61
#: templates/members/profile.html:61
msgid "today"
msgstr "heden"
#: members/templates/members/statistics.html:5
#: members/templates/members/statistics.html:8
#: templates/members/statistics.html:5 templates/members/statistics.html:8
msgid "Statistics"
msgstr "Statistieken"
#:
members/
templates/members/statistics.html:10
#: templates/members/statistics.html:10
msgid "Total amount of Thalia members"
msgstr "Totaal aantal Thalialeden"
...
...
website/members/templates/members/edit_profile.html
View file @
032eb8f0
...
...
@@ -14,6 +14,13 @@
</div>
{% endif %}
{% if form.errors %}
<div
class=
"alert alert-error"
>
{% trans "Please check your profile for errors." %}
<button
type=
"button"
class=
"close"
><span
class=
"alert-icon-close"
></span></button>
</div>
{% endif %}
<form
method=
"post"
class=
"form-horizontal span8 offset2"
>
{% csrf_token %}
...
...
@@ -37,4 +44,4 @@
<input
type=
"submit"
value=
"{% trans 'save'|capfirst %}"
class=
"btn btn-style1 pull-right login"
/>
</form>
{% endblock %}
\ No newline at end of file
{% endblock %}
website/members/views.py
View file @
032eb8f0
...
...
@@ -143,9 +143,9 @@ def edit_profile(request):
form
=
MemberForm
(
request
.
POST
,
instance
=
member
)
if
form
.
is_valid
():
saved
=
True
member
=
form
.
save
()
form
=
MemberForm
(
instance
=
member
)
form
.
save
()
else
:
form
=
MemberForm
(
instance
=
member
)
return
render
(
request
,
'members/edit_profile.html'
,
{
'form'
:
form
,
'saved'
:
saved
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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