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

doc/development/implementation/logging.rst

@@ -16,7 +16,7 @@ We recommend all relevant models to inherit from ``LoggedModel`` as it simplifie
 
 To actually log an action, you can just call the ``log_action`` method on your object::
 
-   order.log_action('pretix.event.order.cancelled', user=user, data={})
+   order.log_action('pretix.event.order.canceled', user=user, data={})
 
 The positional ``action`` argument should represent the type of action and should be globally unique, we
 recomment do prefix it with your packagename, e.g. ``paypal.payment.rejected``. The ``user`` argument is
@@ -75,7 +75,7 @@ implementation could look like::
         plains = {
             'pretix.event.order.paid': _('The order has been marked as paid.'),
             'pretix.event.order.refunded': _('The order has been refunded.'),
-            'pretix.event.order.cancelled': _('The order has been cancelled.'),
+            'pretix.event.order.canceled': _('The order has been canceled.'),
             ...
         }
         if logentry.action_type in plains:

doc/images/order_states.puml

@@ -3,16 +3,16 @@
 Pending: Order is expecting payment\nOrder reduces quotas
 Expired: Payment period is over\nOrder does not affect quotas
 Paid: Order was successful\nOrder reduces quotas
-Cancelled: Order has been cancelled\nOrder does not affect quotas
+Canceled: Order has been canceled\nOrder does not affect quotas
 Refunded: Order has been refunded\nOrder does not affect quotas
 
 [*] --> Pending: customer\nplaces order
 Pending --> Paid: successful payment
 Pending --> Expired: automatically\nor manually\non admin action
 Expired --> Paid: if payment is received\nonly if quota left
-Expired --> Cancelled
+Expired --> Canceled
 Paid --> Refunded: manually on\nadmin action\nor if an external\npayment provider\nnotifies about a\npayment refund
-Pending --> Cancelled: on admin or\ncustomer action
+Pending --> Canceled: on admin or\ncustomer action
 Paid -> Pending: manually on admin action
 
 @enduml