diff --git a/src/pretix/base/services/invoices.py b/src/pretix/base/services/invoices.py index dc070b6d8..e1b3f50b6 100644 --- a/src/pretix/base/services/invoices.py +++ b/src/pretix/base/services/invoices.py @@ -3,12 +3,11 @@ import tempfile from collections import defaultdict from datetime import date from decimal import Decimal -from locale import format as lformat from django.contrib.staticfiles import finders from django.core.files.base import ContentFile from django.db import transaction -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 pgettext, ugettext as _ from reportlab.lib import pagesizes @@ -330,15 +329,15 @@ def _invoice_generate_german(invoice, f): for line in invoice.lines.all(): tdata.append(( Paragraph(line.description, styles['Normal']), - lformat("%.2f", line.tax_rate) + " %", - lformat("%.2f", line.net_value) + " " + invoice.event.currency, - lformat("%.2f", line.gross_value) + " " + invoice.event.currency, + localize(line.tax_rate) + " %", + localize(line.net_value) + " " + invoice.event.currency, + localize(line.gross_value) + " " + invoice.event.currency, )) taxvalue_map[line.tax_rate] += line.tax_value grossvalue_map[line.tax_rate] += line.gross_value total += line.gross_value - tdata.append([pgettext('invoice', 'Invoice total'), '', '', lformat("%.2f", total) + " " + invoice.event.currency]) + tdata.append([pgettext('invoice', 'Invoice total'), '', '', localize(total) + " " + invoice.event.currency]) colwidths = [a * doc.width for a in (.55, .15, .15, .15)] table = Table(tdata, colWidths=colwidths, repeatRows=1) table.setStyle(TableStyle(tstyledata)) @@ -370,10 +369,10 @@ def _invoice_generate_german(invoice, f): tax = taxvalue_map[rate] tdata.append(( '', - lformat("%.2f", rate) + " %", - lformat("%.2f", (gross - tax)) + " " + invoice.event.currency, - lformat("%.2f", gross) + " " + invoice.event.currency, - lformat("%.2f", tax) + " " + invoice.event.currency, + localize(rate) + " %", + localize((gross - tax)) + " " + invoice.event.currency, + localize(gross) + " " + invoice.event.currency, + localize(tax) + " " + invoice.event.currency, )) if len(tdata) > 2: diff --git a/src/pretix/plugins/banktransfer/views.py b/src/pretix/plugins/banktransfer/views.py index 0df20ab40..6e4b3b1dd 100644 --- a/src/pretix/plugins/banktransfer/views.py +++ b/src/pretix/plugins/banktransfer/views.py @@ -2,7 +2,6 @@ import csv import json import logging from datetime import timedelta -from locale import format as lformat from django.contrib import messages from django.core.urlresolvers import reverse @@ -135,6 +134,8 @@ class ActionView(EventPermissionRequiredMixin, View): }) def get(self, request, *args, **kwargs): + from django.utils.formats import localize + query = request.GET.get('query', '') if len(query) < 2: return JsonResponse({'results': []}) @@ -145,7 +146,7 @@ class ActionView(EventPermissionRequiredMixin, View): { 'code': o.code, 'status': o.get_status_display(), - 'total': lformat("%.2f", o.total) + ' ' + self.request.event.currency + 'total': localize(o.total) + ' ' + self.request.event.currency } for o in qs ] })