CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Merge branch 'master' of github.com:pretix/pretix

Browse Source
This commit is contained in:
Raphael Michel
2020-04-09 09:29:58 +02:00
parent 55539dc8e5 ef303bfcc4
commit ef2a4244ed
11 changed files with 92 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pretix/api/serializers/event.py
View File

@@ -618,6 +618,7 @@ class EventSettingsSerializer(serializers.Serializer):
'cancel_allow_user_paid_keep_fees', 'cancel_allow_user_paid_keep_fees',
'cancel_allow_user_paid_keep_percentage', 'cancel_allow_user_paid_keep_percentage',
'cancel_allow_user_paid_adjust_fees', 'cancel_allow_user_paid_adjust_fees',
'cancel_allow_user_paid_adjust_fees_explanation',
'cancel_allow_user_paid_refund_as_giftcard', 'cancel_allow_user_paid_refund_as_giftcard',
'cancel_allow_user_paid_require_approval', 'cancel_allow_user_paid_require_approval',
] ]

2
src/pretix/base/models/items.py
View File

@@ -1117,7 +1117,7 @@ class Question(LoggedModel):
if self.type == Question.TYPE_CHOICE: if self.type == Question.TYPE_CHOICE:
q = Q(identifier=answer) q = Q(identifier=answer)
if answer.isdigit(): if isinstance(answer, int) or answer.isdigit():
q |= Q(pk=answer) q |= Q(pk=answer)
o = self.options.filter(q).first() o = self.options.filter(q).first()
if not o: if not o:

17
src/pretix/base/settings.py
View File

@@ -966,6 +966,23 @@ DEFAULTS = {
help_text=_("With this option enabled, your customers can choose to get a smaller refund to support you.") help_text=_("With this option enabled, your customers can choose to get a smaller refund to support you.")
) )
}, },
'cancel_allow_user_paid_adjust_fees_explanation': {
'default': LazyI18nString.from_gettext(gettext_noop(
'However, if you want us to help keep the lights on here, please consider using the slider below to '
'request a smaller refund. Thank you!'
)),
'type': LazyI18nString,
'serializer_class': I18nField,
'form_class': I18nFormField,
'form_kwargs': dict(
label=_("Voluntary lower refund explanation"),
widget=I18nTextarea,
widget_kwargs={'attrs': {'rows': '2'}},
help_text=_("This text will be shown in between the explanation of how the refunds work and the slider "
"which your customers can use to choose the amount they would like to receive. You can use it "
"e.g. to explain choosing a lower refund will help your organisation.")
)
},
'cancel_allow_user_paid_require_approval': { 'cancel_allow_user_paid_require_approval': {
'default': 'False', 'default': 'False',
'type': bool, 'type': bool,

1
src/pretix/control/forms/event.py
View File

@@ -572,6 +572,7 @@ class CancelSettingsForm(SettingsForm):
'cancel_allow_user_paid_keep_fees', 'cancel_allow_user_paid_keep_fees',
'cancel_allow_user_paid_keep_percentage', 'cancel_allow_user_paid_keep_percentage',
'cancel_allow_user_paid_adjust_fees', 'cancel_allow_user_paid_adjust_fees',
'cancel_allow_user_paid_adjust_fees_explanation',
'cancel_allow_user_paid_refund_as_giftcard', 'cancel_allow_user_paid_refund_as_giftcard',
'cancel_allow_user_paid_require_approval', 'cancel_allow_user_paid_require_approval',
] ]

3
src/pretix/control/templates/pretixcontrol/event/cancel.html
View File

@@ -21,6 +21,9 @@
{% bootstrap_field form.cancel_allow_user_paid_keep_fees layout="control" %} {% bootstrap_field form.cancel_allow_user_paid_keep_fees layout="control" %}
{% bootstrap_field form.cancel_allow_user_paid_until layout="control" %} {% bootstrap_field form.cancel_allow_user_paid_until layout="control" %}
{% bootstrap_field form.cancel_allow_user_paid_adjust_fees layout="control" %} {% bootstrap_field form.cancel_allow_user_paid_adjust_fees layout="control" %}
<div data-display-dependency="#id_cancel_allow_user_paid_adjust_fees">
{% bootstrap_field form.cancel_allow_user_paid_adjust_fees_explanation layout="control" %}
</div>
{% bootstrap_field form.cancel_allow_user_paid_refund_as_giftcard layout="control" %} {% bootstrap_field form.cancel_allow_user_paid_refund_as_giftcard layout="control" %}
{% if not gets_notification %} {% if not gets_notification %}
<div class="alert alert-warning"> <div class="alert alert-warning">

4
src/pretix/locale/de/LC_MESSAGES/djangojs.po
View File

@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-02 16:17+0000\n" "POT-Creation-Date: 2020-04-02 16:17+0000\n"
"PO-Revision-Date: 2020-03-31 11:34+0000\n" "PO-Revision-Date: 2020-04-08 13:48+0000\n"
"Last-Translator: Martin Gross <martin@pc-coholic.de>\n" "Last-Translator: Martin Gross <martin@pc-coholic.de>\n"
"Language-Team: German <https://translate.pretix.eu/projects/pretix/pretix-js/" "Language-Team: German <https://translate.pretix.eu/projects/pretix/pretix-js/"
"de/>\n" "de/>\n"
@@ -284,7 +284,7 @@ msgstr "Bitte tragen Sie eine Menge für eines der Produkte ein."
#: pretix/static/pretixpresale/js/ui/main.js:330 #: pretix/static/pretixpresale/js/ui/main.js:330
msgid "The organizer keeps %(currency)s %(amount)s" msgid "The organizer keeps %(currency)s %(amount)s"
msgstr "Der Veranstalter behält %(currency)s %(price)s ein" msgstr "Der Veranstalter behält %(currency)s %(amount)s ein"
#: pretix/static/pretixpresale/js/ui/main.js:338 #: pretix/static/pretixpresale/js/ui/main.js:338
msgid "You get %(currency)s %(amount)s back" msgid "You get %(currency)s %(amount)s back"

4
src/pretix/locale/de_Informal/LC_MESSAGES/djangojs.po
View File

@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-02 16:17+0000\n" "POT-Creation-Date: 2020-04-02 16:17+0000\n"
"PO-Revision-Date: 2020-03-31 11:34+0000\n" "PO-Revision-Date: 2020-04-08 13:48+0000\n"
"Last-Translator: Martin Gross <martin@pc-coholic.de>\n" "Last-Translator: Martin Gross <martin@pc-coholic.de>\n"
"Language-Team: German (informal) <https://translate.pretix.eu/projects/" "Language-Team: German (informal) <https://translate.pretix.eu/projects/"
"pretix/pretix-js/de_Informal/>\n" "pretix/pretix-js/de_Informal/>\n"
@@ -283,7 +283,7 @@ msgstr "Bitte trage eine Menge für eines der Produkte ein."
#: pretix/static/pretixpresale/js/ui/main.js:330 #: pretix/static/pretixpresale/js/ui/main.js:330
msgid "The organizer keeps %(currency)s %(amount)s" msgid "The organizer keeps %(currency)s %(amount)s"
msgstr "Der Veranstalter behält %(currency)s %(price)s ein" msgstr "Der Veranstalter behält %(currency)s %(amount)s ein"
#: pretix/static/pretixpresale/js/ui/main.js:338 #: pretix/static/pretixpresale/js/ui/main.js:338
msgid "You get %(currency)s %(amount)s back" msgid "You get %(currency)s %(amount)s back"

83
src/pretix/locale/nl/LC_MESSAGES/django.po
View File

@@ -7,10 +7,10 @@ msgstr ""
"Project-Id-Version: 1\n" "Project-Id-Version: 1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-02 16:16+0000\n" "POT-Creation-Date: 2020-04-02 16:16+0000\n"
"PO-Revision-Date: 2020-04-02 05:00+0000\n" "PO-Revision-Date: 2020-04-08 13:48+0000\n"
"Last-Translator: Maarten van den Berg <maartenberg1@gmail.com>\n" "Last-Translator: Maarten van den Berg <maartenberg1@gmail.com>\n"
"Language-Team: Dutch <https://translate.pretix.eu/projects/pretix/pretix/nl/" "Language-Team: Dutch <https://translate.pretix.eu/projects/pretix/pretix/nl/>"
">\n" "\n"
"Language: nl\n" "Language: nl\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@@ -1229,10 +1229,8 @@ msgid "Event start date"
msgstr "Startdatum van het evenement" msgstr "Startdatum van het evenement"
#: pretix/base/exporters/orderlist.py:715 #: pretix/base/exporters/orderlist.py:715
#, fuzzy
#| msgid "Redemptions"
msgid "Giftcard Redemptions" msgid "Giftcard Redemptions"
msgstr "Verzilveringen" msgstr "Cadeaubonverzilveringen"
#: pretix/base/exporters/orderlist.py:732 pretix/base/models/giftcards.py:53 #: pretix/base/exporters/orderlist.py:732 pretix/base/models/giftcards.py:53
#: pretix/control/templates/pretixcontrol/giftcards/checkout.html:10 #: pretix/control/templates/pretixcontrol/giftcards/checkout.html:10
@@ -3706,10 +3704,8 @@ msgstr "E-mailadres van aanwezige"
#: pretix/control/templates/pretixcontrol/order/index.html:401 #: pretix/control/templates/pretixcontrol/order/index.html:401
#: pretix/presale/templates/pretixpresale/event/fragment_cart.html:78 #: pretix/presale/templates/pretixpresale/event/fragment_cart.html:78
#: pretix/presale/templates/pretixpresale/event/fragment_cart.html:81 #: pretix/presale/templates/pretixpresale/event/fragment_cart.html:81
#, fuzzy
#| msgid "Attendee badges"
msgid "Attendee address" msgid "Attendee address"
msgstr "Badges van gasten" msgstr "Adres van gast"
#: pretix/base/orderimport.py:497 #: pretix/base/orderimport.py:497
msgid "Calculate from product" msgid "Calculate from product"
@@ -4227,10 +4223,8 @@ msgstr "Voorbeeldstad"
#: pretix/control/templates/pretixcontrol/order/index.html:393 #: pretix/control/templates/pretixcontrol/order/index.html:393
#: pretix/presale/templates/pretixpresale/event/fragment_cart.html:68 #: pretix/presale/templates/pretixpresale/event/fragment_cart.html:68
#: pretix/presale/templates/pretixpresale/event/fragment_cart.html:71 #: pretix/presale/templates/pretixpresale/event/fragment_cart.html:71
#, fuzzy
#| msgid "Attendee email"
msgid "Attendee company" msgid "Attendee company"
msgstr "E-mailadres van aanwezige" msgstr "Bedrijf van gast"
#: pretix/base/pdf.py:214 #: pretix/base/pdf.py:214
msgid "List of Add-Ons" msgid "List of Add-Ons"
@@ -5204,28 +5198,20 @@ msgstr ""
"instelling." "instelling."
#: pretix/base/settings.py:114 #: pretix/base/settings.py:114
#, fuzzy
#| msgid "Ask for email addresses per ticket"
msgid "Ask for company per ticket" msgid "Ask for company per ticket"
msgstr "Vraag om e-mailadressen per ticket" msgstr "Vraag om bedrijf per ticket"
#: pretix/base/settings.py:123 #: pretix/base/settings.py:123
#, fuzzy
#| msgid "Require email addresses per ticket"
msgid "Require company per ticket" msgid "Require company per ticket"
msgstr "Verplicht e-mailadressen per ticket" msgstr "Verplicht bedrijf per ticket"
#: pretix/base/settings.py:133 #: pretix/base/settings.py:133
#, fuzzy
#| msgid "Ask for email addresses per ticket"
msgid "Ask for postal addresses per ticket" msgid "Ask for postal addresses per ticket"
msgstr "Vraag om e-mailadressen per ticket" msgstr "Vraag om postadres per ticket"
#: pretix/base/settings.py:142 #: pretix/base/settings.py:142
#, fuzzy
#| msgid "Require email addresses per ticket"
msgid "Require postal addresses per ticket" msgid "Require postal addresses per ticket"
msgstr "Verplicht e-mailadressen per ticket" msgstr "Verplicht postadres per ticket"
#: pretix/base/settings.py:152 #: pretix/base/settings.py:152
msgid "Ask for the order email address twice" msgid "Ask for the order email address twice"
@@ -5772,14 +5758,12 @@ msgstr ""
"aan de volgende persoon op de lijst." "aan de volgende persoon op de lijst."
#: pretix/base/settings.py:823 #: pretix/base/settings.py:823
#, fuzzy
#| msgid "Reminder to download tickets"
msgid "Allow users to download tickets" msgid "Allow users to download tickets"
msgstr "Herinnering om tickets te downloaden" msgstr "Sta gebruikers toe om tickets te downloaden"
#: pretix/base/settings.py:824 #: pretix/base/settings.py:824
msgid "If this is off, nobody can download a ticket." msgid "If this is off, nobody can download a ticket."
msgstr "" msgstr "Als dit is uitgeschakeld kan niemand een ticket downloaden."
#: pretix/base/settings.py:833 #: pretix/base/settings.py:833
msgid "Download date" msgid "Download date"
@@ -5797,10 +5781,8 @@ msgstr ""
"de datums het toestaat." "de datums het toestaat."
#: pretix/base/settings.py:845 #: pretix/base/settings.py:845
#, fuzzy
#| msgid "Generate tickets for non-admission products"
msgid "Generate tickets for add-on products" msgid "Generate tickets for add-on products"
msgstr "Genereer tickets voor producten die geen toegangsbewijs zijn" msgstr "Genereer tickets voor add-onproducten"
#: pretix/base/settings.py:846 #: pretix/base/settings.py:846
msgid "" msgid ""
@@ -5808,12 +5790,13 @@ msgid ""
"for add-on products. With this option, a separate ticket is issued for every " "for add-on products. With this option, a separate ticket is issued for every "
"add-on product as well." "add-on product as well."
msgstr "" msgstr ""
"Standaard worden tickets alleen gegenereerd voor individueel geselecteerde "
"producten, en niet voor add-onproducten. Als deze optie is ingeschakeld "
"wordt er ook een ticket gegenereerd voor elk add-onproduct."
#: pretix/base/settings.py:858 #: pretix/base/settings.py:858
#, fuzzy
#| msgid "Generate tickets for non-admission products"
msgid "Generate tickets for all products" msgid "Generate tickets for all products"
msgstr "Genereer tickets voor producten die geen toegangsbewijs zijn" msgstr "Genereer tickets voor alle producten"
#: pretix/base/settings.py:859 #: pretix/base/settings.py:859
msgid "" msgid ""
@@ -5821,18 +5804,22 @@ msgid ""
"\"admission ticket\"in the product settings. You can also turn off tickt " "\"admission ticket\"in the product settings. You can also turn off tickt "
"issuing in every product separately." "issuing in every product separately."
msgstr "" msgstr ""
"Als deze optie is uitgeschakeld worden er alleen tickets gegenereerd voor "
"producten die zijn aangemerkt als \"toegangsbewijs\" in de "
"productinstellingen. U kunt het genereren van tickets ook voor een specifiek "
"product uitschakelen."
#: pretix/base/settings.py:871 #: pretix/base/settings.py:871
#, fuzzy
#| msgid "Generate tickets for non-admission products"
msgid "Generate tickets for pending orders" msgid "Generate tickets for pending orders"
msgstr "Genereer tickets voor producten die geen toegangsbewijs zijn" msgstr "Genereer tickets voor openstaande bestellingen"
#: pretix/base/settings.py:872 #: pretix/base/settings.py:872
msgid "" msgid ""
"If turned off, ticket downloads are only possible after an order has been " "If turned off, ticket downloads are only possible after an order has been "
"marked as paid." "marked as paid."
msgstr "" msgstr ""
"Als dit is uitgeschakeld is het alleen mogelijk om tickets te downloaden "
"nadat een bestelling is betaald."
#: pretix/base/settings.py:891 #: pretix/base/settings.py:891
msgid "Last date of modifications" msgid "Last date of modifications"
@@ -6657,22 +6644,16 @@ msgid "This will remove all email addresses from the waiting list."
msgstr "Dit zal alle e-mailadressen van de wachtlijst verwijderen." msgstr "Dit zal alle e-mailadressen van de wachtlijst verwijderen."
#: pretix/base/shredder.py:198 #: pretix/base/shredder.py:198
#, fuzzy
#| msgid "Attendee name"
msgid "Attendee info" msgid "Attendee info"
msgstr "Naam van aanwezige" msgstr "Gegevens van gasten"
#: pretix/base/shredder.py:200 #: pretix/base/shredder.py:200
#, fuzzy
#| msgid ""
#| "This will remove all attendee names from order positions, as well as "
#| "logged changes to them."
msgid "" msgid ""
"This will remove all attendee names and postal addresses from order " "This will remove all attendee names and postal addresses from order "
"positions, as well as logged changes to them." "positions, as well as logged changes to them."
msgstr "" msgstr ""
"Dit zal alle namen van gasten op bestelde tickets verwijderen, samen met " "Dit zal alle namen en postadressen van gasten op bestelde tickets "
"opgeslagen veranderingen hieraan." "verwijderen, samen met opgeslagen veranderingen hieraan."
#: pretix/base/shredder.py:254 #: pretix/base/shredder.py:254
msgid "Invoice addresses" msgid "Invoice addresses"
@@ -6900,10 +6881,8 @@ msgid "at"
msgstr "op" msgstr "op"
#: pretix/base/ticketoutput.py:145 #: pretix/base/ticketoutput.py:145
#, fuzzy
#| msgid "Enable test mode"
msgid "Enable ticket format" msgid "Enable ticket format"
msgstr "Testmodus inschakelen" msgstr "Ticketformaat inschakelen"
#: pretix/base/ticketoutput.py:163 #: pretix/base/ticketoutput.py:163
msgid "Download ticket" msgid "Download ticket"
@@ -11664,10 +11643,8 @@ msgstr ""
"meerdere uitvoerplug-ins." "meerdere uitvoerplug-ins."
#: pretix/control/templates/pretixcontrol/event/tickets.html:61 #: pretix/control/templates/pretixcontrol/event/tickets.html:61
#, fuzzy
#| msgid "Download ticket"
msgid "Download time" msgid "Download time"
msgstr "Download ticket" msgstr "Downloadtijd"
#: pretix/control/templates/pretixcontrol/event/widget.html:10 #: pretix/control/templates/pretixcontrol/event/widget.html:10
msgid "" msgid ""
@@ -19106,7 +19083,7 @@ msgstr ""
#: pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/form.html:14 #: pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/form.html:14
msgid "Open Layout Designer" msgid "Open Layout Designer"
msgstr "" msgstr "Open layout-designer"
#: pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/form.html:18 #: pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/form.html:18
msgid "Advanced mode (multiple layouts)" msgid "Advanced mode (multiple layouts)"

79
src/pretix/locale/nl_Informal/LC_MESSAGES/django.po
View File

@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-03-31 10:46+0000\n" "POT-Creation-Date: 2020-03-31 10:46+0000\n"
"PO-Revision-Date: 2020-04-02 12:41+0000\n" "PO-Revision-Date: 2020-04-08 13:48+0000\n"
"Last-Translator: Maarten van den Berg <maartenberg1@gmail.com>\n" "Last-Translator: Maarten van den Berg <maartenberg1@gmail.com>\n"
"Language-Team: Dutch (informal) <https://translate.pretix.eu/projects/pretix/" "Language-Team: Dutch (informal) <https://translate.pretix.eu/projects/pretix/"
"pretix/nl_Informal/>\n" "pretix/nl_Informal/>\n"
@@ -1230,10 +1230,8 @@ msgid "Event start date"
msgstr "Startdatum van het evenement" msgstr "Startdatum van het evenement"
#: pretix/base/exporters/orderlist.py:715 #: pretix/base/exporters/orderlist.py:715
#, fuzzy
#| msgid "Redemptions"
msgid "Giftcard Redemptions" msgid "Giftcard Redemptions"
msgstr "Verzilveringen" msgstr "Cadeaubonverzilveringen"
#: pretix/base/exporters/orderlist.py:732 pretix/base/models/giftcards.py:53 #: pretix/base/exporters/orderlist.py:732 pretix/base/models/giftcards.py:53
#: pretix/control/templates/pretixcontrol/giftcards/checkout.html:10 #: pretix/control/templates/pretixcontrol/giftcards/checkout.html:10
@@ -3706,10 +3704,8 @@ msgstr "E-mailadres van gast"
#: pretix/control/templates/pretixcontrol/order/index.html:401 #: pretix/control/templates/pretixcontrol/order/index.html:401
#: pretix/presale/templates/pretixpresale/event/fragment_cart.html:78 #: pretix/presale/templates/pretixpresale/event/fragment_cart.html:78
#: pretix/presale/templates/pretixpresale/event/fragment_cart.html:81 #: pretix/presale/templates/pretixpresale/event/fragment_cart.html:81
#, fuzzy
#| msgid "Attendee badges"
msgid "Attendee address" msgid "Attendee address"
msgstr "Badges van gasten" msgstr "Adres van gast"
#: pretix/base/orderimport.py:497 #: pretix/base/orderimport.py:497
msgid "Calculate from product" msgid "Calculate from product"
@@ -4226,10 +4222,8 @@ msgstr "Voorbeeldstad"
#: pretix/control/templates/pretixcontrol/order/index.html:393 #: pretix/control/templates/pretixcontrol/order/index.html:393
#: pretix/presale/templates/pretixpresale/event/fragment_cart.html:68 #: pretix/presale/templates/pretixpresale/event/fragment_cart.html:68
#: pretix/presale/templates/pretixpresale/event/fragment_cart.html:71 #: pretix/presale/templates/pretixpresale/event/fragment_cart.html:71
#, fuzzy
#| msgid "Attendee email"
msgid "Attendee company" msgid "Attendee company"
msgstr "E-mailadres van gast" msgstr "Bedrijf van gast"
#: pretix/base/pdf.py:214 #: pretix/base/pdf.py:214
msgid "List of Add-Ons" msgid "List of Add-Ons"
@@ -5203,28 +5197,20 @@ msgstr ""
"instelling." "instelling."
#: pretix/base/settings.py:114 #: pretix/base/settings.py:114
#, fuzzy
#| msgid "Ask for email addresses per ticket"
msgid "Ask for company per ticket" msgid "Ask for company per ticket"
msgstr "Vraag om e-mailadressen per kaartje" msgstr "Vraag om bedrijf per kaartje"
#: pretix/base/settings.py:123 #: pretix/base/settings.py:123
#, fuzzy
#| msgid "Require email addresses per ticket"
msgid "Require company per ticket" msgid "Require company per ticket"
msgstr "Verplicht e-mailadressen per kaartje" msgstr "Verplicht bedrijf per kaartje"
#: pretix/base/settings.py:133 #: pretix/base/settings.py:133
#, fuzzy
#| msgid "Ask for email addresses per ticket"
msgid "Ask for postal addresses per ticket" msgid "Ask for postal addresses per ticket"
msgstr "Vraag om e-mailadressen per kaartje" msgstr "Vraag om postadres per kaartje"
#: pretix/base/settings.py:142 #: pretix/base/settings.py:142
#, fuzzy
#| msgid "Require email addresses per ticket"
msgid "Require postal addresses per ticket" msgid "Require postal addresses per ticket"
msgstr "Verplicht e-mailadressen per kaartje" msgstr "Verplicht postadres per kaartje"
#: pretix/base/settings.py:152 #: pretix/base/settings.py:152
msgid "Ask for the order email address twice" msgid "Ask for the order email address twice"
@@ -5771,14 +5757,12 @@ msgstr ""
"aan de volgende persoon op de lijst." "aan de volgende persoon op de lijst."
#: pretix/base/settings.py:823 #: pretix/base/settings.py:823
#, fuzzy
#| msgid "Reminder to download tickets"
msgid "Allow users to download tickets" msgid "Allow users to download tickets"
msgstr "Herinnering om kaartjes te downloaden" msgstr "Sta gebruikers toe om kaartjes te downloaden"
#: pretix/base/settings.py:824 #: pretix/base/settings.py:824
msgid "If this is off, nobody can download a ticket." msgid "If this is off, nobody can download a ticket."
msgstr "" msgstr "Als dit is uitgeschakeld kan niemand een kaartje downloaden."
#: pretix/base/settings.py:833 #: pretix/base/settings.py:833
msgid "Download date" msgid "Download date"
@@ -5796,10 +5780,8 @@ msgstr ""
"van de datums het toestaat." "van de datums het toestaat."
#: pretix/base/settings.py:845 #: pretix/base/settings.py:845
#, fuzzy
#| msgid "Generate tickets for non-admission products"
msgid "Generate tickets for add-on products" msgid "Generate tickets for add-on products"
msgstr "Genereer kaartjes voor producten die geen toegangsbewijs zijn" msgstr "Genereer kaartjes voor add-onproducten"
#: pretix/base/settings.py:846 #: pretix/base/settings.py:846
msgid "" msgid ""
@@ -5807,12 +5789,13 @@ msgid ""
"for add-on products. With this option, a separate ticket is issued for every " "for add-on products. With this option, a separate ticket is issued for every "
"add-on product as well." "add-on product as well."
msgstr "" msgstr ""
"Standaard worden kaartjes alleen gegenereerd voor individueel geselecteerde "
"producten, en niet voor add-onproducten. Als deze optie is ingeschakeld "
"wordt er ook een kaartje gegenereerd voor elk add-onproduct."
#: pretix/base/settings.py:858 #: pretix/base/settings.py:858
#, fuzzy
#| msgid "Generate tickets for non-admission products"
msgid "Generate tickets for all products" msgid "Generate tickets for all products"
msgstr "Genereer kaartjes voor producten die geen toegangsbewijs zijn" msgstr "Genereer kaartjes voor alle producten"
#: pretix/base/settings.py:859 #: pretix/base/settings.py:859
msgid "" msgid ""
@@ -5820,18 +5803,22 @@ msgid ""
"\"admission ticket\"in the product settings. You can also turn off tickt " "\"admission ticket\"in the product settings. You can also turn off tickt "
"issuing in every product separately." "issuing in every product separately."
msgstr "" msgstr ""
"Als deze optie is uitgeschakeld worden er alleen kaartjes gegenereerd voor "
"producten die zijn aangemerkt als \"toegangsbewijs\" in de "
"productinstellingen. Je kan het genereren van tickets ook voor een specifiek "
"product uitschakelen."
#: pretix/base/settings.py:871 #: pretix/base/settings.py:871
#, fuzzy
#| msgid "Generate tickets for non-admission products"
msgid "Generate tickets for pending orders" msgid "Generate tickets for pending orders"
msgstr "Genereer kaartjes voor producten die geen toegangsbewijs zijn" msgstr "Genereer kaartjes voor openstaande bestellingen"
#: pretix/base/settings.py:872 #: pretix/base/settings.py:872
msgid "" msgid ""
"If turned off, ticket downloads are only possible after an order has been " "If turned off, ticket downloads are only possible after an order has been "
"marked as paid." "marked as paid."
msgstr "" msgstr ""
"Als dit is uitgeschakeld is het alleen mogelijk om kaartjes te downloaden "
"nadat een bestelling is betaald."
#: pretix/base/settings.py:891 #: pretix/base/settings.py:891
msgid "Last date of modifications" msgid "Last date of modifications"
@@ -6649,22 +6636,16 @@ msgid "This will remove all email addresses from the waiting list."
msgstr "Dit zal alle e-mailadressen van de wachtlijst verwijderen." msgstr "Dit zal alle e-mailadressen van de wachtlijst verwijderen."
#: pretix/base/shredder.py:198 #: pretix/base/shredder.py:198
#, fuzzy
#| msgid "Attendee name"
msgid "Attendee info" msgid "Attendee info"
msgstr "Naam van gast" msgstr "Gegevens van gasten"
#: pretix/base/shredder.py:200 #: pretix/base/shredder.py:200
#, fuzzy
#| msgid ""
#| "This will remove all attendee names from order positions, as well as "
#| "logged changes to them."
msgid "" msgid ""
"This will remove all attendee names and postal addresses from order " "This will remove all attendee names and postal addresses from order "
"positions, as well as logged changes to them." "positions, as well as logged changes to them."
msgstr "" msgstr ""
"Dit zal alle namen van gasten op bestelde kaartjes verwijderen, samen met " "Dit zal alle namen en postadressen van gasten op bestelde kaartjes "
"opgeslagen veranderingen hieraan." "verwijderen, samen met opgeslagen veranderingen hieraan."
#: pretix/base/shredder.py:254 #: pretix/base/shredder.py:254
msgid "Invoice addresses" msgid "Invoice addresses"
@@ -6892,10 +6873,8 @@ msgid "at"
msgstr "op" msgstr "op"
#: pretix/base/ticketoutput.py:145 #: pretix/base/ticketoutput.py:145
#, fuzzy
#| msgid "Enable test mode"
msgid "Enable ticket format" msgid "Enable ticket format"
msgstr "Testmodus inschakelen" msgstr "Ticketformaat inschakelen"
#: pretix/base/ticketoutput.py:163 #: pretix/base/ticketoutput.py:163
msgid "Download ticket" msgid "Download ticket"
@@ -11655,10 +11634,8 @@ msgstr ""
"meerdere uitvoerplug-ins." "meerdere uitvoerplug-ins."
#: pretix/control/templates/pretixcontrol/event/tickets.html:61 #: pretix/control/templates/pretixcontrol/event/tickets.html:61
#, fuzzy
#| msgid "Download ticket"
msgid "Download time" msgid "Download time"
msgstr "Download kaartje" msgstr "Downloadtijd"
#: pretix/control/templates/pretixcontrol/event/widget.html:10 #: pretix/control/templates/pretixcontrol/event/widget.html:10
msgid "" msgid ""
@@ -19102,7 +19079,7 @@ msgstr ""
#: pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/form.html:14 #: pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/form.html:14
msgid "Open Layout Designer" msgid "Open Layout Designer"
msgstr "" msgstr "Open layout-designer"
#: pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/form.html:18 #: pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/form.html:18
msgid "Advanced mode (multiple layouts)" msgid "Advanced mode (multiple layouts)"

9
src/pretix/locale/nl_Informal/LC_MESSAGES/djangojs.po
View File

@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-02 16:17+0000\n" "POT-Creation-Date: 2020-04-02 16:17+0000\n"
"PO-Revision-Date: 2019-12-16 04:00+0000\n" "PO-Revision-Date: 2020-04-08 13:48+0000\n"
"Last-Translator: Maarten van den Berg <maartenberg1@gmail.com>\n" "Last-Translator: Maarten van den Berg <maartenberg1@gmail.com>\n"
"Language-Team: Dutch (informal) <https://translate.pretix.eu/projects/pretix/" "Language-Team: Dutch (informal) <https://translate.pretix.eu/projects/pretix/"
"pretix-js/nl_Informal/>\n" "pretix-js/nl_Informal/>\n"
@@ -280,11 +280,8 @@ msgid "Please enter a quantity for one of the ticket types."
msgstr "Voer een hoeveelheid voor een van de producten in." msgstr "Voer een hoeveelheid voor een van de producten in."
#: pretix/static/pretixpresale/js/ui/main.js:330 #: pretix/static/pretixpresale/js/ui/main.js:330
#, fuzzy
#| msgctxt "widget"
#| msgid "from %(currency)s %(price)s"
msgid "The organizer keeps %(currency)s %(amount)s" msgid "The organizer keeps %(currency)s %(amount)s"
msgstr "vanaf %(currency)s %(price)s" msgstr "De organisator houdt %(currency)s %(amount)s"
#: pretix/static/pretixpresale/js/ui/main.js:338 #: pretix/static/pretixpresale/js/ui/main.js:338
msgid "You get %(currency)s %(amount)s back" msgid "You get %(currency)s %(amount)s back"
@@ -292,7 +289,7 @@ msgstr "Jij krijgt %(currency)s %(amount)s terug"
#: pretix/static/pretixpresale/js/ui/main.js:354 #: pretix/static/pretixpresale/js/ui/main.js:354
msgid "Please enter the amount the organizer can keep." msgid "Please enter the amount the organizer can keep."
msgstr "" msgstr "Voer het bedrag in dat de organisator mag houden."
#: pretix/static/pretixpresale/js/widget/widget.js:17 #: pretix/static/pretixpresale/js/widget/widget.js:17
msgctxt "widget" msgctxt "widget"

5
src/pretix/presale/templates/pretixpresale/event/order_cancel.html
View File

@@ -3,6 +3,7 @@
{% load money %} {% load money %}
{% load eventurl %} {% load eventurl %}
{% load l10n %} {% load l10n %}
{% load rich_text %}
{% block title %}{% trans "Cancel order" %}{% endblock %} {% block title %}{% trans "Cancel order" %}{% endblock %}
{% block content %} {% block content %}
<h2> <h2>
@@ -48,7 +49,9 @@
If you want, you can request a full refund. If you want, you can request a full refund.
{% endblocktrans %} {% endblocktrans %}
{% endif %} {% endif %}
{% trans "However, if you want us to help keep the lights on here, please consider using the slider below to request a smaller refund. Thank you!" %} </p>
<p>
{{ request.event.settings.cancel_allow_user_paid_adjust_fees_explanation|rich_text }}
</p> </p>
<div class="cancel-fee-slider"> <div class="cancel-fee-slider">
<div id="cancel-fee-keep">Enter how much we can keep:</div> <div id="cancel-fee-keep">Enter how much we can keep:</div>