From a6c9fb0f8be7105366f7d8d0002cacec83199cb4 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Tue, 8 Aug 2017 22:24:53 +0200 Subject: [PATCH] Fix #576 again --- src/pretix/locale/de/LC_MESSAGES/django.po | 20 ++++++++----------- src/pretix/locale/de/LC_MESSAGES/djangojs.po | 2 +- .../locale/de_Informal/LC_MESSAGES/django.po | 20 ++++++++----------- .../de_Informal/LC_MESSAGES/djangojs.po | 2 +- src/pretix/plugins/banktransfer/payment.py | 3 ++- .../banktransfer/email/order_pending.txt | 7 +++---- 6 files changed, 23 insertions(+), 31 deletions(-) diff --git a/src/pretix/locale/de/LC_MESSAGES/django.po b/src/pretix/locale/de/LC_MESSAGES/django.po index f61b161b15..778aa2d1d7 100644 --- a/src/pretix/locale/de/LC_MESSAGES/django.po +++ b/src/pretix/locale/de/LC_MESSAGES/django.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: 1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-08-08 18:38+0000\n" -"PO-Revision-Date: 2017-08-08 21:06+0200\n" +"POT-Creation-Date: 2017-08-08 20:23+0000\n" +"PO-Revision-Date: 2017-08-08 22:24+0200\n" "Last-Translator: Raphael Michel \n" "Language-Team: Raphael Michel \n" "Language: de\n" @@ -7750,7 +7750,7 @@ msgstr "Bekannte Domains" #: pretix/plugins/banktransfer/__init__.py:10 #: pretix/plugins/banktransfer/__init__.py:13 -#: pretix/plugins/banktransfer/payment.py:14 +#: pretix/plugins/banktransfer/payment.py:15 msgid "Bank transfer" msgstr "Banküberweisung" @@ -7775,7 +7775,7 @@ msgid "" msgstr "" "Installieren Sie das Python-Paket 'chardet' für verbesserten CSV-Import." -#: pretix/plugins/banktransfer/payment.py:19 +#: pretix/plugins/banktransfer/payment.py:20 msgid "Bank account details" msgstr "Bankverbindung" @@ -7861,20 +7861,16 @@ msgid "" "\n" "Please transfer the full amount to the following bank account.\n" "\n" -"```\n" -"Reference: %(code)s\n" -"Amount: %(total)s %(currency)s\n" +" Reference: %(code)s\n" +" Amount: %(total)s %(currency)s\n" "%(bank)s\n" -"```" msgstr "" "\n" "Bitte überweisen Sie den vollen Betrag auf das folgende Bankkonto:\n" "\n" -"```\n" -"Verwendungszweck: %(code)s\n" -"Betrag: %(total)s %(currency)s\n" +" Verwendungszweck: %(code)s\n" +" Betrag: %(total)s %(currency)s\n" "%(bank)s\n" -"```" #: pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_assign.html:4 msgid "" diff --git a/src/pretix/locale/de/LC_MESSAGES/djangojs.po b/src/pretix/locale/de/LC_MESSAGES/djangojs.po index d8485d00b6..6348522200 100644 --- a/src/pretix/locale/de/LC_MESSAGES/djangojs.po +++ b/src/pretix/locale/de/LC_MESSAGES/djangojs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-08-08 18:39+0000\n" +"POT-Creation-Date: 2017-08-08 20:23+0000\n" "PO-Revision-Date: 2017-06-01 12:56+0200\n" "Last-Translator: Raphael Michel \n" "Language-Team: \n" diff --git a/src/pretix/locale/de_Informal/LC_MESSAGES/django.po b/src/pretix/locale/de_Informal/LC_MESSAGES/django.po index 207cf7ece1..09afb23c5c 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: 2017-08-08 18:38+0000\n" -"PO-Revision-Date: 2017-08-08 21:06+0200\n" +"POT-Creation-Date: 2017-08-08 20:23+0000\n" +"PO-Revision-Date: 2017-08-08 22:24+0200\n" "Last-Translator: Raphael Michel \n" "Language-Team: Raphael Michel \n" "Language: de\n" @@ -7731,7 +7731,7 @@ msgstr "Bekannte Domains" #: pretix/plugins/banktransfer/__init__.py:10 #: pretix/plugins/banktransfer/__init__.py:13 -#: pretix/plugins/banktransfer/payment.py:14 +#: pretix/plugins/banktransfer/payment.py:15 msgid "Bank transfer" msgstr "Banküberweisung" @@ -7755,7 +7755,7 @@ msgid "" "Install the python package 'chardet' for better CSV import capabilities." msgstr "Installiere das Python-Paket 'chardet' für verbesserten CSV-Import." -#: pretix/plugins/banktransfer/payment.py:19 +#: pretix/plugins/banktransfer/payment.py:20 msgid "Bank account details" msgstr "Bankverbindung" @@ -7842,20 +7842,16 @@ msgid "" "\n" "Please transfer the full amount to the following bank account.\n" "\n" -"```\n" -"Reference: %(code)s\n" -"Amount: %(total)s %(currency)s\n" +" Reference: %(code)s\n" +" Amount: %(total)s %(currency)s\n" "%(bank)s\n" -"```" msgstr "" "\n" "Bitte überweise den vollen Betrag auf das folgende Bankkonto:\n" "\n" -"```\n" -"Verwendungszweck: %(code)s\n" -"Betrag: %(total)s %(currency)s\n" +" Verwendungszweck: %(code)s\n" +" Betrag: %(total)s %(currency)s\n" "%(bank)s\n" -"```" #: pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_assign.html:4 msgid "" diff --git a/src/pretix/locale/de_Informal/LC_MESSAGES/djangojs.po b/src/pretix/locale/de_Informal/LC_MESSAGES/djangojs.po index d6d08406a9..01f26cddb6 100644 --- a/src/pretix/locale/de_Informal/LC_MESSAGES/djangojs.po +++ b/src/pretix/locale/de_Informal/LC_MESSAGES/djangojs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-08-08 18:39+0000\n" +"POT-Creation-Date: 2017-08-08 20:23+0000\n" "PO-Revision-Date: 2017-06-01 12:56+0200\n" "Last-Translator: Raphael Michel \n" "Language-Team: \n" diff --git a/src/pretix/plugins/banktransfer/payment.py b/src/pretix/plugins/banktransfer/payment.py index caa2f3853a..e4e9f61e59 100644 --- a/src/pretix/plugins/banktransfer/payment.py +++ b/src/pretix/plugins/banktransfer/payment.py @@ -1,4 +1,5 @@ import json +import re from collections import OrderedDict from django.template.loader import get_template @@ -46,7 +47,7 @@ class BankTransfer(BasePaymentProvider): ctx = { 'event': self.event, 'order': order, - 'details': self.settings.get('bank_details', as_type=LazyI18nString), + 'details': re.sub('^', ' ', self.settings.get('bank_details', as_type=LazyI18nString), flags=re.MULTILINE), } return template.render(ctx) diff --git a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/email/order_pending.txt b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/email/order_pending.txt index 002cb625aa..d9cfedb477 100644 --- a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/email/order_pending.txt +++ b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/email/order_pending.txt @@ -1,8 +1,7 @@ {% load i18n %}{% load l10n %}{% blocktrans with bank=details code=order.full_code total=order.total|localize currency=event.currency %} Please transfer the full amount to the following bank account. -``` -Reference: {{ code }} -Amount: {{ total }} {{ currency }} + Reference: {{ code }} + Amount: {{ total }} {{ currency }} {{ bank }} -```{% endblocktrans %} +{% endblocktrans %}