From 858436e840c9a8546029ec56150be681873d90e9 Mon Sep 17 00:00:00 2001
From: "Christopher C. Wells" <git@chris-wells.net>
Date: Fri, 6 Aug 2021 08:33:41 -0700
Subject: [PATCH] Convert passed datetime object to localetime

Closes #274
---
 core/templatetags/datetime.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/templatetags/datetime.py b/core/templatetags/datetime.py
index 61cebc0b..6114840e 100644
--- a/core/templatetags/datetime.py
+++ b/core/templatetags/datetime.py
@@ -30,9 +30,14 @@ def datetime_short(date):
     :param date: datetime instance
     :return: a string representation of `date`.
     """
-    now = timezone.now()
     date_string = None
     time_string = None
+
+    # The value received from templates will be UTC so it must be converted to
+    # localtime here.
+    date = timezone.localtime(date)
+
+    now = timezone.localtime()
     if now.date() == date.date():
         date_string = _('Today')
         time_string = formats.date_format(date, format='TIME_FORMAT')