mirror of
https://github.com/pretix/pretix.git
synced 2026-05-15 16:54:00 +00:00
Compare commits
3 Commits
fix-orderl
...
fix-transl
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e6f18ab54 | ||
|
|
71edfa8e1a | ||
|
|
8303ba7808 |
@@ -160,7 +160,7 @@ class OrderListExporter(MultiSheetListExporter):
|
||||
|
||||
def _get_all_payment_methods(self, qs):
|
||||
pps = dict(get_all_payment_providers())
|
||||
return sorted([(pp, pps.get(pp, pp)) for pp in set(
|
||||
return sorted([(pp, pps[pp]) for pp in set(
|
||||
OrderPayment.objects.exclude(provider='free').filter(order__event__in=self.events).values_list(
|
||||
'provider', flat=True
|
||||
).distinct()
|
||||
@@ -330,7 +330,6 @@ class OrderListExporter(MultiSheetListExporter):
|
||||
taxsum=Sum('tax_value'), grosssum=Sum('value')
|
||||
)
|
||||
}
|
||||
payment_methods = None
|
||||
if form_data.get('include_payment_amounts'):
|
||||
payment_sum_cache = {
|
||||
(o['order__id'], o['provider']): o['grosssum'] for o in
|
||||
@@ -348,7 +347,6 @@ class OrderListExporter(MultiSheetListExporter):
|
||||
grosssum=Sum('amount')
|
||||
)
|
||||
}
|
||||
payment_methods = self._get_all_payment_methods(qs)
|
||||
sum_cache = {
|
||||
(o['order__id'], o['tax_rate']): o for o in
|
||||
OrderPosition.objects.values('tax_rate', 'order__id').order_by().annotate(
|
||||
@@ -436,6 +434,7 @@ class OrderListExporter(MultiSheetListExporter):
|
||||
)
|
||||
|
||||
if form_data.get('include_payment_amounts'):
|
||||
payment_methods = self._get_all_payment_methods(qs)
|
||||
for id, vn in payment_methods:
|
||||
row.append(
|
||||
payment_sum_cache.get((order.id, id), Decimal('0.00')) -
|
||||
|
||||
@@ -442,7 +442,7 @@ class AttendeeState(ImportColumn):
|
||||
|
||||
@property
|
||||
def verbose_name(self):
|
||||
return _('Attendee address') + ': ' + _('State')
|
||||
return _('Attendee address') + ': ' + pgettext('address', 'State')
|
||||
|
||||
def clean(self, value, previous_values):
|
||||
if value:
|
||||
|
||||
@@ -5,7 +5,7 @@ msgstr ""
|
||||
"Project-Id-Version: 1\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2026-04-28 09:03+0000\n"
|
||||
"PO-Revision-Date: 2026-05-02 23:00+0000\n"
|
||||
"PO-Revision-Date: 2026-05-06 00:00+0000\n"
|
||||
"Last-Translator: Daniel Musketa <daniel@musketa.de>\n"
|
||||
"Language-Team: German <https://translate.pretix.eu/projects/pretix/pretix/"
|
||||
"de/>\n"
|
||||
@@ -14,7 +14,7 @@ msgstr ""
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=n != 1;\n"
|
||||
"X-Generator: Weblate 5.17\n"
|
||||
"X-Generator: Weblate 5.17.1\n"
|
||||
"X-Poedit-Bookmarks: -1,-1,904,-1,-1,-1,-1,-1,-1,-1\n"
|
||||
|
||||
#: pretix/_base_settings.py:87
|
||||
@@ -3072,7 +3072,7 @@ msgstr "Wertgutscheine"
|
||||
#: pretix/base/exporters/orderlist.py:1367
|
||||
msgid "Download a spreadsheet of all gift cards including their current value."
|
||||
msgstr ""
|
||||
"Tabelle (Excel oder CSV) mit allen Wertgutscheinen und deren aktuellen Wert."
|
||||
"Tabelle (Excel oder CSV) mit allen Wertgutscheinen und deren aktuellem Wert."
|
||||
|
||||
#: pretix/base/exporters/orderlist.py:1378
|
||||
msgid "Show value at"
|
||||
@@ -36026,7 +36026,7 @@ msgid ""
|
||||
"the order clicked the link in the email they received to confirm the email "
|
||||
"address is valid."
|
||||
msgstr ""
|
||||
"Sie können Ihre Tickets hier herunterladen sobald die Person, die die "
|
||||
"Sie können Ihre Tickets hier herunterladen, sobald die Person, die die "
|
||||
"Bestellung aufgegeben hat, einen Link in der an sie geschickten E-Mail "
|
||||
"geklickt hat."
|
||||
|
||||
@@ -37012,10 +37012,10 @@ msgid ""
|
||||
"need the ticket any more, please be so kind and remove your ticket from the "
|
||||
"list so we can pass it on to the next person waiting as quickly as possible!"
|
||||
msgstr ""
|
||||
"Sie wurden von unserer Warteliste ausgewählt um ein Ticket zu erhalten. Wenn "
|
||||
"Sie das Ticket nicht mehr brauchen, helfen Sie uns indem Sie sich von der "
|
||||
"Warteliste entfernen, sodass wir das Ticket schnellstmöglich an die nächste "
|
||||
"wartende Person weitergeben können."
|
||||
"Sie wurden von unserer Warteliste ausgewählt, um ein Ticket zu erhalten. "
|
||||
"Wenn Sie das Ticket nicht mehr brauchen, helfen Sie uns, indem Sie sich von "
|
||||
"der Warteliste entfernen, sodass wir das Ticket schnellstmöglich an die "
|
||||
"nächste wartende Person weitergeben können."
|
||||
|
||||
#: pretix/presale/templates/pretixpresale/event/waitinglist_remove.html:16
|
||||
msgctxt "waitinglist"
|
||||
|
||||
@@ -4,8 +4,8 @@ msgstr ""
|
||||
"Project-Id-Version: 1\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2026-04-28 09:03+0000\n"
|
||||
"PO-Revision-Date: 2026-04-30 18:00+0000\n"
|
||||
"Last-Translator: CVZ-es <damien.bremont@casadevelazquez.org>\n"
|
||||
"PO-Revision-Date: 2026-05-08 04:00+0000\n"
|
||||
"Last-Translator: corentin-spec <corentin@spectentaculaire.fr>\n"
|
||||
"Language-Team: French <https://translate.pretix.eu/projects/pretix/pretix/"
|
||||
"fr/>\n"
|
||||
"Language: fr\n"
|
||||
@@ -13,7 +13,7 @@ msgstr ""
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=n > 1;\n"
|
||||
"X-Generator: Weblate 5.17\n"
|
||||
"X-Generator: Weblate 5.17.1\n"
|
||||
|
||||
#: pretix/_base_settings.py:87
|
||||
msgid "English"
|
||||
@@ -37884,7 +37884,7 @@ msgstr "Votre panier a été mis à jour."
|
||||
|
||||
#: pretix/presale/views/cart.py:525 pretix/presale/views/cart.py:551
|
||||
msgid "Your cart is now empty."
|
||||
msgstr "Votre panier à été vidé."
|
||||
msgstr "Votre panier a été vidé."
|
||||
|
||||
#: pretix/presale/views/cart.py:584
|
||||
msgid ""
|
||||
|
||||
Reference in New Issue
Block a user