Fixed translation issues

This commit is contained in:
Raphael Michel
2016-03-15 17:17:33 +01:00
parent 8a2c2db6c8
commit 7f524af79a
3 changed files with 38 additions and 28 deletions

View File

@@ -214,8 +214,8 @@ def _invoice_generate_german(invoice, f):
textobject.textLine(str(invoice.event.name)) textobject.textLine(str(invoice.event.name))
if invoice.event.settings.show_date_to: if invoice.event.settings.show_date_to:
textobject.textLines( textobject.textLines(
_('%s\nuntil %s') % (invoice.event.get_date_from_display(), _('{from_date}\nuntil {to_date}').format(from_date=invoice.event.get_date_from_display(),
invoice.event.get_date_to_display())) to_date=invoice.event.get_date_to_display()))
else: else:
textobject.textLine(invoice.event.get_date_from_display()) textobject.textLine(invoice.event.get_date_from_display())
canvas.drawText(textobject) canvas.drawText(textobject)

View File

@@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 1\n" "Project-Id-Version: 1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-15 16:08+0000\n" "POT-Creation-Date: 2016-03-15 16:16+0000\n"
"PO-Revision-Date: 2016-03-15 17:10+0100\n" "PO-Revision-Date: 2016-03-15 17:17+0100\n"
"Last-Translator: Raphael Michel <michel@rami.io>\n" "Last-Translator: Raphael Michel <michel@rami.io>\n"
"Language-Team: Raphael Michel <michel@rami.io>\n" "Language-Team: Raphael Michel <michel@rami.io>\n"
"Language: de\n" "Language: de\n"
@@ -971,13 +971,13 @@ msgid "Order date"
msgstr "Bestelldatum" msgstr "Bestelldatum"
#: pretix/base/services/invoices.py:217 #: pretix/base/services/invoices.py:217
#, python-format #, python-brace-format
msgid "" msgid ""
"%s\n" "{from_date}\n"
"until %s" "until {to_date}"
msgstr "" msgstr ""
"%s\n" "{from_date}\n"
"bis %s" "bis {to_date}"
#: pretix/base/services/invoices.py:244 #: pretix/base/services/invoices.py:244
msgctxt "invoice" msgctxt "invoice"
@@ -1030,11 +1030,11 @@ msgid "Tax"
msgstr "Steuer" msgstr "Steuer"
#: pretix/base/services/mail.py:64 #: pretix/base/services/mail.py:64
#, python-format #, python-brace-format
msgid "You are receiving this e-mail because you placed an order for %s." msgid "You are receiving this e-mail because you placed an order for {event}."
msgstr "" msgstr ""
"Sie erhalten diese E-Mail, weil Sie eine Bestellung für die Veranstaltung %s " "Sie erhalten diese E-Mail, weil Sie eine Bestellung für die Veranstaltung "
"getätigt haben." "{event} getätigt haben."
#: pretix/base/services/orders.py:29 #: pretix/base/services/orders.py:29
msgid "" msgid ""
@@ -4105,6 +4105,13 @@ msgstr "Deutsch"
msgid "German (informal)" msgid "German (informal)"
msgstr "Deutsch (Du)" msgstr "Deutsch (Du)"
#~ msgid ""
#~ "%s\n"
#~ "until %s"
#~ msgstr ""
#~ "%s\n"
#~ "bis %s"
#~ msgid "Order process settings" #~ msgid "Order process settings"
#~ msgstr "Bestellzeile" #~ msgstr "Bestellzeile"

View File

@@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 1\n" "Project-Id-Version: 1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-15 16:08+0000\n" "POT-Creation-Date: 2016-03-15 16:16+0000\n"
"PO-Revision-Date: 2016-03-15 17:11+0100\n" "PO-Revision-Date: 2016-03-15 17:17+0100\n"
"Last-Translator: Raphael Michel <michel@rami.io>\n" "Last-Translator: Raphael Michel <michel@rami.io>\n"
"Language-Team: Raphael Michel <michel@rami.io>\n" "Language-Team: Raphael Michel <michel@rami.io>\n"
"Language: de\n" "Language: de\n"
@@ -775,7 +775,6 @@ msgid "Percentage"
msgstr "Prozentsatz" msgstr "Prozentsatz"
#: pretix/base/payment.py:130 #: pretix/base/payment.py:130
#, fuzzy
msgid "Calculate the fee from the total value including the fee." msgid "Calculate the fee from the total value including the fee."
msgstr "Berechne die Gebühr als Anteil vom Endbetrag." msgstr "Berechne die Gebühr als Anteil vom Endbetrag."
@@ -973,13 +972,13 @@ msgid "Order date"
msgstr "Bestelldatum" msgstr "Bestelldatum"
#: pretix/base/services/invoices.py:217 #: pretix/base/services/invoices.py:217
#, python-format #, python-brace-format
msgid "" msgid ""
"%s\n" "{from_date}\n"
"until %s" "until {to_date}"
msgstr "" msgstr ""
"%s\n" "{from_date}\n"
"bis %s" "bis {to_date}"
#: pretix/base/services/invoices.py:244 #: pretix/base/services/invoices.py:244
msgctxt "invoice" msgctxt "invoice"
@@ -1032,11 +1031,11 @@ msgid "Tax"
msgstr "Steuer" msgstr "Steuer"
#: pretix/base/services/mail.py:64 #: pretix/base/services/mail.py:64
#, python-format #, python-brace-format
msgid "You are receiving this e-mail because you placed an order for %s." msgid "You are receiving this e-mail because you placed an order for {event}."
msgstr "" msgstr ""
"Du erhältst diese E-Mail, weil du eine Bestellung für die Veranstaltung %s " "Du erhältst diese E-Mail, weil du eine Bestellung für die Veranstaltung "
"getätigt hast." "{event} getätigt hast."
#: pretix/base/services/orders.py:29 #: pretix/base/services/orders.py:29
msgid "" msgid ""
@@ -1965,8 +1964,6 @@ msgid "Change permissions"
msgstr "Berechtigungen verändern" msgstr "Berechtigungen verändern"
#: pretix/control/templates/pretixcontrol/event/permissions.html:21 #: pretix/control/templates/pretixcontrol/event/permissions.html:21
#, fuzzy
#| msgid "Can change vouchers"
msgid "Change vouchers" msgid "Change vouchers"
msgstr "Gutscheine bearbeiten" msgstr "Gutscheine bearbeiten"
@@ -2114,7 +2111,6 @@ msgid "Organizer name"
msgstr "Veranstaltername" msgstr "Veranstaltername"
#: pretix/control/templates/pretixcontrol/help/base.html:4 #: pretix/control/templates/pretixcontrol/help/base.html:4
#, fuzzy
msgid "Help center" msgid "Help center"
msgstr "Hilfe" msgstr "Hilfe"
@@ -4098,6 +4094,13 @@ msgstr "Deutsch"
msgid "German (informal)" msgid "German (informal)"
msgstr "Deutsch (Du)" msgstr "Deutsch (Du)"
#~ msgid ""
#~ "%s\n"
#~ "until %s"
#~ msgstr ""
#~ "%s\n"
#~ "bis %s"
#~ msgid "Order process settings" #~ msgid "Order process settings"
#~ msgstr "Bestellzeile" #~ msgstr "Bestellzeile"