From d8c2c82da728886ac4abf3dda3f68e8ae9876470 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 6 Mar 2020 09:36:20 +0100 Subject: [PATCH] Update invoice language in build_invoice --- src/pretix/base/services/invoices.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/pretix/base/services/invoices.py b/src/pretix/base/services/invoices.py index 9db348efc..b78fd9e4d 100644 --- a/src/pretix/base/services/invoices.py +++ b/src/pretix/base/services/invoices.py @@ -37,6 +37,10 @@ logger = logging.getLogger(__name__) @transaction.atomic def build_invoice(invoice: Invoice) -> Invoice: + invoice.locale = invoice.event.settings.get('invoice_language', invoice.event.settings.locale) + if invoice.locale == '__user__': + invoice.locale = invoice.order.locale or invoice.event.settings.locale + lp = invoice.order.payments.last() with language(invoice.locale): @@ -250,17 +254,11 @@ def regenerate_invoice(invoice: Invoice): def generate_invoice(order: Order, trigger_pdf=True): - locale = order.event.settings.get('invoice_language', order.event.settings.locale) - if locale: - if locale == '__user__': - locale = order.locale or order.event.settings.locale - invoice = Invoice( order=order, event=order.event, organizer=order.event.organizer, date=timezone.now().date(), - locale=locale ) invoice = build_invoice(invoice) if trigger_pdf: