From 7dd99f3d1813631bb02c7d250ac360c4ee279873 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Tue, 11 Apr 2017 11:38:49 +0200 Subject: [PATCH] Fix locale formatting in PDF exporter --- src/pretix/plugins/reports/exporters.py | 50 ++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/pretix/plugins/reports/exporters.py b/src/pretix/plugins/reports/exporters.py index f49d7a5a7..1b657ff01 100644 --- a/src/pretix/plugins/reports/exporters.py +++ b/src/pretix/plugins/reports/exporters.py @@ -7,7 +7,7 @@ from django import forms from django.conf import settings from django.contrib.staticfiles import finders from django.db.models import Sum -from django.utils.formats import date_format +from django.utils.formats import date_format, localize from django.utils.timezone import now from django.utils.translation import ugettext as _ @@ -187,43 +187,43 @@ class OverviewReport(Report): tstyledata.append(('FONTNAME', (0, len(tdata)), (-1, len(tdata)), 'OpenSansBd')) tdata.append([ tup[0].name, - str(tup[0].num_canceled[0]), str(tup[0].num_canceled[1]), - str(tup[0].num_refunded[0]), str(tup[0].num_refunded[1]), - str(tup[0].num_expired[0]), str(tup[0].num_expired[1]), - str(tup[0].num_pending[0]), str(tup[0].num_pending[1]), - str(tup[0].num_paid[0]), str(tup[0].num_paid[1]), - str(tup[0].num_total[0]), str(tup[0].num_total[1]), + str(tup[0].num_canceled[0]), localize(tup[0].num_canceled[1]), + str(tup[0].num_refunded[0]), localize(tup[0].num_refunded[1]), + str(tup[0].num_expired[0]), localize(tup[0].num_expired[1]), + str(tup[0].num_pending[0]), localize(tup[0].num_pending[1]), + str(tup[0].num_paid[0]), localize(tup[0].num_paid[1]), + str(tup[0].num_total[0]), localize(tup[0].num_total[1]), ]) for item in tup[1]: tdata.append([ " " + str(item.name), - str(item.num_canceled[0]), str(item.num_canceled[1]), - str(item.num_refunded[0]), str(item.num_refunded[1]), - str(item.num_expired[0]), str(item.num_expired[1]), - str(item.num_pending[0]), str(item.num_pending[1]), - str(item.num_paid[0]), str(item.num_paid[1]), - str(item.num_total[0]), str(item.num_total[1]), + str(item.num_canceled[0]), localize(item.num_canceled[1]), + str(item.num_refunded[0]), localize(item.num_refunded[1]), + str(item.num_expired[0]), localize(item.num_expired[1]), + str(item.num_pending[0]), localize(item.num_pending[1]), + str(item.num_paid[0]), localize(item.num_paid[1]), + str(item.num_total[0]), localize(item.num_total[1]), ]) if item.has_variations: for var in item.all_variations: tdata.append([ " " + str(var), - str(var.num_canceled[0]), str(var.num_canceled[1]), - str(var.num_refunded[0]), str(var.num_refunded[1]), - str(var.num_expired[0]), str(var.num_expired[1]), - str(var.num_pending[0]), str(var.num_pending[1]), - str(var.num_paid[0]), str(var.num_paid[1]), - str(var.num_total[0]), str(var.num_total[1]), + str(var.num_canceled[0]), localize(var.num_canceled[1]), + str(var.num_refunded[0]), localize(var.num_refunded[1]), + str(var.num_expired[0]), localize(var.num_expired[1]), + str(var.num_pending[0]), localize(var.num_pending[1]), + str(var.num_paid[0]), localize(var.num_paid[1]), + str(var.num_total[0]), localize(var.num_total[1]), ]) tdata.append([ _("Total"), - str(total['num_canceled'][0]), str(total['num_canceled'][1]), - str(total['num_refunded'][0]), str(total['num_refunded'][1]), - str(total['num_expired'][0]), str(total['num_expired'][1]), - str(total['num_pending'][0]), str(total['num_pending'][1]), - str(total['num_paid'][0]), str(total['num_paid'][1]), - str(total['num_total'][0]), str(total['num_total'][1]), + str(total['num_canceled'][0]), localize(total['num_canceled'][1]), + str(total['num_refunded'][0]), localize(total['num_refunded'][1]), + str(total['num_expired'][0]), localize(total['num_expired'][1]), + str(total['num_pending'][0]), localize(total['num_pending'][1]), + str(total['num_paid'][0]), localize(total['num_paid'][1]), + str(total['num_total'][0]), localize(total['num_total'][1]), ]) table = Table(tdata, colWidths=colwidths, repeatRows=3)