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
284675f9
Verified
Commit
284675f9
authored
Jan 16, 2018
by
Sébastiaan Versteeg
Browse files
Show cancellation dates in event admin
parent
f743ee83
Changes
4
Hide whitespace changes
Inline
Side-by-side
website/events/locale/nl/LC_MESSAGES/django.mo
View file @
284675f9
No preview for this file type
website/events/locale/nl/LC_MESSAGES/django.po
View file @
284675f9
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 201
7-10-11 19:2
2+0
2
00\n"
"PO-Revision-Date: 201
7-10-11 19:34
+0
2
00\n"
"POT-Creation-Date: 201
8-01-16 21:5
2+0
1
00\n"
"PO-Revision-Date: 201
8-01-16 21:53
+0
1
00\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
...
...
@@ -18,27 +18,27 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.0.4\n"
#: admin.py:8
6
#: admin.py:8
3
msgid "Event Date"
msgstr "Evenementdatum"
#: admin.py:9
1
#: admin.py:9
2
msgid "Registration Start"
msgstr "Start Aanmelden"
#: admin.py:9
4
#: admin.py:9
5
msgid "Edit"
msgstr "Aanpassen"
#: admin.py:10
4
#: admin.py:10
5
msgid "Number of participants"
msgstr "Aantal deelnemers"
#: admin.py:10
8
#: admin.py:10
9
msgid "Publish selected events"
msgstr "Publiceer geselecteerde evenementen"
#: admin.py:11
2
#: admin.py:11
3
msgid "Unpublish selected events"
msgstr "Publicatie van geselecteerde evenementen ongedaan maken"
...
...
@@ -111,7 +111,7 @@ msgstr "Pin"
msgid "No"
msgstr "Nee"
#: emails.py:
24
#: emails.py:
30
msgid "[THALIA] Notification about your registration for '{}'"
msgstr "[THALIA] Bericht over je aanmelding voor ‘{}’"
...
...
@@ -155,7 +155,7 @@ msgstr "Geen aanmelding vereist"
msgid "title"
msgstr "titel"
#: models.py:36 models.py:
398
#: models.py:36 models.py:
406
msgid "description"
msgstr "beschrijving"
...
...
@@ -253,131 +253,131 @@ msgstr "Standaard:"
msgid "published"
msgstr "gepubliceerd"
#: models.py:19
2
#: models.py:19
6
msgid "Can't have an event travel back in time"
msgstr "Een evenement kan niet terugreizen in de tijd"
#: models.py:
196
#: models.py:
200
msgid "The fine for this event is too low (must be at least €5)."
msgstr "De boete voor dit evenement is te laag (minimaal €5)."
#: models.py:20
3
#: models.py:20
7
msgid "Doesn't make sense to have this if you require registrations."
msgstr "Het is niet logisch om dit te hebben als je aanmelden vereist."
#: models.py:2
08
#: models.py:2
12
msgid "If registration is required, you need a start of registration"
msgstr ""
"Als aanmelden vereist is, dan heb je een starttijd voor de aanmeldperiode "
"nodig"
#: models.py:21
3
#: models.py:21
7
msgid "If registration is required, you need an end of registration"
msgstr ""
"Als aanmelden vereist is, dan heb je een eindtijd voor de aanmeldperiode "
"nodig"
#: models.py:2
18
#: models.py:2
22
msgid "If registration is required, you need a deadline for the cancellation"
msgstr ""
"Als aanmelden vereist is, dan heb je een eindtijd voor de aanmeldperiode "
"nodig"
#: models.py:22
3
#: models.py:22
7
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:2
27
#: models.py:2
31
msgid "Registration start should be before registration end"
msgstr "De starttijd voor de aanmeldperiode moet voor de eindtijd liggen"
#: models.py:2
36
#: models.py:2
40
msgid "This organiser does not have a contact mailinglist."
msgstr "De organisator heeft geen contact mailinglijst."
#: models.py:2
65
#: models.py:2
74
msgid "No payment"
msgstr "Niet betaald"
#: models.py:2
66
#: models.py:2
75
msgid "Paid with cash"
msgstr "Contant betaald"
#: models.py:2
6
7
#: models.py:27
6
msgid "Paid with card"
msgstr "Pin betaald"
#: models.py:28
0
templates/events/admin/registrations_table.html:6
#: models.py:28
8
templates/events/admin/registrations_table.html:6
msgid "name"
msgstr "naam"
#: models.py:2
82
#: models.py:2
90
msgid "Use this for non-members"
msgstr "Gebruikt dit voor niet-leden"
#: models.py:2
87
#: models.py:2
95 templates/events/admin/registrations_table.html:10
msgid "registration date"
msgstr "aanmelddatum"
#: models.py:2
8
9
#: models.py:29
7 templates/events/admin/registrations_table.html:8
msgid "cancellation date"
msgstr "afmelddatum"
#: models.py:
294
templates/events/admin/registrations_table.html:1
1
#: models.py:
302
templates/events/admin/registrations_table.html:1
5
msgid "present"
msgstr "aanwezig"
#: models.py:30
1
#: models.py:30
9
msgid "payment"
msgstr "betaling"
#: models.py:3
54
models.py:3
55
#: models.py:3
62
models.py:3
63
msgid "Either specify a member or a name"
msgstr "Geef een lid of een naam op"
#: models.py:3
7
8
#: models.py:38
6
msgid "Checkbox"
msgstr "Checkbox"
#: models.py:37
9
#: models.py:3
8
7
msgid "Text"
msgstr "Text"
#: models.py:38
0
#: models.py:38
8
msgid "Integer"
msgstr "Integer"
#: models.py:3
85
#: models.py:3
93
msgid "field type"
msgstr "veldtype"
#: models.py:
392
#: models.py:
400
msgid "field name"
msgstr "veldnaam"
#: models.py:4
04
#: models.py:4
12
msgid "required"
msgstr "verplicht"
#: models.py:4
5
6
#: models.py:46
4
msgid "last changed"
msgstr "laatst aangepast"
#: services.py:8
1
#: services.py:8
2
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."
#: services.py:9
1
#: services.py:9
2
msgid "You were already registered."
msgstr "Je bent al aangemeld."
#: services.py:9
3
#: services.py:9
4
msgid "You may not register."
msgstr "Je mag je niet aanmelden."
#: services.py:12
1
services.py:13
5
services.py:18
6
#: services.py:12
3
services.py:13
7
services.py:18
9
msgid "You are not registered for this event."
msgstr "Je bent niet aangemeld voor dit evenement."
...
...
@@ -446,12 +446,11 @@ msgid "Event properties"
msgstr "Eigenschappen van evenement"
#: templates/events/admin/details.html:64
#: templates/events/admin/registrations_table.html:5
0
#: templates/events/admin/registrations_table.html:5
8
msgid "change"
msgstr "verander"
#: templates/events/admin/details.html:70
#: templates/events/admin/registrations_table.html:7
msgid "date"
msgstr "datum"
...
...
@@ -498,31 +497,31 @@ msgstr ""
"Sommige geregistreerden zijn met de hand toegevoegd, en komen dus niet in de "
"bovenstaande lijst voor:"
#: templates/events/admin/registrations_table.html:1
2
#: templates/events/admin/registrations_table.html:1
6
msgid "not paid"
msgstr "niet betaald"
#: templates/events/admin/registrations_table.html:1
3
#: templates/events/admin/registrations_table.html:1
7
msgid "paid cash"
msgstr "contant betaald"
#: templates/events/admin/registrations_table.html:1
4
#: templates/events/admin/registrations_table.html:1
8
msgid "paid card"
msgstr "pin betaald"
#: templates/events/admin/registrations_table.html:
16
#: templates/events/admin/registrations_table.html:
20
msgid "late"
msgstr "te laat"
#: templates/events/admin/registrations_table.html:2
0
#: templates/events/admin/registrations_table.html:2
4
msgid "add"
msgstr "toevoegen"
#: templates/events/admin/registrations_table.html:
54
#: templates/events/admin/registrations_table.html:
62
msgid "registered"
msgstr "aangemeld"
#: templates/events/admin/registrations_table.html:
55
#: templates/events/admin/registrations_table.html:
63
#, python-format
msgid "Nobody %(verb)s yet"
msgstr "Niemand heeft zich %(verb)s"
...
...
@@ -707,10 +706,6 @@ msgstr "Aanmelding voor %(title)s"
msgid "Save"
msgstr "Opslaan"
#: templates/events/registration.html:38
msgid "Cancel"
msgstr "Annuleer"
#: views.py:73
msgid "Registration successful."
msgstr "Je aanmelding was succesvol."
...
...
@@ -719,10 +714,13 @@ msgstr "Je aanmelding was succesvol."
msgid "Registration successfully cancelled."
msgstr "Je afmelding was succesvol."
#: views.py:1
19
#: views.py:1
20
msgid "Registration successfully saved."
msgstr "Je afmelding is succesvol opgeslagen."
#~ msgid "Cancel"
#~ msgstr "Annuleer"
#~ msgid "Card"
#~ msgstr "Pin"
...
...
website/events/templates/events/admin/details.html
View file @
284675f9
...
...
@@ -45,7 +45,7 @@
{% endif %}
<h2>
{% trans "cancellations"|capfirst %}
</h2>
{% trans "cancelled" as cancelled %}
{% include 'events/admin/registrations_table.html' with registrations=event.cancellations verb=cancelled addlink=False %}
{% include 'events/admin/registrations_table.html' with registrations=event.cancellations
cancellations=True
verb=cancelled addlink=False %}
{% endwith %}
<br>
<a
href=
"{% url 'events:export' event_id=event.pk %}"
class=
"button"
>
{% trans "Export registrations" %}
</a>
...
...
website/events/templates/events/admin/registrations_table.html
View file @
284675f9
...
...
@@ -4,7 +4,10 @@
<thead>
<tr>
<th
scope=
"col"
>
{% trans "name"|capfirst %}
</th>
<th
scope=
"col"
>
{% trans "date"|capfirst %}
</th>
<th
scope=
"col"
>
{% trans "registration date"|capfirst %}
</th>
{% if cancellations %}
<th
scope=
"col"
>
{% trans "cancellation date"|capfirst %}
</th>
{% endif %}
{% for field in fields %}
<th
scope=
"col"
>
{{ field.name }}
</th>
{% endfor %}
...
...
@@ -31,6 +34,9 @@
<td>
{{ registration.name }}
</td>
{% endif %}
<td>
{{ registration.date }}
</td>
{% if cancellations %}
<td>
{{ registration.date_cancelled }}
</td>
{% endif %}
{% for field in registration.information_fields %}
{% if not field.value %}
<td></td>
...
...
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