From ca7a85c9d33f5d234dcc907f8e896d88b2bac37e Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Wed, 22 Jan 2020 17:11:58 +0100
Subject: [PATCH] Remove hard-code locale-dependent format strings
---
aleksis/apps/chronos/templates/chronos/lessons_day.html | 2 +-
.../apps/chronos/templates/chronos/partials/datepicker.html | 2 +-
.../apps/chronos/templates/chronos/partials/period_time.html | 4 ++--
aleksis/apps/chronos/templates/chronos/substitutions.html | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/aleksis/apps/chronos/templates/chronos/lessons_day.html b/aleksis/apps/chronos/templates/chronos/lessons_day.html
index c498c419..203590ff 100644
--- a/aleksis/apps/chronos/templates/chronos/lessons_day.html
+++ b/aleksis/apps/chronos/templates/chronos/lessons_day.html
@@ -15,7 +15,7 @@
<div class="row no-margin">
<div class="col s12 m6 l8 no-padding">
- <h4>{% blocktrans %}Lessons{% endblocktrans %} {{ day|date:"l, j. F Y" }}</h4>
+ <h4>{% blocktrans %}Lessons{% endblocktrans %} {{ day|date:"l" }}, {{ day }}</h4>
</div>
<div class="col s12 m6 l4 no-padding" style="margin-top: 10px;">
{% include "chronos/partials/datepicker.html" %}
diff --git a/aleksis/apps/chronos/templates/chronos/partials/datepicker.html b/aleksis/apps/chronos/templates/chronos/partials/datepicker.html
index ca845de7..9ef49840 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/datepicker.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/datepicker.html
@@ -17,7 +17,7 @@
{% if display_date_only %}
<div class="col s8">
<span class="card-title center-block" id="date">
- {{ day|date:"l, j.n.Y" }}
+ {{ day|date:"l" }}, {{ day }}
</span>
</div>
{% else %}
diff --git a/aleksis/apps/chronos/templates/chronos/partials/period_time.html b/aleksis/apps/chronos/templates/chronos/partials/period_time.html
index 83c27b7b..f22a12e7 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/period_time.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/period_time.html
@@ -11,9 +11,9 @@
{# Time dimension of lesson #}
<div class="right timetable-time grey-text text-darken-2">
{% with period_obj=periods|get_dict:period %}
- <span>{{ period_obj.0|date:"H:i" }}</span>
+ <span>{{ period_obj.0|time }}</span>
<br>
- <span>{{ period_obj.1|date:"H:i" }}</span>
+ <span>{{ period_obj.1|time }}</span>
{% endwith %}
</div>
</div>
diff --git a/aleksis/apps/chronos/templates/chronos/substitutions.html b/aleksis/apps/chronos/templates/chronos/substitutions.html
index 204efd1a..52708d1f 100644
--- a/aleksis/apps/chronos/templates/chronos/substitutions.html
+++ b/aleksis/apps/chronos/templates/chronos/substitutions.html
@@ -57,7 +57,7 @@
</div>
</div>
- <h5 class="hide-on-small-and-down">{{ day|date:"l, j. F Y" }}</h5>
+ <h5 class="hide-on-small-and-down">{{ day|date:"l" }}, {{ day }}</h5>
<table class="substitutions striped responsive-table">
<thead>
--
GitLab