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

This commit is contained in:
Raphael Michel
2016-09-21 18:57:35 +02:00
26 changed files with 80 additions and 80 deletions

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: