From 7cde4772ed0dd3d2edc07322ba9ad15251be0664 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Sun, 13 Feb 2022 12:34:55 +0100
Subject: [PATCH 1/3] Refresh translation files
---
.../apps/chronos/locale/ar/LC_MESSAGES/django.po | 12 ++++++------
.../chronos/locale/de_DE/LC_MESSAGES/django.po | 15 +++++++--------
.../apps/chronos/locale/fr/LC_MESSAGES/django.po | 12 ++++++------
.../apps/chronos/locale/la/LC_MESSAGES/django.po | 12 ++++++------
.../chronos/locale/nb_NO/LC_MESSAGES/django.po | 12 ++++++------
.../chronos/locale/tr_TR/LC_MESSAGES/django.po | 12 ++++++------
6 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/aleksis/apps/chronos/locale/ar/LC_MESSAGES/django.po b/aleksis/apps/chronos/locale/ar/LC_MESSAGES/django.po
index d0ac3bd4..593061dc 100644
--- a/aleksis/apps/chronos/locale/ar/LC_MESSAGES/django.po
+++ b/aleksis/apps/chronos/locale/ar/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 17:25+0100\n"
+"POT-Creation-Date: 2022-02-13 11:34+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -153,7 +153,7 @@ msgstr ""
#: aleksis/apps/chronos/models.py:353 aleksis/apps/chronos/models.py:389
#: aleksis/apps/chronos/models.py:443 aleksis/apps/chronos/models.py:1163
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:29
msgid "Subject"
msgstr ""
@@ -169,7 +169,7 @@ msgstr ""
#: aleksis/apps/chronos/models.py:375 aleksis/apps/chronos/models.py:451
#: aleksis/apps/chronos/models.py:520 aleksis/apps/chronos/models.py:738
#: aleksis/apps/chronos/models.py:1178
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
msgid "Room"
msgstr ""
@@ -267,7 +267,7 @@ msgstr ""
#: aleksis/apps/chronos/models.py:722 aleksis/apps/chronos/models.py:963
#: aleksis/apps/chronos/models.py:1012
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:45
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
msgid "Teacher"
msgstr ""
@@ -568,12 +568,12 @@ msgstr ""
msgid "CW"
msgstr ""
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:49
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:31
msgid "Notes"
msgstr ""
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:56
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:57
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:41
msgid "No substitutions available."
msgstr ""
diff --git a/aleksis/apps/chronos/locale/de_DE/LC_MESSAGES/django.po b/aleksis/apps/chronos/locale/de_DE/LC_MESSAGES/django.po
index fdfae1e1..14f0f7e8 100644
--- a/aleksis/apps/chronos/locale/de_DE/LC_MESSAGES/django.po
+++ b/aleksis/apps/chronos/locale/de_DE/LC_MESSAGES/django.po
@@ -7,11 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 17:25+0100\n"
+"POT-Creation-Date: 2022-02-13 11:34+0000\n"
"PO-Revision-Date: 2022-01-12 16:35+0000\n"
"Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
-"Language-Team: German <https://translate.edugit.org/projects/aleksis/"
-"aleksis-app-chronos/de/>\n"
+"Language-Team: German <https://translate.edugit.org/projects/aleksis/aleksis-app-chronos/de/>\n"
"Language: de_DE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -154,7 +153,7 @@ msgstr "Hintergrundfarbe"
#: aleksis/apps/chronos/models.py:353 aleksis/apps/chronos/models.py:389
#: aleksis/apps/chronos/models.py:443 aleksis/apps/chronos/models.py:1163
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:29
msgid "Subject"
msgstr "Fach"
@@ -170,7 +169,7 @@ msgstr "Kann Raumstundenpläne sehen"
#: aleksis/apps/chronos/models.py:375 aleksis/apps/chronos/models.py:451
#: aleksis/apps/chronos/models.py:520 aleksis/apps/chronos/models.py:738
#: aleksis/apps/chronos/models.py:1178
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
msgid "Room"
msgstr "Raum"
@@ -268,7 +267,7 @@ msgstr "Absenzgründe"
#: aleksis/apps/chronos/models.py:722 aleksis/apps/chronos/models.py:963
#: aleksis/apps/chronos/models.py:1012
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:45
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
msgid "Teacher"
msgstr "Lehrkraft"
@@ -569,12 +568,12 @@ msgstr "Heute"
msgid "CW"
msgstr "KW"
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:49
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:31
msgid "Notes"
msgstr "Notizen"
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:56
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:57
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:41
msgid "No substitutions available."
msgstr "Keine Vertretungen vorhanden."
diff --git a/aleksis/apps/chronos/locale/fr/LC_MESSAGES/django.po b/aleksis/apps/chronos/locale/fr/LC_MESSAGES/django.po
index b844f8e0..e690d8be 100644
--- a/aleksis/apps/chronos/locale/fr/LC_MESSAGES/django.po
+++ b/aleksis/apps/chronos/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 17:25+0100\n"
+"POT-Creation-Date: 2022-02-13 11:34+0000\n"
"PO-Revision-Date: 2021-06-16 11:59+0000\n"
"Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
"Language-Team: French <https://translate.edugit.org/projects/aleksis/aleksis-app-chronos/fr/>\n"
@@ -153,7 +153,7 @@ msgstr ""
#: aleksis/apps/chronos/models.py:353 aleksis/apps/chronos/models.py:389
#: aleksis/apps/chronos/models.py:443 aleksis/apps/chronos/models.py:1163
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:29
msgid "Subject"
msgstr "Sujet"
@@ -171,7 +171,7 @@ msgstr ""
#: aleksis/apps/chronos/models.py:375 aleksis/apps/chronos/models.py:451
#: aleksis/apps/chronos/models.py:520 aleksis/apps/chronos/models.py:738
#: aleksis/apps/chronos/models.py:1178
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
msgid "Room"
msgstr "Salle"
@@ -269,7 +269,7 @@ msgstr ""
#: aleksis/apps/chronos/models.py:722 aleksis/apps/chronos/models.py:963
#: aleksis/apps/chronos/models.py:1012
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:45
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
msgid "Teacher"
msgstr "prof"
@@ -570,12 +570,12 @@ msgstr ""
msgid "CW"
msgstr ""
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:49
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:31
msgid "Notes"
msgstr "Notes"
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:56
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:57
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:41
msgid "No substitutions available."
msgstr ""
diff --git a/aleksis/apps/chronos/locale/la/LC_MESSAGES/django.po b/aleksis/apps/chronos/locale/la/LC_MESSAGES/django.po
index e1e5470a..a5e7d42c 100644
--- a/aleksis/apps/chronos/locale/la/LC_MESSAGES/django.po
+++ b/aleksis/apps/chronos/locale/la/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 17:25+0100\n"
+"POT-Creation-Date: 2022-02-13 11:34+0000\n"
"PO-Revision-Date: 2020-08-23 13:49+0000\n"
"Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
"Language-Team: Latin <https://translate.edugit.org/projects/aleksis/aleksis-app-chronos/la/>\n"
@@ -153,7 +153,7 @@ msgstr ""
#: aleksis/apps/chronos/models.py:353 aleksis/apps/chronos/models.py:389
#: aleksis/apps/chronos/models.py:443 aleksis/apps/chronos/models.py:1163
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:29
msgid "Subject"
msgstr ""
@@ -169,7 +169,7 @@ msgstr ""
#: aleksis/apps/chronos/models.py:375 aleksis/apps/chronos/models.py:451
#: aleksis/apps/chronos/models.py:520 aleksis/apps/chronos/models.py:738
#: aleksis/apps/chronos/models.py:1178
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
msgid "Room"
msgstr ""
@@ -267,7 +267,7 @@ msgstr ""
#: aleksis/apps/chronos/models.py:722 aleksis/apps/chronos/models.py:963
#: aleksis/apps/chronos/models.py:1012
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:45
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
msgid "Teacher"
msgstr ""
@@ -568,12 +568,12 @@ msgstr ""
msgid "CW"
msgstr ""
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:49
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:31
msgid "Notes"
msgstr ""
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:56
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:57
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:41
msgid "No substitutions available."
msgstr ""
diff --git a/aleksis/apps/chronos/locale/nb_NO/LC_MESSAGES/django.po b/aleksis/apps/chronos/locale/nb_NO/LC_MESSAGES/django.po
index 419e9a0d..347adedd 100644
--- a/aleksis/apps/chronos/locale/nb_NO/LC_MESSAGES/django.po
+++ b/aleksis/apps/chronos/locale/nb_NO/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 17:25+0100\n"
+"POT-Creation-Date: 2022-02-13 11:34+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -152,7 +152,7 @@ msgstr ""
#: aleksis/apps/chronos/models.py:353 aleksis/apps/chronos/models.py:389
#: aleksis/apps/chronos/models.py:443 aleksis/apps/chronos/models.py:1163
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:29
msgid "Subject"
msgstr ""
@@ -168,7 +168,7 @@ msgstr ""
#: aleksis/apps/chronos/models.py:375 aleksis/apps/chronos/models.py:451
#: aleksis/apps/chronos/models.py:520 aleksis/apps/chronos/models.py:738
#: aleksis/apps/chronos/models.py:1178
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
msgid "Room"
msgstr ""
@@ -266,7 +266,7 @@ msgstr ""
#: aleksis/apps/chronos/models.py:722 aleksis/apps/chronos/models.py:963
#: aleksis/apps/chronos/models.py:1012
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:45
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
msgid "Teacher"
msgstr ""
@@ -567,12 +567,12 @@ msgstr ""
msgid "CW"
msgstr ""
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:49
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:31
msgid "Notes"
msgstr ""
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:56
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:57
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:41
msgid "No substitutions available."
msgstr ""
diff --git a/aleksis/apps/chronos/locale/tr_TR/LC_MESSAGES/django.po b/aleksis/apps/chronos/locale/tr_TR/LC_MESSAGES/django.po
index 419e9a0d..347adedd 100644
--- a/aleksis/apps/chronos/locale/tr_TR/LC_MESSAGES/django.po
+++ b/aleksis/apps/chronos/locale/tr_TR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 17:25+0100\n"
+"POT-Creation-Date: 2022-02-13 11:34+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -152,7 +152,7 @@ msgstr ""
#: aleksis/apps/chronos/models.py:353 aleksis/apps/chronos/models.py:389
#: aleksis/apps/chronos/models.py:443 aleksis/apps/chronos/models.py:1163
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:29
msgid "Subject"
msgstr ""
@@ -168,7 +168,7 @@ msgstr ""
#: aleksis/apps/chronos/models.py:375 aleksis/apps/chronos/models.py:451
#: aleksis/apps/chronos/models.py:520 aleksis/apps/chronos/models.py:738
#: aleksis/apps/chronos/models.py:1178
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
msgid "Room"
msgstr ""
@@ -266,7 +266,7 @@ msgstr ""
#: aleksis/apps/chronos/models.py:722 aleksis/apps/chronos/models.py:963
#: aleksis/apps/chronos/models.py:1012
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:45
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
msgid "Teacher"
msgstr ""
@@ -567,12 +567,12 @@ msgstr ""
msgid "CW"
msgstr ""
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:49
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:31
msgid "Notes"
msgstr ""
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:56
+#: aleksis/apps/chronos/templates/chronos/substitutions.html:57
#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:41
msgid "No substitutions available."
msgstr ""
--
GitLab
From 6dd56e0eeb7b21b7b494772a6d5ccdeee369ad67 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Sun, 13 Feb 2022 12:37:38 +0100
Subject: [PATCH 2/3] Bump version to 2.2.1
---
CHANGELOG.rst | 5 +++--
docs/conf.py | 2 +-
pyproject.toml | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 23afcccd..3c008d75 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,8 +6,8 @@ All notable changes to this project will be documented in this file.
The format is based on `Keep a Changelog`_,
and this project adheres to `Semantic Versioning`_.
-Unreleased
-----------
+`2.2.1`_ - 2022-02-13
+---------------------
Fixed
~~~~~
@@ -271,3 +271,4 @@ Fixed
.. _2.0: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0
.. _2.1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.1
.. _2.2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.2
+.. _2.2.1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.2.1
diff --git a/docs/conf.py b/docs/conf.py
index d14f96e5..07dff6ef 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -31,7 +31,7 @@ author = "The AlekSIS Team"
# The short X.Y version
version = "2.2"
# The full version, including alpha/beta/rc tags
-release = "2.2.1.dev0"
+release = "2.2.1"
# -- General configuration ---------------------------------------------------
diff --git a/pyproject.toml b/pyproject.toml
index 8599aaa5..d66dadfa 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "AlekSIS-App-Chronos"
-version = "2.2.1.dev0"
+version = "2.2.1"
packages = [
{ include = "aleksis" }
]
--
GitLab
From 7bdf56000ae8b346bc93aafc0df45109d3ff18fe Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Sun, 13 Feb 2022 12:48:13 +0100
Subject: [PATCH 3/3] Bump to next dev version
---
CHANGELOG.rst | 3 +++
docs/conf.py | 2 +-
pyproject.toml | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3c008d75..34d9d581 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,9 @@ All notable changes to this project will be documented in this file.
The format is based on `Keep a Changelog`_,
and this project adheres to `Semantic Versioning`_.
+Unreleased
+----------
+
`2.2.1`_ - 2022-02-13
---------------------
diff --git a/docs/conf.py b/docs/conf.py
index 07dff6ef..02d56cab 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -31,7 +31,7 @@ author = "The AlekSIS Team"
# The short X.Y version
version = "2.2"
# The full version, including alpha/beta/rc tags
-release = "2.2.1"
+release = "2.2.2.dev0"
# -- General configuration ---------------------------------------------------
diff --git a/pyproject.toml b/pyproject.toml
index d66dadfa..61150b1f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "AlekSIS-App-Chronos"
-version = "2.2.1"
+version = "2.2.2.dev0"
packages = [
{ include = "aleksis" }
]
--
GitLab