From 9ecc67428a461c57d4cb5202d5d80677ab8740d4 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Wed, 12 Feb 2020 21:07:48 +0100
Subject: [PATCH] Use django.contrib.humanize instead of own functions for
dashboard widget
---
aleksis/apps/chronos/models.py | 3 +--
.../apps/chronos/templates/chronos/widget.html | 6 +++---
aleksis/apps/chronos/util/date.py | 18 ------------------
3 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py
index 7eb25cec..59449c99 100644
--- a/aleksis/apps/chronos/models.py
+++ b/aleksis/apps/chronos/models.py
@@ -22,7 +22,7 @@ from django_global_request.middleware import get_request
from aleksis.core.mixins import ExtensibleModel
from aleksis.core.models import Group, Person, DashboardWidget
-from aleksis.apps.chronos.util.date import week_weekday_from_date, get_name_for_day_from_today
+from aleksis.apps.chronos.util.date import week_weekday_from_date
from aleksis.core.util.core_helpers import has_person
@@ -551,7 +551,6 @@ class TimetableWidget(DashboardWidget):
context["lesson_periods"] = OrderedDict(sorted(per_period.items()))
context["type"] = type_
context["day"] = wanted_day
- context["day_label"] = get_name_for_day_from_today(wanted_day)
context["periods"] = TimePeriod.get_times_dict()
context["smart"] = True
return context
diff --git a/aleksis/apps/chronos/templates/chronos/widget.html b/aleksis/apps/chronos/templates/chronos/widget.html
index a16f291d..fccb2502 100644
--- a/aleksis/apps/chronos/templates/chronos/widget.html
+++ b/aleksis/apps/chronos/templates/chronos/widget.html
@@ -1,12 +1,12 @@
{# -*- engine:django -*- #}
-{% load i18n static %}
+{% load i18n static humanize %}
<div class="card">
<div class="card-content">
<span class="card-title">
- {% blocktrans with day_label=day_label %}
- My timetable for {{ day_label }}
+ {% blocktrans with day=day|naturalday:"l" %}
+ My timetable for {{ day }}
{% endblocktrans %}
</span>
<div class="timetable-plan">
diff --git a/aleksis/apps/chronos/util/date.py b/aleksis/apps/chronos/util/date.py
index a0f5c3b0..f17aa0ba 100644
--- a/aleksis/apps/chronos/util/date.py
+++ b/aleksis/apps/chronos/util/date.py
@@ -31,21 +31,3 @@ def get_weeks_for_year(year: int) -> List[CalendarWeek]:
current_week += 1
return weeks
-
-
-def get_name_for_day_from_today(next_day: date) -> str:
- """
- Return the next week day as you would say it from today: "today", "tomorrow" or "<weekday>"
- """
-
- if next_day == timezone.now().date():
- # Today
- date_formatted = _("today")
- elif next_day == timezone.now().date() + timezone.timedelta(days=1):
- # Tomorrow
- date_formatted = _("tomorrow")
- else:
- # Other weekday
- date_formatted = i18n_day_names()[next_day.weekday()]
-
- return date_formatted
--
GitLab