Skip to content
Snippets Groups Projects
Verified Commit 0c5c088d authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'master' into 41-create-match-failures-as-data-checks

parents 8f1d864e 97f3c2da
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 46 additions and 11 deletions
CHANGELOG.rst
+ 12
− 2
View file @ 0c5c088d
......@@ -9,8 +9,17 @@ and this project adheres to `Semantic Versioning`_.
Unreleased
----------
Changed
~~~~~~~
Fixed
~~~~~
* With ignoring of incomplete subsitutions enabled,
substitutions which consisted just of a comment were skipped.
`2.1.2`_ - 2022-02-06
---------------------
Fixed
~~~~~
* Do not import incomplete substitutions.
......@@ -166,3 +175,4 @@ Fixed
.. _2.0: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.0
.. _2.1: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.1
.. _2.1.1: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.1.1
.. _2.1.2: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.1.2
aleksis/apps/untis/locale/ar/LC_MESSAGES/django.po
+ 5
− 1
View file @ 0c5c088d
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-01-13 21:43+0100\n"
"POT-Creation-Date: 2022-02-06 16:50+0100\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"
......@@ -115,6 +115,10 @@ msgstr ""
msgid "Build or search course groups for every course instead of setting classes as groups."
msgstr ""
#: aleksis/apps/untis/preferences.py:99
msgid "Ignore incomplete substitutions"
msgstr ""
#: aleksis/apps/untis/util/mysql/importers/lessons.py:43
msgid "Import lesson {}"
msgstr ""
......
aleksis/apps/untis/locale/de_DE/LC_MESSAGES/django.po
+ 6
− 2
View file @ 0c5c088d
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-01-13 21:43+0100\n"
"PO-Revision-Date: 2022-01-13 20:46+0000\n"
"POT-Creation-Date: 2022-02-06 16:50+0100\n"
"PO-Revision-Date: 2022-02-06 15:56+0000\n"
"Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
"Language-Team: German <https://translate.edugit.org/projects/aleksis/"
"aleksis-app-untis/de/>\n"
......@@ -116,6 +116,10 @@ msgstr "Kursgruppen nutzen"
msgid "Build or search course groups for every course instead of setting classes as groups."
msgstr "Baut oder findet Kursgruppen für jeden Kurs anstatt die Klassengruppen zu setzen."
#: aleksis/apps/untis/preferences.py:99
msgid "Ignore incomplete substitutions"
msgstr "Unvollständige Vertretungen ignorieren"
#: aleksis/apps/untis/util/mysql/importers/lessons.py:43
msgid "Import lesson {}"
msgstr "Importiere Stunde {}"
......
aleksis/apps/untis/locale/fr/LC_MESSAGES/django.po
+ 5
− 1
View file @ 0c5c088d
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-01-13 21:43+0100\n"
"POT-Creation-Date: 2022-02-06 16:50+0100\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"
......@@ -115,6 +115,10 @@ msgstr ""
msgid "Build or search course groups for every course instead of setting classes as groups."
msgstr ""
#: aleksis/apps/untis/preferences.py:99
msgid "Ignore incomplete substitutions"
msgstr ""
#: aleksis/apps/untis/util/mysql/importers/lessons.py:43
msgid "Import lesson {}"
msgstr ""
......
aleksis/apps/untis/locale/la/LC_MESSAGES/django.po
+ 5
− 1
View file @ 0c5c088d
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-01-13 21:43+0100\n"
"POT-Creation-Date: 2022-02-06 16:50+0100\n"
"PO-Revision-Date: 2020-08-25 17:42+0000\n"
"Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
"Language-Team: Latin <https://translate.edugit.org/projects/aleksis/aleksis-app-untis/la/>\n"
......@@ -115,6 +115,10 @@ msgstr ""
msgid "Build or search course groups for every course instead of setting classes as groups."
msgstr ""
#: aleksis/apps/untis/preferences.py:99
msgid "Ignore incomplete substitutions"
msgstr ""
#: aleksis/apps/untis/util/mysql/importers/lessons.py:43
msgid "Import lesson {}"
msgstr ""
......
aleksis/apps/untis/locale/nb_NO/LC_MESSAGES/django.po
+ 5
− 1
View file @ 0c5c088d
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-01-13 21:43+0100\n"
"POT-Creation-Date: 2022-02-06 16:50+0100\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"
......@@ -114,6 +114,10 @@ msgstr ""
msgid "Build or search course groups for every course instead of setting classes as groups."
msgstr ""
#: aleksis/apps/untis/preferences.py:99
msgid "Ignore incomplete substitutions"
msgstr ""
#: aleksis/apps/untis/util/mysql/importers/lessons.py:43
msgid "Import lesson {}"
msgstr ""
......
aleksis/apps/untis/locale/tr_TR/LC_MESSAGES/django.po
+ 5
− 1
View file @ 0c5c088d
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-01-13 21:43+0100\n"
"POT-Creation-Date: 2022-02-06 16:50+0100\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"
......@@ -114,6 +114,10 @@ msgstr ""
msgid "Build or search course groups for every course instead of setting classes as groups."
msgstr ""
#: aleksis/apps/untis/preferences.py:99
msgid "Ignore incomplete substitutions"
msgstr ""
#: aleksis/apps/untis/util/mysql/importers/lessons.py:43
msgid "Import lesson {}"
msgstr ""
......
aleksis/apps/untis/util/mysql/importers/substitutions.py
+ 1
− 0
View file @ 0c5c088d
......@@ -147,6 +147,7 @@ def import_substitutions(
and not teachers
and not cancelled
and not cancelled_for_teachers
and not comment
):
continue
......
docs/conf.py
+ 1
− 1
View file @ 0c5c088d
......@@ -31,7 +31,7 @@ author = "The AlekSIS Team"
# The short X.Y version
version = "2.1"
# The full version, including alpha/beta/rc tags
release = "2.1.2.dev0"
release = "2.1.3.dev0"
# -- General configuration ---------------------------------------------------
......
pyproject.toml
+ 1
− 1
View file @ 0c5c088d
[tool.poetry]
name = "AlekSIS-App-Untis"
version = "2.1.2.dev0"
version = "2.1.3.dev0"
packages = [
{ include = "aleksis" }
]
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment