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

@@ -7,7 +7,7 @@
{% elif order.status == "e" %}
<span class="label label-danger {{ class }}">{% trans "Expired" %}</span>
{% elif order.status == "c" %}
<span class="label label-danger {{ class }}">{% trans "Cancelled" %}</span>
<span class="label label-danger {{ class }}">{% trans "Canceled" %}</span>
{% elif order.status == "r" %}
<span class="label label-danger {{ class }}">{% trans "Refunded" %}</span>
{% endif %}