From b9ebb1718ad3751471eb852f5f643ad26a3cda0e Mon Sep 17 00:00:00 2001
From: Nicolas Margulies <nicomarg@crans.org>
Date: Fri, 4 Apr 2025 00:29:22 +0200
Subject: [PATCH 1/2] Fixed some non timezone-aware displays

---
 apps/activity/models.py | 3 ++-
 apps/activity/tables.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/activity/models.py b/apps/activity/models.py
index 42b04995..864ef2ac 100644
--- a/apps/activity/models.py
+++ b/apps/activity/models.py
@@ -201,7 +201,8 @@ class Entry(models.Model):
     def save(self, *args, **kwargs):
         qs = Entry.objects.filter(~Q(pk=self.pk), activity=self.activity, note=self.note, guest=self.guest)
         if qs.exists():
-            raise ValidationError(_("Already entered on ") + _("{:%Y-%m-%d %H:%M:%S}").format(qs.get().time, ))
+            raise ValidationError(_("Already entered on ") +
+                                  _("{:%Y-%m-%d %H:%M:%S}").format(timezone.localtime(qs.get().time), ))
 
         if self.guest:
             self.note = self.guest.inviter
diff --git a/apps/activity/tables.py b/apps/activity/tables.py
index d3c86ab2..5f98a6a3 100644
--- a/apps/activity/tables.py
+++ b/apps/activity/tables.py
@@ -55,7 +55,7 @@ class GuestTable(tables.Table):
 
     def render_entry(self, record):
         if record.has_entry:
-            return str(_("Entered on ") + str(_("{:%Y-%m-%d %H:%M:%S}").format(record.entry.time, )))
+            return str(_("Entered on ") + str(_("{:%Y-%m-%d %H:%M:%S}").format(timezone.localtime(record.entry.time))))
         return mark_safe('<button id="{id}" class="btn btn-danger btn-sm" onclick="remove_guest(this.id)"> '
                          '{delete_trans}</button>'.format(id=record.id, delete_trans=_("remove").capitalize()))
 

From 84e9fea15ff743a7a74027af3447d34e7aeac7e9 Mon Sep 17 00:00:00 2001
From: bleizi <bleizi@crans.org>
Date: Fri, 4 Apr 2025 14:46:43 +0200
Subject: [PATCH 2/2] linters

---
 apps/activity/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/activity/models.py b/apps/activity/models.py
index 864ef2ac..c7c92e8d 100644
--- a/apps/activity/models.py
+++ b/apps/activity/models.py
@@ -201,8 +201,8 @@ class Entry(models.Model):
     def save(self, *args, **kwargs):
         qs = Entry.objects.filter(~Q(pk=self.pk), activity=self.activity, note=self.note, guest=self.guest)
         if qs.exists():
-            raise ValidationError(_("Already entered on ") +
-                                  _("{:%Y-%m-%d %H:%M:%S}").format(timezone.localtime(qs.get().time), ))
+            raise ValidationError(_("Already entered on ")
+                                  + _("{:%Y-%m-%d %H:%M:%S}").format(timezone.localtime(qs.get().time), ))
 
         if self.guest:
             self.note = self.guest.inviter