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
8ce88240
Verified
Commit
8ce88240
authored
Jul 21, 2017
by
Sébastiaan Versteeg
Browse files
Add check for cancel deadline before start of event
parent
b8aa0547
Changes
4
Hide whitespace changes
Inline
Side-by-side
website/events/locale/nl/LC_MESSAGES/django.mo
View file @
8ce88240
No preview for this file type
website/events/locale/nl/LC_MESSAGES/django.po
View file @
8ce88240
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-0
5
-2
4
2
0
:2
4
+0200\n"
"PO-Revision-Date: 2017-0
5
-2
4
2
0:37
+0
1
00\n"
"POT-Creation-Date: 2017-0
7
-2
1
2
3
:2
5
+0200\n"
"PO-Revision-Date: 2017-0
7
-2
1
2
3:26
+0
2
00\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
1.5.4
\n"
"X-Generator: Poedit
2.0.2
\n"
#: admin.py:89
msgid "Event Date"
...
...
@@ -74,7 +74,7 @@ msgstr "Workshop"
msgid "Other"
msgstr "Overig"
#: models.py:33 templates/events/event.html:14
2
#: models.py:33 templates/events/event.html:14
3
msgid "No registration required"
msgstr "Geen aanmelding vereist"
...
...
@@ -82,7 +82,7 @@ msgstr "Geen aanmelding vereist"
msgid "title"
msgstr "titel"
#: models.py:43 models.py:26
4
#: models.py:43 models.py:26
9
msgid "description"
msgstr "beschrijving"
...
...
@@ -198,63 +198,67 @@ msgstr ""
"Als aanmelden vereist is, dan heb je een eindtijd voor de aanmeldperiode "
"nodig"
#: models.py:215
#: models.py:216
msgid "The cancel deadline should be before the start of the event."
msgstr "De afmelddeadline moet voor de start van het evenement liggen."
#: models.py:220
msgid "Registration start should be before registration end"
msgstr "De starttijd voor de aanmeldperiode moet voor de eindtijd liggen"
#: models.py:24
4
#: models.py:24
9
msgid "Checkbox"
msgstr "Checkbox"
#: models.py:2
4
5
#: models.py:25
0
msgid "Text"
msgstr "Text\t"
#: models.py:2
46
#: models.py:2
51
msgid "Integer"
msgstr "Integer"
#: models.py:25
1
#: models.py:25
6
msgid "field type"
msgstr "veldtype"
#: models.py:2
58
#: models.py:2
63
msgid "field name"
msgstr "veldnaam"
#: models.py:27
0
#: models.py:27
5
msgid "required"
msgstr "verplicht"
#: models.py:33
1
templates/events/admin/registrations_table.html:6
#: models.py:33
6
templates/events/admin/registrations_table.html:6
msgid "name"
msgstr "naam"
#: models.py:33
3
#: models.py:33
8
msgid "Use this for non-members"
msgstr "Gebruikt dit voor niet-leden"
#: models.py:33
8
#: models.py:3
4
3
msgid "registration date"
msgstr "aanmelddatum"
#: models.py:34
0
#: models.py:34
5
msgid "cancellation date"
msgstr "afmelddatum"
#: models.py:3
4
5 templates/events/admin/registrations_table.html:11
#: models.py:35
0
templates/events/admin/registrations_table.html:11
msgid "present"
msgstr "aanwezig"
#: models.py:34
9
templates/events/admin/registrations_table.html:12
#: models.py:3
5
4 templates/events/admin/registrations_table.html:12
msgid "paid"
msgstr "betaald"
#: models.py:40
0
models.py:40
1
#: models.py:40
5
models.py:40
6
msgid "Either specify a member or a name"
msgstr "Geef een lid of een naam op"
#: models.py:42
3
#: models.py:42
8
msgid "last changed"
msgstr "laatst aangepast"
...
...
@@ -489,16 +493,16 @@ msgstr "Login"
msgid "You have to log in before you can register for this event."
msgstr "Je moet inloggen voordat je jezelf kunt aanmelden."
#: templates/events/event.html:13
5
#: templates/events/event.html:13
6
#, python-format
msgid "Registration will open %(datetime)s"
msgstr "Aanmelden opent %(datetime)s"
#: templates/events/event.html:13
7
#: templates/events/event.html:13
8
msgid "Registration is not possible anymore."
msgstr "Aanmelden is niet meer mogelijk."
#: templates/events/event.html:14
7
#: templates/events/event.html:14
8
#, python-format
msgid ""
"Cancellation isn't possible anymore without having to pay the full costs of €"
...
...
@@ -507,16 +511,16 @@ msgstr ""
"Afmelden is niet meer mogelijk zonder de volledige kosten van €%(costs)s te "
"betalen. Let op: je kunt je hierna niet meer aanmelden."
#: templates/events/event.html:16
1
#: templates/events/event.html:16
3
msgctxt "pizzas"
msgid "Order"
msgstr "Bestellen"
#: templates/events/event.html:1
79
#: templates/events/event.html:1
81
msgid "Registrations"
msgstr "Aanmeldingen"
#: templates/events/event.html:21
3
#: templates/events/event.html:21
5
msgid "cohort"
msgstr "cohort"
...
...
@@ -580,28 +584,28 @@ msgstr "Ja"
msgid "[THALIA] Notification about your registration for '{}'"
msgstr "[THALIA] Bericht over je aanmelding voor ‘{}’"
#: views.py:26
0
views.py:27
1
views.py:28
2
#: views.py:26
2
views.py:27
3
views.py:28
6
msgid "Registration successful."
msgstr "Je aanmelding was succesvol."
#: views.py:26
6
#: views.py:26
8
msgid ""
"You cannot re-register anymore since you've cancelled after the deadline."
msgstr ""
"Je kunt je niet opnieuw aanmelden omdat je je hebt afgemeld na de deadline."
#: views.py:2
77
#: views.py:2
81
msgid "You may not register"
msgstr "Je mag niet je aanmelden"
#: views.py:28
5
#: views.py:28
9
msgid "You were already registered."
msgstr "Je bent al aangemeld."
#: views.py:29
4
views.py:30
2
#: views.py:29
8
views.py:30
6
msgid "You are not registered for this event."
msgstr "Je bent niet aangemeld voor dit evenement."
#: views.py:31
3
#: views.py:31
8
msgid "Registration successfully cancelled."
msgstr "Je afmelding was succesvol."
website/events/models.py
View file @
8ce88240
...
...
@@ -210,6 +210,11 @@ class Event(models.Model, metaclass=ModelTranslateMeta):
{
'cancel_deadline'
:
_
(
"If registration is required, you need a deadline for "
"the cancellation"
)})
elif
self
.
cancel_deadline
>
self
.
start
:
errors
.
update
(
{
'cancel_deadline'
:
_
(
"The cancel deadline should be"
" before the start of the event."
)})
if
self
.
registration_start
and
self
.
registration_end
and
(
self
.
registration_start
>=
self
.
registration_end
):
message
=
_
(
'Registration start should be before '
...
...
website/events/tests/test_models.py
View file @
8ce88240
...
...
@@ -100,6 +100,9 @@ class EventTest(TestCase):
self
.
event
.
clean
()
def
test_cancel_deadline_before_registration_start
(
self
):
self
.
event
.
registration_start
=
timezone
.
now
()
self
.
event
.
registration_end
=
(
timezone
.
now
()
+
datetime
.
timedelta
(
hours
=
1
))
self
.
event
.
cancel_deadline
=
(
self
.
event
.
start
+
datetime
.
timedelta
(
hours
=
1
))
with
self
.
assertRaises
(
ValidationError
):
...
...
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