Commit 130dca86 authored by Bram in 't Zandt's avatar Bram in 't Zandt
Browse files

Paid field now displays payment method

parent 48ddcb53
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-11 09:23+0200\n"
"PO-Revision-Date: 2017-09-11 09:24+0200\n"
"POT-Creation-Date: 2017-09-17 12:17+0200\n"
"PO-Revision-Date: 2017-09-17 12:17+0200\n"
"Last-Translator: Joost Rijneveld <joost@joostrijneveld.nl>\n"
"Language-Team: \n"
"Language: nl\n"
......@@ -429,7 +429,23 @@ msgid "Not registered for this event"
msgstr "Niet aangemeld voor dit evenement."
#: templates/events/email.txt:1
#, python-format
#, fuzzy, python-format
#| msgid ""
#| "Hi %(name)s,\n"
#| "\n"
#| "You registered for the event '%(event_title)s' on %(registration_date)s "
#| "and unfortunately you were placed on the waiting list.\n"
#| "However someone just unregistered and we would like to let you know that "
#| "you'll be able to attend now!\n"
#| "\n"
#| "You can find more information about the event on the website: "
#| "%(event_url)s\n"
#| "\n"
#| "We're assuming that you'll be there, but you're still able to unregister "
#| "until %(cancel_deadline)s.\n"
#| "\n"
#| "Best regards,\n"
#| "Study Association Thalia"
msgid ""
"Hi %(name)s,\n"
"\n"
......@@ -438,7 +454,8 @@ msgid ""
"However someone just unregistered and we would like to let you know that "
"you'll be able to attend now!\n"
"\n"
"You can find more information about the event on the website: %(event_url)s\n"
"You can find more information about the event on the website: %(baseurl)s"
"%(event_url)s\n"
"\n"
"We're assuming that you'll be there, but you're still able to unregister "
"until %(cancel_deadline)s.\n"
......@@ -611,7 +628,7 @@ msgctxt "registration status"
msgid "registered"
msgstr "aangemeld"
#: views.py:101 views.py:136
#: views.py:101 views.py:141
msgctxt "registration status"
msgid "late cancellation"
msgstr "te laat afgemeld"
......@@ -626,36 +643,48 @@ msgctxt "registration status"
msgid "waiting"
msgstr "wachtend"
#: views.py:112 views.py:123
#: views.py:112
msgid "Yes"
msgstr "Ja"
#: views.py:238
#: views.py:124
msgid "Cash"
msgstr "Contant"
#: views.py:126
msgid "Pin"
msgstr "Pin"
#: views.py:128
msgid "No"
msgstr "Nee"
#: views.py:246
msgid "[THALIA] Notification about your registration for '{}'"
msgstr "[THALIA] Bericht over je aanmelding voor ‘{}’"
#: views.py:283 views.py:294 views.py:307
#: views.py:291 views.py:302 views.py:315
msgid "Registration successful."
msgstr "Je aanmelding was succesvol."
#: views.py:289
#: views.py:297
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:302
#: views.py:310
msgid "You may not register"
msgstr "Je mag niet je aanmelden"
#: views.py:310
#: views.py:318
msgid "You were already registered."
msgstr "Je bent al aangemeld."
#: views.py:319 views.py:327
#: views.py:327 views.py:335
msgid "You are not registered for this event."
msgstr "Je bent niet aangemeld voor dit evenement."
#: views.py:339
#: views.py:347
msgid "Registration successfully cancelled."
msgstr "Je afmelding was succesvol."
......@@ -120,10 +120,12 @@ def export(request, event_id):
'date cancelled': cancelled,
}
if event.price > 0:
if (registration.payment != 'no_payment'):
data['paid'] = _('Yes')
if (registration.payment == 'cash_payment'):
data['paid'] = _('Cash')
elif (registration.payment == 'pin_payment'):
data['paid'] = _('Pin')
else:
data['paid'] = ''
data['paid'] = _('No')
data.update({field['field'].name: field['value'] for field in
registration.registration_information()})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment