From 1c7df4d9f76c1c3f1c6a7655a902251c8a54c8eb Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Sat, 4 Nov 2017 11:29:02 +0100 Subject: [PATCH] Manually merge changes from #672 (thanks @koebi!) --- src/pretix/control/templates/pretixcontrol/item/delete.html | 2 +- src/pretix/locale/de/LC_MESSAGES/django.po | 6 +++--- src/pretix/locale/de_Informal/LC_MESSAGES/django.po | 6 +++--- .../templates/pretixplugins/stripe/action_overpaid.html | 2 +- src/pretix/plugins/ticketoutputpdf/ticketoutput.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pretix/control/templates/pretixcontrol/item/delete.html b/src/pretix/control/templates/pretixcontrol/item/delete.html index 0dce6c837d..c2930718a0 100644 --- a/src/pretix/control/templates/pretixcontrol/item/delete.html +++ b/src/pretix/control/templates/pretixcontrol/item/delete.html @@ -18,7 +18,7 @@ {% if possible %}

{% blocktrans %}Are you sure you want to delete the product {{ item }}?{% endblocktrans %}

{% else %} -

{% blocktrans %}You cannot delete the product {{ item }} because it already has been ordered, but you can deactive it.{% endblocktrans %}

+

{% blocktrans %}You cannot delete the product {{ item }} because it already has been ordered, but you can deactivate it.{% endblocktrans %}

{% endif %}
diff --git a/src/pretix/locale/de/LC_MESSAGES/django.po b/src/pretix/locale/de/LC_MESSAGES/django.po index 732058bb71..28d6913a04 100644 --- a/src/pretix/locale/de/LC_MESSAGES/django.po +++ b/src/pretix/locale/de/LC_MESSAGES/django.po @@ -6192,7 +6192,7 @@ msgstr "Möchten Sie das Produkt %(item)s wirklich löschen?" #, python-format msgid "" "You cannot delete the product %(item)s because it already " -"has been ordered, but you can deactive it." +"has been ordered, but you can deactivate it." msgstr "" "Das Produkt %(item)s kann nicht gelöscht werden, da es " "bereits bestellt wurde, aber Sie können es deaktivieren." @@ -9847,7 +9847,7 @@ msgstr "Stripe meldete ein Ereignis: {}" msgid "" "The Stripe transaction %(charge)s has succeeded, but " "the order %(order)s is expired and the product was sold out in the meantime. " -"Therefore, the payment could not be acceped. Please contact the user and " +"Therefore, the payment could not be accepted. Please contact the user and " "refund the money via Stripe's interface." msgstr "" "Die Stripe-Zahlung %(charge)s war erfolgreich, aber " @@ -10327,7 +10327,7 @@ msgid "Invoice address: name" msgstr "Rechnungsadresse: Name" #: pretix/plugins/ticketoutputpdf/ticketoutput.py:133 -msgid "Invocie address: company" +msgid "Invoice address: company" msgstr "Rechnungsadresse: Firma" #: pretix/plugins/ticketoutputpdf/ticketoutput.py:134 diff --git a/src/pretix/locale/de_Informal/LC_MESSAGES/django.po b/src/pretix/locale/de_Informal/LC_MESSAGES/django.po index 727bb054ce..5f9a515ac8 100644 --- a/src/pretix/locale/de_Informal/LC_MESSAGES/django.po +++ b/src/pretix/locale/de_Informal/LC_MESSAGES/django.po @@ -6179,7 +6179,7 @@ msgstr "Möchtest du das Produkt %(item)s wirklich löschen?" #, python-format msgid "" "You cannot delete the product %(item)s because it already " -"has been ordered, but you can deactive it." +"has been ordered, but you can deactivate it." msgstr "" "Das Produkt %(item)s kann nicht gelöscht werden, da es " "bereits bestellt wurde, aber du kannst es deaktivieren." @@ -9825,7 +9825,7 @@ msgstr "Stripe meldete ein Ereignis: {}" msgid "" "The Stripe transaction %(charge)s has succeeded, but " "the order %(order)s is expired and the product was sold out in the meantime. " -"Therefore, the payment could not be acceped. Please contact the user and " +"Therefore, the payment could not be accepted. Please contact the user and " "refund the money via Stripe's interface." msgstr "" "Die Stripe-Zahlung %(charge)s war erfolgreich, aber " @@ -10308,7 +10308,7 @@ msgid "Invoice address: name" msgstr "Rechnungsadresse: Name" #: pretix/plugins/ticketoutputpdf/ticketoutput.py:133 -msgid "Invocie address: company" +msgid "Invoice address: company" msgstr "Rechnungsadresse: Firma" #: pretix/plugins/ticketoutputpdf/ticketoutput.py:134 diff --git a/src/pretix/plugins/stripe/templates/pretixplugins/stripe/action_overpaid.html b/src/pretix/plugins/stripe/templates/pretixplugins/stripe/action_overpaid.html index 1bcbb4e511..8d7d68ba14 100644 --- a/src/pretix/plugins/stripe/templates/pretixplugins/stripe/action_overpaid.html +++ b/src/pretix/plugins/stripe/templates/pretixplugins/stripe/action_overpaid.html @@ -4,7 +4,7 @@ {% url "control:event.order" organizer=event.organizer.slug event=event.slug code=data.order as ourl %} {% blocktrans trimmed with charge=data.charge stripe_href="href='https://dashboard.stripe.com/payments/"|add:data.charge|add:"' target='_blank'"|safe order=""|add:data.order|add:""|safe %} The Stripe transaction {{ charge }} has succeeded, but the order {{ order }} is - expired and the product was sold out in the meantime. Therefore, the payment could not be acceped. Please + expired and the product was sold out in the meantime. Therefore, the payment could not be accepted. Please contact the user and refund the money via Stripe's interface. {% endblocktrans %}

diff --git a/src/pretix/plugins/ticketoutputpdf/ticketoutput.py b/src/pretix/plugins/ticketoutputpdf/ticketoutput.py index 6d81588c43..c5c5f39698 100644 --- a/src/pretix/plugins/ticketoutputpdf/ticketoutput.py +++ b/src/pretix/plugins/ticketoutputpdf/ticketoutput.py @@ -130,7 +130,7 @@ DEFAULT_VARIABLES = OrderedDict(( "evaluate": lambda op, order, ev: order.invoice_address.name if getattr(order, 'invoice_address') else '' }), ("invoice_company", { - "label": _("Invocie address: company"), + "label": _("Invoice address: company"), "editor_sample": _("Sample company"), "evaluate": lambda op, order, ev: order.invoice_address.company if getattr(order, 'invoice_address') else '' }),