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(''.format(id=record.id, delete_trans=_("remove").capitalize()))