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

Fix #576 again

Browse Source
This commit is contained in:
Raphael Michel
2017-08-08 22:24:53 +02:00
parent c8230c55ee
commit a6c9fb0f8b
6 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/pretix/locale/de/LC_MESSAGES/django.po
View File

@@ -4,8 +4,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: 2017-08-08 18:38+0000\n" "POT-Creation-Date: 2017-08-08 20:23+0000\n"
"PO-Revision-Date: 2017-08-08 21:06+0200\n" "PO-Revision-Date: 2017-08-08 22:24+0200\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"
@@ -7750,7 +7750,7 @@ msgstr "Bekannte Domains"
#: pretix/plugins/banktransfer/__init__.py:10 #: pretix/plugins/banktransfer/__init__.py:10
#: pretix/plugins/banktransfer/__init__.py:13 #: pretix/plugins/banktransfer/__init__.py:13
#: pretix/plugins/banktransfer/payment.py:14 #: pretix/plugins/banktransfer/payment.py:15
msgid "Bank transfer" msgid "Bank transfer"
msgstr "Banküberweisung" msgstr "Banküberweisung"
@@ -7775,7 +7775,7 @@ msgid ""
msgstr "" msgstr ""
"Installieren Sie das Python-Paket 'chardet' für verbesserten CSV-Import." "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" msgid "Bank account details"
msgstr "Bankverbindung" msgstr "Bankverbindung"
@@ -7861,20 +7861,16 @@ msgid ""
"\n" "\n"
"Please transfer the full amount to the following bank account.\n" "Please transfer the full amount to the following bank account.\n"
"\n" "\n"
"```\n" " Reference: %(code)s\n"
"Reference: %(code)s\n" " Amount: %(total)s %(currency)s\n"
"Amount: %(total)s %(currency)s\n"
"%(bank)s\n" "%(bank)s\n"
"```"
msgstr "" msgstr ""
"\n" "\n"
"Bitte überweisen Sie den vollen Betrag auf das folgende Bankkonto:\n" "Bitte überweisen Sie den vollen Betrag auf das folgende Bankkonto:\n"
"\n" "\n"
"```\n" " Verwendungszweck: %(code)s\n"
"Verwendungszweck: %(code)s\n" " Betrag: %(total)s %(currency)s\n"
"Betrag: %(total)s %(currency)s\n"
"%(bank)s\n" "%(bank)s\n"
"```"
#: pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_assign.html:4 #: pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_assign.html:4
msgid "" msgid ""

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

@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2017-06-01 12:56+0200\n"
"Last-Translator: Raphael Michel <michel@rami.io>\n" "Last-Translator: Raphael Michel <michel@rami.io>\n"
"Language-Team: \n" "Language-Team: \n"

20
src/pretix/locale/de_Informal/LC_MESSAGES/django.po
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: 2017-08-08 18:38+0000\n" "POT-Creation-Date: 2017-08-08 20:23+0000\n"
"PO-Revision-Date: 2017-08-08 21:06+0200\n" "PO-Revision-Date: 2017-08-08 22:24+0200\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"
@@ -7731,7 +7731,7 @@ msgstr "Bekannte Domains"
#: pretix/plugins/banktransfer/__init__.py:10 #: pretix/plugins/banktransfer/__init__.py:10
#: pretix/plugins/banktransfer/__init__.py:13 #: pretix/plugins/banktransfer/__init__.py:13
#: pretix/plugins/banktransfer/payment.py:14 #: pretix/plugins/banktransfer/payment.py:15
msgid "Bank transfer" msgid "Bank transfer"
msgstr "Banküberweisung" msgstr "Banküberweisung"
@@ -7755,7 +7755,7 @@ msgid ""
"Install the python package 'chardet' for better CSV import capabilities." "Install the python package 'chardet' for better CSV import capabilities."
msgstr "Installiere das Python-Paket 'chardet' für verbesserten CSV-Import." 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" msgid "Bank account details"
msgstr "Bankverbindung" msgstr "Bankverbindung"
@@ -7842,20 +7842,16 @@ msgid ""
"\n" "\n"
"Please transfer the full amount to the following bank account.\n" "Please transfer the full amount to the following bank account.\n"
"\n" "\n"
"```\n" " Reference: %(code)s\n"
"Reference: %(code)s\n" " Amount: %(total)s %(currency)s\n"
"Amount: %(total)s %(currency)s\n"
"%(bank)s\n" "%(bank)s\n"
"```"
msgstr "" msgstr ""
"\n" "\n"
"Bitte überweise den vollen Betrag auf das folgende Bankkonto:\n" "Bitte überweise den vollen Betrag auf das folgende Bankkonto:\n"
"\n" "\n"
"```\n" " Verwendungszweck: %(code)s\n"
"Verwendungszweck: %(code)s\n" " Betrag: %(total)s %(currency)s\n"
"Betrag: %(total)s %(currency)s\n"
"%(bank)s\n" "%(bank)s\n"
"```"
#: pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_assign.html:4 #: pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_assign.html:4
msgid "" msgid ""

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

@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2017-06-01 12:56+0200\n"
"Last-Translator: Raphael Michel <michel@rami.io>\n" "Last-Translator: Raphael Michel <michel@rami.io>\n"
"Language-Team: \n" "Language-Team: \n"

3
src/pretix/plugins/banktransfer/payment.py
View File

@@ -1,4 +1,5 @@
import json import json
import re
from collections import OrderedDict from collections import OrderedDict
from django.template.loader import get_template from django.template.loader import get_template
@@ -46,7 +47,7 @@ class BankTransfer(BasePaymentProvider):
ctx = { ctx = {
'event': self.event, 'event': self.event,
'order': order, '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) return template.render(ctx)

7
src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/email/order_pending.txt
View File

@@ -1,8 +1,7 @@
{% load i18n %}{% load l10n %}{% blocktrans with bank=details code=order.full_code total=order.total|localize currency=event.currency %} {% 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. Please transfer the full amount to the following bank account.
``` Reference: {{ code }}
Reference: {{ code }} Amount: {{ total }} {{ currency }}
Amount: {{ total }} {{ currency }}
{{ bank }} {{ bank }}
```{% endblocktrans %} {% endblocktrans %}