diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4458eeedd597df769772e69a1b0ec1a0ad451569..bcc864f53669c0c10dd729968c4d5c58b9969005 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -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 diff --git a/aleksis/apps/untis/locale/ar/LC_MESSAGES/django.po b/aleksis/apps/untis/locale/ar/LC_MESSAGES/django.po index f5147a1b0662869adc90e826b3db9b080f31db6e..d945f6a06939af5bcc38112ada1099db676f87ed 100644 --- a/aleksis/apps/untis/locale/ar/LC_MESSAGES/django.po +++ b/aleksis/apps/untis/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-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 "" diff --git a/aleksis/apps/untis/locale/de_DE/LC_MESSAGES/django.po b/aleksis/apps/untis/locale/de_DE/LC_MESSAGES/django.po index 16406b2f016e00210ff867a15115c2b4b978edf3..7fd1acecb9cb0ccbfc2a47676c6dbd6919199a02 100644 --- a/aleksis/apps/untis/locale/de_DE/LC_MESSAGES/django.po +++ b/aleksis/apps/untis/locale/de_DE/LC_MESSAGES/django.po @@ -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 {}" diff --git a/aleksis/apps/untis/locale/fr/LC_MESSAGES/django.po b/aleksis/apps/untis/locale/fr/LC_MESSAGES/django.po index 557dec883c29edc53528fb375f353a1f230fdcbf..069ee5bea3a74e7561798d36dbe8a2e48492b65b 100644 --- a/aleksis/apps/untis/locale/fr/LC_MESSAGES/django.po +++ b/aleksis/apps/untis/locale/fr/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-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 "" diff --git a/aleksis/apps/untis/locale/la/LC_MESSAGES/django.po b/aleksis/apps/untis/locale/la/LC_MESSAGES/django.po index 9eb774b7ab4827bef5b8d42f066f7a7d643df4c2..43ac9e3f3c4843d9600cd8991dfaddbd169f87a3 100644 --- a/aleksis/apps/untis/locale/la/LC_MESSAGES/django.po +++ b/aleksis/apps/untis/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-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 "" diff --git a/aleksis/apps/untis/locale/nb_NO/LC_MESSAGES/django.po b/aleksis/apps/untis/locale/nb_NO/LC_MESSAGES/django.po index cb504e0fae29f21401dd1503888a5a4e2538719a..d67e04ecf0368c0f9aa69874691256778dc41ed5 100644 --- a/aleksis/apps/untis/locale/nb_NO/LC_MESSAGES/django.po +++ b/aleksis/apps/untis/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-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 "" diff --git a/aleksis/apps/untis/locale/tr_TR/LC_MESSAGES/django.po b/aleksis/apps/untis/locale/tr_TR/LC_MESSAGES/django.po index cb504e0fae29f21401dd1503888a5a4e2538719a..d67e04ecf0368c0f9aa69874691256778dc41ed5 100644 --- a/aleksis/apps/untis/locale/tr_TR/LC_MESSAGES/django.po +++ b/aleksis/apps/untis/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-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 "" diff --git a/aleksis/apps/untis/util/mysql/importers/substitutions.py b/aleksis/apps/untis/util/mysql/importers/substitutions.py index a7202efcdc09cc1c9a178cf66c9206a4e83ac798..308ee4868bfe7dde3a6d594ccd6c4a565d014041 100644 --- a/aleksis/apps/untis/util/mysql/importers/substitutions.py +++ b/aleksis/apps/untis/util/mysql/importers/substitutions.py @@ -147,6 +147,7 @@ def import_substitutions( and not teachers and not cancelled and not cancelled_for_teachers + and not comment ): continue diff --git a/docs/conf.py b/docs/conf.py index 2525aa23b46099aafc8ee42fd7406c1420e73cb2..c6d2a9fa5181e38139d767e7e472553a3c1d434b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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 --------------------------------------------------- diff --git a/pyproject.toml b/pyproject.toml index c55fd67689bdaf0f8c5a55cb2943699e868a4c88..468e28dba206227db2678ef421ba90049bc401e3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "AlekSIS-App-Untis" -version = "2.1.2.dev0" +version = "2.1.3.dev0" packages = [ { include = "aleksis" } ]