diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py index 7eb25cec1c50c1e4935c28b8256478a9ddb6be0d..59449c99feccba2438d7866817543c5be21e839f 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 a16f291d1fbcc9f836db3d031c2c4c19692421a4..fccb2502f958d8e6d20ed258645f63def872bf35 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 a0f5c3b0c59ccc83ef6caef1f5c1117b4ab269a1..f17aa0ba8354b9dce1ed9db5ee158954afc71ea0 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