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

Merge remote-tracking branch 'remotes/flaviabastos/187_unify_canceled_spelling'

Browse Source
This commit is contained in:
Raphael Michel
2016-09-21 18:57:35 +02:00
parent 1faf33d61f 8ef6439c44
commit 84fd7cb166
26 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/plugins/banktransfer/tasks.py
View File

@@ -35,9 +35,9 @@ def _handle_transaction(event: Event, trans: BankTransaction, code: str):
elif trans.order.status == Order.STATUS_REFUNDED:
trans.state = BankTransaction.STATE_ERROR
trans.message = ugettext_noop('The order has already been refunded.')
elif trans.order.status == Order.STATUS_CANCELLED:
elif trans.order.status == Order.STATUS_CANCELED:
trans.state = BankTransaction.STATE_ERROR
trans.message = ugettext_noop('The order has already been cancelled.')
trans.message = ugettext_noop('The order has already been canceled.')
elif trans.amount != trans.order.total:
trans.state = BankTransaction.STATE_INVALID
trans.message = ugettext_noop('The transaction amount is incorrect.')

4
src/pretix/plugins/banktransfer/views.py
View File

@@ -54,10 +54,10 @@ class ActionView(EventPermissionRequiredMixin, View):
'status': 'error',
'message': _('The order has already been refunded.')
})
elif trans.order.status == Order.STATUS_CANCELLED:
elif trans.order.status == Order.STATUS_CANCELED:
return JsonResponse({
'status': 'error',
'message': _('The order has already been cancelled.')
'message': _('The order has already been canceled.')
})
try:

2
src/pretix/plugins/paypal/views.py
View File

@@ -36,7 +36,7 @@ def success(request, organizer=None, event=None):
def abort(request, organizer=None, event=None):
messages.error(request, _('It looks like you cancelled the PayPal payment'))
messages.error(request, _('It looks like you canceled the PayPal payment'))
try:
event = Event.objects.get(id=request.session['payment_paypal_event'])
return redirect(eventreverse(event, 'presale:event.checkout', kwargs={'step': 'payment'}))

10
src/pretix/plugins/reports/exporters.py
View File

@@ -149,7 +149,7 @@ class OverviewReport(Report):
]
tdata = [
[
_('Product'), _('Total (pending or paid)'), '', _('Pending'), '', _('Cancelled'), '', _('Refunded'), '',
_('Product'), _('Total (pending or paid)'), '', _('Pending'), '', _('Canceled'), '', _('Refunded'), '',
_('Paid'), ''
],
[
@@ -171,7 +171,7 @@ class OverviewReport(Report):
tup[0].name,
str(tup[0].num_total[0]), str(tup[0].num_total[1]),
str(tup[0].num_pending[0]), str(tup[0].num_pending[1]),
str(tup[0].num_cancelled[0]), str(tup[0].num_cancelled[1]),
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_paid[0]), str(tup[0].num_paid[1])
])
@@ -180,7 +180,7 @@ class OverviewReport(Report):
" " + str(item.name),
str(item.num_total[0]), str(item.num_total[1]),
str(item.num_pending[0]), str(item.num_pending[1]),
str(item.num_cancelled[0]), str(item.num_cancelled[1]),
str(item.num_canceled[0]), str(item.num_canceled[1]),
str(item.num_refunded[0]), str(item.num_refunded[1]),
str(item.num_paid[0]), str(item.num_paid[1])
])
@@ -190,7 +190,7 @@ class OverviewReport(Report):
" " + str(var),
str(var.num_total[0]), str(var.num_total[1]),
str(var.num_pending[0]), str(var.num_pending[1]),
str(var.num_cancelled[0]), str(var.num_cancelled[1]),
str(var.num_canceled[0]), str(var.num_canceled[1]),
str(var.num_refunded[0]), str(var.num_refunded[1]),
str(var.num_paid[0]), str(var.num_paid[1])
])
@@ -199,7 +199,7 @@ class OverviewReport(Report):
_("Total"),
str(total['num_total'][0]), str(total['num_total'][1]),
str(total['num_pending'][0]), str(total['num_pending'][1]),
str(total['num_cancelled'][0]), str(total['num_cancelled'][1]),
str(total['num_canceled'][0]), str(total['num_canceled'][1]),
str(total['num_refunded'][0]), str(total['num_refunded'][1]),
str(total['num_paid'][0]), str(total['num_paid'][1])
])