From 5881a9d5062d368f8e08b4c995d0cdbd84869a84 Mon Sep 17 00:00:00 2001
From: "Tomas \"Jethro\" Pokorny" <xtompok@gmail.com>
Date: Mon, 21 Feb 2022 18:34:17 +0100
Subject: [PATCH] =?UTF-8?q?Konzistentn=C3=AD=20kr=C3=A1tk=C3=A9=20datum.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seminar/templatetags/utils.py | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/seminar/templatetags/utils.py b/seminar/templatetags/utils.py
index 7ab36662..52610eec 100644
--- a/seminar/templatetags/utils.py
+++ b/seminar/templatetags/utils.py
@@ -1,4 +1,5 @@
 from django import template
+from django.utils.safestring import mark_safe
 from datetime import datetime, timedelta
 from pytz import timezone
 from mamweb.settings import TIME_ZONE
@@ -15,13 +16,5 @@ def kratke_datum(dt):
 	if not isinstance(dt, datetime):
 		logger.warning(f"Špatné volání filtru {__name__}: {dt}")
 		return False
-	naive_now = datetime.now()
-	tz = timezone(TIME_ZONE)
-	now = tz.localize(naive_now)
-	delta = now - dt
-	if delta <= timedelta(days=1):
-		return dt.strftime("%H:%M")
-	if delta <= timedelta(days=365):	# Timedelta neumí vyjádřit 1 rok
-		return dt.strftime("%d. %m.")
-	return dt.strftime("%d. %m. %Y")
-
+	out = f'<span title="{dt.strftime("%d. %m. %Y %H:%M")}">{dt.day}.{dt.month}.<span style="text-decoration:overline">{dt.year%100}</span>'
+	return mark_safe(out)