diff --git a/src/pretix/base/services/invoices.py b/src/pretix/base/services/invoices.py index 5110893b81..1aea794957 100644 --- a/src/pretix/base/services/invoices.py +++ b/src/pretix/base/services/invoices.py @@ -214,8 +214,8 @@ def _invoice_generate_german(invoice, f): textobject.textLine(str(invoice.event.name)) if invoice.event.settings.show_date_to: textobject.textLines( - _('%s\nuntil %s') % (invoice.event.get_date_from_display(), - invoice.event.get_date_to_display())) + _('{from_date}\nuntil {to_date}').format(from_date=invoice.event.get_date_from_display(), + to_date=invoice.event.get_date_to_display())) else: textobject.textLine(invoice.event.get_date_from_display()) canvas.drawText(textobject) diff --git a/src/pretix/locale/de/LC_MESSAGES/django.po b/src/pretix/locale/de/LC_MESSAGES/django.po index 72d055c889..786a6baa06 100644 --- a/src/pretix/locale/de/LC_MESSAGES/django.po +++ b/src/pretix/locale/de/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: 1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-15 16:08+0000\n" -"PO-Revision-Date: 2016-03-15 17:10+0100\n" +"POT-Creation-Date: 2016-03-15 16:16+0000\n" +"PO-Revision-Date: 2016-03-15 17:17+0100\n" "Last-Translator: Raphael Michel \n" "Language-Team: Raphael Michel \n" "Language: de\n" @@ -971,13 +971,13 @@ msgid "Order date" msgstr "Bestelldatum" #: pretix/base/services/invoices.py:217 -#, python-format +#, python-brace-format msgid "" -"%s\n" -"until %s" +"{from_date}\n" +"until {to_date}" msgstr "" -"%s\n" -"bis %s" +"{from_date}\n" +"bis {to_date}" #: pretix/base/services/invoices.py:244 msgctxt "invoice" @@ -1030,11 +1030,11 @@ msgid "Tax" msgstr "Steuer" #: pretix/base/services/mail.py:64 -#, python-format -msgid "You are receiving this e-mail because you placed an order for %s." +#, python-brace-format +msgid "You are receiving this e-mail because you placed an order for {event}." msgstr "" -"Sie erhalten diese E-Mail, weil Sie eine Bestellung für die Veranstaltung %s " -"getätigt haben." +"Sie erhalten diese E-Mail, weil Sie eine Bestellung für die Veranstaltung " +"{event} getätigt haben." #: pretix/base/services/orders.py:29 msgid "" @@ -4105,6 +4105,13 @@ msgstr "Deutsch" msgid "German (informal)" msgstr "Deutsch (Du)" +#~ msgid "" +#~ "%s\n" +#~ "until %s" +#~ msgstr "" +#~ "%s\n" +#~ "bis %s" + #~ msgid "Order process settings" #~ msgstr "Bestellzeile" diff --git a/src/pretix/locale/de_Informal/LC_MESSAGES/django.po b/src/pretix/locale/de_Informal/LC_MESSAGES/django.po index a0894639cc..3db67f7f55 100644 --- a/src/pretix/locale/de_Informal/LC_MESSAGES/django.po +++ b/src/pretix/locale/de_Informal/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: 1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-15 16:08+0000\n" -"PO-Revision-Date: 2016-03-15 17:11+0100\n" +"POT-Creation-Date: 2016-03-15 16:16+0000\n" +"PO-Revision-Date: 2016-03-15 17:17+0100\n" "Last-Translator: Raphael Michel \n" "Language-Team: Raphael Michel \n" "Language: de\n" @@ -775,7 +775,6 @@ msgid "Percentage" msgstr "Prozentsatz" #: pretix/base/payment.py:130 -#, fuzzy msgid "Calculate the fee from the total value including the fee." msgstr "Berechne die Gebühr als Anteil vom Endbetrag." @@ -973,13 +972,13 @@ msgid "Order date" msgstr "Bestelldatum" #: pretix/base/services/invoices.py:217 -#, python-format +#, python-brace-format msgid "" -"%s\n" -"until %s" +"{from_date}\n" +"until {to_date}" msgstr "" -"%s\n" -"bis %s" +"{from_date}\n" +"bis {to_date}" #: pretix/base/services/invoices.py:244 msgctxt "invoice" @@ -1032,11 +1031,11 @@ msgid "Tax" msgstr "Steuer" #: pretix/base/services/mail.py:64 -#, python-format -msgid "You are receiving this e-mail because you placed an order for %s." +#, python-brace-format +msgid "You are receiving this e-mail because you placed an order for {event}." msgstr "" -"Du erhältst diese E-Mail, weil du eine Bestellung für die Veranstaltung %s " -"getätigt hast." +"Du erhältst diese E-Mail, weil du eine Bestellung für die Veranstaltung " +"{event} getätigt hast." #: pretix/base/services/orders.py:29 msgid "" @@ -1965,8 +1964,6 @@ msgid "Change permissions" msgstr "Berechtigungen verändern" #: pretix/control/templates/pretixcontrol/event/permissions.html:21 -#, fuzzy -#| msgid "Can change vouchers" msgid "Change vouchers" msgstr "Gutscheine bearbeiten" @@ -2114,7 +2111,6 @@ msgid "Organizer name" msgstr "Veranstaltername" #: pretix/control/templates/pretixcontrol/help/base.html:4 -#, fuzzy msgid "Help center" msgstr "Hilfe" @@ -4098,6 +4094,13 @@ msgstr "Deutsch" msgid "German (informal)" msgstr "Deutsch (Du)" +#~ msgid "" +#~ "%s\n" +#~ "until %s" +#~ msgstr "" +#~ "%s\n" +#~ "bis %s" + #~ msgid "Order process settings" #~ msgstr "Bestellzeile"