From bb1cfd60ad88c66e717f69c2fb40d43a9c0e84a8 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Sun, 26 Jan 2020 14:59:56 +0100
Subject: [PATCH] Remove german strings, fix dates in templates.
---
.../apps/chronos/templates/chronos/all.html | 2 --
.../chronos/templates/chronos/hint_form.html | 20 +++++++----------
.../apps/chronos/templates/chronos/hints.html | 22 +++++++++----------
.../templates/chronos/my_timetable.html | 2 --
.../templates/chronos/substitutions.html | 2 --
.../chronos/substitutions_print.html | 10 ++++-----
.../chronos/templates/chronos/timetable.html | 8 +++----
7 files changed, 26 insertions(+), 40 deletions(-)
diff --git a/aleksis/apps/chronos/templates/chronos/all.html b/aleksis/apps/chronos/templates/chronos/all.html
index 7d02054d..a8521b2c 100644
--- a/aleksis/apps/chronos/templates/chronos/all.html
+++ b/aleksis/apps/chronos/templates/chronos/all.html
@@ -46,5 +46,3 @@
</div>
{% endblock %}
-
-
diff --git a/aleksis/apps/chronos/templates/chronos/hint_form.html b/aleksis/apps/chronos/templates/chronos/hint_form.html
index ac7b6594..f87e2974 100644
--- a/aleksis/apps/chronos/templates/chronos/hint_form.html
+++ b/aleksis/apps/chronos/templates/chronos/hint_form.html
@@ -19,8 +19,7 @@
<div class="alert success">
<p>
<i class="material-icons left">check_circle</i>
- {% blocktrans %}Der Hinweis wurde erfolgreich erstellt und veröffentlicht. Weiteren Hinweis anlegen oder zur Übersicht
- zurück?{% endblocktrans %}<br>
+ {% blocktrans %}The hint was successfully created and published. Do you want to create another hint or go back to overview?{% endblocktrans %}<br>
<a class="btn waves-effect waves-light" href="{% url "timetable_hints" %}"><i
class="material-icons left">arrow_back</i>{% blocktrans %}Back to overview{% endblocktrans %}
</a>
@@ -41,7 +40,7 @@
</div>
</div>
{% endif %}
- <h5>{% blocktrans %}Ãœber welchen Zeitraum soll der Hinweis angezeigt werden?{% blocktrans %}
+ <h5>{% blocktrans %}When should the hint be displayed?{% blocktrans %}
<span class="red-text">*</span>
</h5>
@@ -71,7 +70,7 @@
{{ form.to_date|add_class:"datepicker required" }}
</div>
</div>
- <h5>{% blocktrans %}Für wen soll der Hinweis angezeigt werden?{% endblocktrans %}
+ <h5>{% blocktrans %}For whom should the hint be displayed?{% endblocktrans %}
<span class="red-text">*</span>
</h5>
@@ -85,9 +84,9 @@
{% endif %}
{{ form.classes.label_tag }}
{{ form.classes }}
- <a href="#" id="select-all-classes">{% blocktrans %}Alle auswählen{% endblocktrans %}</a>
+ <a href="#" id="select-all-classes">{% blocktrans %}Select all{% endblocktrans %}</a>
·
- <a href="#" id="deselect-all-classes">{% blocktrans %}Alle abwählen{% endblocktrans %}</a>
+ <a href="#" id="deselect-all-classes">{% blocktrans %}Unselect all{% endblocktrans %}</a>
<script type="text/javascript">
$("#select-all-classes").click(function () {
$(".select-wrapper ul li:not(.selected)").click();
@@ -108,11 +107,11 @@
<p>
<label>
{{ form.teachers }}
- <span>{% blocktrans %}Für Lehrer anzeigen?{% endblocktrans %}</span>
+ <span>{% blocktrans %}Show for teachers?{% endblocktrans %}</span>
</label>
</p>
- <h5>{% blocktrans %}Hinweistext{% endblocktrans %}
+ <h5>{% blocktrans %}Hint text{% endblocktrans %}
<span class="red-text">*</span>
</h5>
{% if form.text.errors %}
@@ -127,8 +126,7 @@
<button type="submit" class="waves-effect waves-light btn green">
- <i class="material-icons left">save</i>{% blocktrans %} Hinweis {% if mode == "new" %} erstellen und
- veröffentlichen {% else %} aktualisieren {% endif %}{% endblocktrans %}
+ <i class="material-icons left">save</i>{% blocktrans %} {% if mode == "new" %} Create and publish {% else %} Update {% endif %}hint{% endblocktrans %}
</button>
</form>
@@ -140,5 +138,3 @@
<script type="text/javascript" src="{% static 'plugins/js/resizable.min.js' %}"></script>
<script type="text/javascript" src="{% static 'martor/js/martor.min.js' %}"></script>
{% endblock %}
-
-
diff --git a/aleksis/apps/chronos/templates/chronos/hints.html b/aleksis/apps/chronos/templates/chronos/hints.html
index 5e605470..851aa4e6 100644
--- a/aleksis/apps/chronos/templates/chronos/hints.html
+++ b/aleksis/apps/chronos/templates/chronos/hints.html
@@ -3,14 +3,14 @@
{% load martortags %}
{% block content %}
- <h4>{% blocktrans %}Hinweismanagement{% endblocktrans %}</h4>
+ <h4>{% blocktrans %}Hint management{% endblocktrans %}</h4>
{% if msg %}
<div class="alert success">
<p>
<i class="material-icons left">check_circle</i>
- Der Hinweis wurde erfolgreich {% if msg == "success_edit" %}gespeichert. {% else %}
- gelöscht. {% endif %}
+ The hint was successfully {% if msg == "success_edit" %}saved. {% else %}
+ deleted. {% endif %}
</p>
</div>
{% endif %}
@@ -21,15 +21,15 @@
<div class="col s12 m4">
<a href="{% url 'timetable_add_hint' %}" class="waves-effect waves-light btn green">
<i class="material-icons left">add</i>
- Neuen Hinweis erstellen
+ {% blocktrans %}Create hint{% endblocktrans %}
</a>
</div>
<div class="col s12 m8 right-align">
<button type="submit" class="waves-effect waves-green btn-flat">
- <i class="material-icons left">refresh</i> Filter aktualisieren
+ <i class="material-icons left">refresh</i>{% blocktrans %}Refresh filter{% endblocktrans %}
</button>
<a class="waves-effect waves-red btn-flat " href="{% url "timetable_hints" %}">
- <i class="material-icons left">clear</i> Filter entfernen
+ <i class="material-icons left">clear</i>{% blocktrans }Clear filter{% endblocktrans %}
</a>
</div>
</div>
@@ -44,12 +44,12 @@
<div class="collapsible-header row no-margin">
<div class="col s10">
- <strong>{{ hint.from_date }} — {{ hint.to_date }}</strong> für
+ <strong>{{ hint.from_date }} — {{ hint.to_date }}</strong>{% blocktrans %}Hint for{% endblocktrans %}
<strong>
{{ hint.classes_formatted }}
</strong>
{% if hint.teachers %}
- <span class="badge new green no-float no-margin">Lehrkräfte</span>
+ <span class="badge new green no-float no-margin">{% blocktrans %}Teachers{% endblocktrans %}</span>
{% endif %}
</div>
<div class="col s2">
@@ -63,12 +63,12 @@
<a class="btn-flat waves-effect waves-green green-text"
href="{% url "timetable_edit_hint" hint.id %}">
<i class="material-icons left">edit</i>
- <span class="hide-on-small-only">Bearbeiten</span>
+ <span class="hide-on-small-only">{% blocktrans %}Edit{% endblocktrans %}</span>
</a>
<a class="btn-flat waves-effect waves-red red-text delete-button"
href="{% url "timetable_delete_hint" hint.id %}">
<i class="material-icons left">delete</i>
- <span class="hide-on-small-only">Löschen</span>
+ <span class="hide-on-small-only">{% blocktrans %}Delete{% endblocktrans %}</span>
</a>
</div>
@@ -81,5 +81,3 @@
{% endfor %}
</ul>
{% endblock %}
-
-
diff --git a/aleksis/apps/chronos/templates/chronos/my_timetable.html b/aleksis/apps/chronos/templates/chronos/my_timetable.html
index e59815ab..e9dce532 100644
--- a/aleksis/apps/chronos/templates/chronos/my_timetable.html
+++ b/aleksis/apps/chronos/templates/chronos/my_timetable.html
@@ -64,5 +64,3 @@
</div>
</div>
{% endblock %}
-
-
diff --git a/aleksis/apps/chronos/templates/chronos/substitutions.html b/aleksis/apps/chronos/templates/chronos/substitutions.html
index e2dae3c1..e322bfd6 100644
--- a/aleksis/apps/chronos/templates/chronos/substitutions.html
+++ b/aleksis/apps/chronos/templates/chronos/substitutions.html
@@ -113,5 +113,3 @@
</table>
{% endblock %}
-
-
diff --git a/aleksis/apps/chronos/templates/chronos/substitutions_print.html b/aleksis/apps/chronos/templates/chronos/substitutions_print.html
index 8116c551..4ce30f76 100644
--- a/aleksis/apps/chronos/templates/chronos/substitutions_print.html
+++ b/aleksis/apps/chronos/templates/chronos/substitutions_print.html
@@ -21,7 +21,7 @@
</style>
{% for c in days %}
- <h4>Vertretungen {{ c.date|date:"l, j. F Y" }}</h4>
+ <h4>Substitutions {{ c.date|date" }}</h4>
{% include "timetable/hintsinsubprint.html" %}
@@ -46,10 +46,10 @@
<tr>
<th><i class="material-icons">people</i></th>
<th><i class="material-icons">access_time</i></th>
- <th>Lehrer</th>
- <th>Fach</th>
- <th>Raum</th>
- <th>Hinweis</th>
+ <th>{% blocktrans %}Teachers{% endblocktrans %}</th>
+ <th>{% blocktrans %}Subject{% endblocktrans %}</th>
+ <th>{% blocktrans %}Room{% endblocktrans %}</th>
+ <th>{% blocktrans %}Hint{% endblocktrans %}</th>
<th></th>
</tr>
</thead>
diff --git a/aleksis/apps/chronos/templates/chronos/timetable.html b/aleksis/apps/chronos/templates/chronos/timetable.html
index a820431f..d970904f 100644
--- a/aleksis/apps/chronos/templates/chronos/timetable.html
+++ b/aleksis/apps/chronos/templates/chronos/timetable.html
@@ -67,7 +67,7 @@
<select id="calendar-week-1">
{% for week in weeks %}
<option value="{{ week.week }}" {% if week == wanted_week %}
- selected {% endif %}>{% trans "CW" %} {{ week.week }} ({{ week.0|date:"j.n" }}–{{ week.6|date:"j.n" }})
+ selected {% endif %}>{% trans "CW" %} {{ week.week }} ({{ week.0|date:"SHORT_DATE_FORMAT" }}–{{ week.6|date:"SHORT_DATE_FORMAT" }})
</option>
{% endfor %}
</select>
@@ -77,7 +77,7 @@
<select id="calendar-week-2">
{% for week in weeks %}
<option value="{{ week.week }}" {% if week == wanted_week %}
- selected {% endif %}>{% trans "CW" %} {{ week.week }} ({{ week.0|date:"j.n.Y" }}–{{ week.6|date:"j.n.Y" }})
+ selected {% endif %}>{% trans "CW" %} {{ week.week }} ({{ week.0|date:"SHORT_DATE_FORMAT" }}–{{ week.6|date:"SHORT_DATE_FORMAT" }})
</option>
{% endfor %}
</select>
@@ -87,7 +87,7 @@
<select id="calendar-week-3">
{% for week in weeks %}
<option value="{{ week.week }}" {% if week == wanted_week %}
- selected {% endif %}>{% trans "CW" %} {{ week.week }} ({{ week.0|date:"j.n" }}–{{ week.6|date:"j.n.Y" }})
+ selected {% endif %}>{% trans "CW" %} {{ week.week }} ({{ week.0|date:"SHORT_DATE_FORMAT" }}–{{ week.6|date:"SHORT_DATE_FORMAT" }})
</option>
{% endfor %}
</select>
@@ -205,5 +205,3 @@
{% endfor %}
</div>
{% endblock %}
-
-
--
GitLab