cancelled -> canceled

Author: AlexanderWillner

things/api.py

@@ -482,7 +482,7 @@ def logbook(**kwargs):
 
 def canceled(**kwargs):
     """
-    Read cancelled tasks into dicts.
+    Read canceled tasks into dicts.
 
     See `things.tasks` for details.
     """

things/database.py

@@ -530,7 +530,7 @@ def get_daystats(self):
                          "+" || x || " days") as date,
                     CREATED.TasksCreated as created,
                     CLOSED.TasksClosed as completed,
-                    CANCELLED.TasksCanceled as canceled,
+                    CANCELED.TasksCanceled as canceled,
                     TRASHED.TasksTrashed as trashed
                 FROM timeseries
                 LEFT JOIN
@@ -548,7 +548,7 @@ def get_daystats(self):
                         WHERE DAY NOT NULL
                           AND TASK.{self.IS_CANCELED} AND TASK.{self.IS_TODO}
                         GROUP BY DAY)
-                        AS CANCELLED ON CANCELLED.DAY = date
+                        AS CANCELED ON CANCELED.DAY = date
                 LEFT JOIN
                     (SELECT COUNT(uuid) AS TasksTrashed,
                         date({self.DATE_MOD},"unixepoch") AS DAY