Skip to content
Snippets Groups Projects
Commit e532623f authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch 'prepare-release-2.0' into 'release/2.0'

Prepare release 2.0

See merge request !59
parents 8b6dc217 9ba17426
No related branches found
No related tags found
1 merge request!59Prepare release 2.0
Pipeline #38561 passed
......@@ -6,6 +6,14 @@ 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`_.
`2.0`_ - 2021-10-30
-------------------
Changed
~~~~~~~
* German translations were updated.
`2.0rc1`_ - 2021-06-23
----------------------
......@@ -52,4 +60,4 @@ Added
.. _2.0a2: https://edugit.org/AlekSIS/Official/AlekSIS-App-DashboardFeeds/-/tags/2.0a2
.. _2.0b0: https://edugit.org/AlekSIS/Official/AlekSIS-App-DashboardFeeds/-/tags/2.0b0
.. _2.0rc1: https://edugit.org/AlekSIS/Official/AlekSIS-App-DashboardFeeds/-/tags/2.0rc1
.. _2.0: https://edugit.org/AlekSIS/Official/AlekSIS-App-DashboardFeeds/-/tags/2.0
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-20 21:05+0200\n"
"POT-Creation-Date: 2021-10-30 15:27+0200\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"
......@@ -18,55 +18,59 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
#: aleksis/apps/dashboardfeeds/models.py:18
#: aleksis/apps/dashboardfeeds/models.py:22
msgid "RSS feed source URL"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:20
#: aleksis/apps/dashboardfeeds/models.py:24
msgid "Base URL of related website"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:21
#: aleksis/apps/dashboardfeeds/models.py:25
msgid "The widget will have a link to visit a related website to read more news"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:24
#: aleksis/apps/dashboardfeeds/models.py:28
msgid "Text only"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:25
#: aleksis/apps/dashboardfeeds/models.py:29
msgid "Do not show an image to depict the news item"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:61
#: aleksis/apps/dashboardfeeds/models.py:65
msgid "RSS Widget"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:62
#: aleksis/apps/dashboardfeeds/models.py:66
msgid "RSS Widgets"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:77
#: aleksis/apps/dashboardfeeds/models.py:81
msgid "iCalendar URL"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:79
#: aleksis/apps/dashboardfeeds/models.py:83
msgid "Base URL of related calendar"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:80
#: aleksis/apps/dashboardfeeds/models.py:84
msgid "The widget will have a link to visit a related website to see more events"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:82
#: aleksis/apps/dashboardfeeds/models.py:86
msgid "Number of displayed events"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:96
#: aleksis/apps/dashboardfeeds/models.py:97
msgid "There was an error getting your calendar."
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:106
msgid "iCalendar Widget"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:97
#: aleksis/apps/dashboardfeeds/models.py:107
msgid "iCalendar Widgets"
msgstr ""
......@@ -98,7 +102,3 @@ msgstr ""
#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/rss.html:40
msgid "Further articles"
msgstr ""
#: aleksis/apps/dashboardfeeds/util/event_feed.py:98
msgid "There was an error getting your calendar"
msgstr ""
......@@ -7,66 +7,71 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-20 21:05+0200\n"
"PO-Revision-Date: 2020-05-04 14:32+0000\n"
"Last-Translator: Tom Teichler <tom.teichler@teckids.org>\n"
"Language-Team: German <https://translate.edugit.org/projects/aleksis/aleksis-app-dashboardfeeds/de/>\n"
"POT-Creation-Date: 2021-10-30 15:27+0200\n"
"PO-Revision-Date: 2021-10-30 13:55+0000\n"
"Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
"Language-Team: German <https://translate.edugit.org/projects/aleksis/"
"aleksis-app-dashboardfeeds/de/>\n"
"Language: de_DE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.0.1\n"
"X-Generator: Weblate 4.8\n"
#: aleksis/apps/dashboardfeeds/models.py:18
#: aleksis/apps/dashboardfeeds/models.py:22
msgid "RSS feed source URL"
msgstr "RSS-Feed-Quell-URL"
#: aleksis/apps/dashboardfeeds/models.py:20
#: aleksis/apps/dashboardfeeds/models.py:24
msgid "Base URL of related website"
msgstr "Basis-URL der verbundenen Website"
#: aleksis/apps/dashboardfeeds/models.py:21
#: aleksis/apps/dashboardfeeds/models.py:25
msgid "The widget will have a link to visit a related website to read more news"
msgstr "Dieses Widget wird einen Link haben, um die verbundene Website zu besuchen, um weitere Neuigkeiten zu erfahren"
#: aleksis/apps/dashboardfeeds/models.py:24
#: aleksis/apps/dashboardfeeds/models.py:28
msgid "Text only"
msgstr "Nur Text"
#: aleksis/apps/dashboardfeeds/models.py:25
#: aleksis/apps/dashboardfeeds/models.py:29
msgid "Do not show an image to depict the news item"
msgstr "Kein Bild darstellen"
msgstr "Kein Bild zum Beschreiben der Nachricht zeigen"
#: aleksis/apps/dashboardfeeds/models.py:61
#: aleksis/apps/dashboardfeeds/models.py:65
msgid "RSS Widget"
msgstr "RSS-Widget"
#: aleksis/apps/dashboardfeeds/models.py:62
#: aleksis/apps/dashboardfeeds/models.py:66
msgid "RSS Widgets"
msgstr "RSS-Widgets"
#: aleksis/apps/dashboardfeeds/models.py:77
#: aleksis/apps/dashboardfeeds/models.py:81
msgid "iCalendar URL"
msgstr "iCalendar-URL"
#: aleksis/apps/dashboardfeeds/models.py:79
#: aleksis/apps/dashboardfeeds/models.py:83
msgid "Base URL of related calendar"
msgstr "Basis-URL des verbundenen Kalenders"
#: aleksis/apps/dashboardfeeds/models.py:80
#: aleksis/apps/dashboardfeeds/models.py:84
msgid "The widget will have a link to visit a related website to see more events"
msgstr "Dieses Widget wird einen Link haben, um die verbundene Website zu besuchen, um mehr Veranstaltungen zu sehen"
#: aleksis/apps/dashboardfeeds/models.py:82
#: aleksis/apps/dashboardfeeds/models.py:86
msgid "Number of displayed events"
msgstr "Anzahl der anzuzeigenden Ereignisse"
#: aleksis/apps/dashboardfeeds/models.py:96
#: aleksis/apps/dashboardfeeds/models.py:97
msgid "There was an error getting your calendar."
msgstr "Beim Abrufen Ihres Kalenders gab es einen Fehler."
#: aleksis/apps/dashboardfeeds/models.py:106
msgid "iCalendar Widget"
msgstr "iCalendar-Widget"
#: aleksis/apps/dashboardfeeds/models.py:97
#: aleksis/apps/dashboardfeeds/models.py:107
msgid "iCalendar Widgets"
msgstr "iCalendar-Widgets"
......@@ -99,10 +104,6 @@ msgstr "Mehr lesen"
msgid "Further articles"
msgstr "Weitere Artikel"
#: aleksis/apps/dashboardfeeds/util/event_feed.py:98
msgid "There was an error getting your calendar"
msgstr ""
#~ msgid "RSS Url"
#~ msgstr "RSS-URL"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-20 21:05+0200\n"
"POT-Creation-Date: 2021-10-30 15:27+0200\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"
......@@ -18,55 +18,59 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: aleksis/apps/dashboardfeeds/models.py:18
#: aleksis/apps/dashboardfeeds/models.py:22
msgid "RSS feed source URL"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:20
#: aleksis/apps/dashboardfeeds/models.py:24
msgid "Base URL of related website"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:21
#: aleksis/apps/dashboardfeeds/models.py:25
msgid "The widget will have a link to visit a related website to read more news"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:24
#: aleksis/apps/dashboardfeeds/models.py:28
msgid "Text only"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:25
#: aleksis/apps/dashboardfeeds/models.py:29
msgid "Do not show an image to depict the news item"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:61
#: aleksis/apps/dashboardfeeds/models.py:65
msgid "RSS Widget"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:62
#: aleksis/apps/dashboardfeeds/models.py:66
msgid "RSS Widgets"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:77
#: aleksis/apps/dashboardfeeds/models.py:81
msgid "iCalendar URL"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:79
#: aleksis/apps/dashboardfeeds/models.py:83
msgid "Base URL of related calendar"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:80
#: aleksis/apps/dashboardfeeds/models.py:84
msgid "The widget will have a link to visit a related website to see more events"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:82
#: aleksis/apps/dashboardfeeds/models.py:86
msgid "Number of displayed events"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:96
#: aleksis/apps/dashboardfeeds/models.py:97
msgid "There was an error getting your calendar."
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:106
msgid "iCalendar Widget"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:97
#: aleksis/apps/dashboardfeeds/models.py:107
msgid "iCalendar Widgets"
msgstr ""
......@@ -98,7 +102,3 @@ msgstr ""
#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/rss.html:40
msgid "Further articles"
msgstr ""
#: aleksis/apps/dashboardfeeds/util/event_feed.py:98
msgid "There was an error getting your calendar"
msgstr ""
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-20 21:05+0200\n"
"POT-Creation-Date: 2021-10-30 15:27+0200\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"
......@@ -17,55 +17,59 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: aleksis/apps/dashboardfeeds/models.py:18
#: aleksis/apps/dashboardfeeds/models.py:22
msgid "RSS feed source URL"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:20
#: aleksis/apps/dashboardfeeds/models.py:24
msgid "Base URL of related website"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:21
#: aleksis/apps/dashboardfeeds/models.py:25
msgid "The widget will have a link to visit a related website to read more news"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:24
#: aleksis/apps/dashboardfeeds/models.py:28
msgid "Text only"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:25
#: aleksis/apps/dashboardfeeds/models.py:29
msgid "Do not show an image to depict the news item"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:61
#: aleksis/apps/dashboardfeeds/models.py:65
msgid "RSS Widget"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:62
#: aleksis/apps/dashboardfeeds/models.py:66
msgid "RSS Widgets"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:77
#: aleksis/apps/dashboardfeeds/models.py:81
msgid "iCalendar URL"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:79
#: aleksis/apps/dashboardfeeds/models.py:83
msgid "Base URL of related calendar"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:80
#: aleksis/apps/dashboardfeeds/models.py:84
msgid "The widget will have a link to visit a related website to see more events"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:82
#: aleksis/apps/dashboardfeeds/models.py:86
msgid "Number of displayed events"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:96
#: aleksis/apps/dashboardfeeds/models.py:97
msgid "There was an error getting your calendar."
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:106
msgid "iCalendar Widget"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:97
#: aleksis/apps/dashboardfeeds/models.py:107
msgid "iCalendar Widgets"
msgstr ""
......@@ -97,7 +101,3 @@ msgstr ""
#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/rss.html:40
msgid "Further articles"
msgstr ""
#: aleksis/apps/dashboardfeeds/util/event_feed.py:98
msgid "There was an error getting your calendar"
msgstr ""
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-20 21:05+0200\n"
"POT-Creation-Date: 2021-10-30 15:27+0200\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"
......@@ -17,55 +17,59 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: aleksis/apps/dashboardfeeds/models.py:18
#: aleksis/apps/dashboardfeeds/models.py:22
msgid "RSS feed source URL"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:20
#: aleksis/apps/dashboardfeeds/models.py:24
msgid "Base URL of related website"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:21
#: aleksis/apps/dashboardfeeds/models.py:25
msgid "The widget will have a link to visit a related website to read more news"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:24
#: aleksis/apps/dashboardfeeds/models.py:28
msgid "Text only"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:25
#: aleksis/apps/dashboardfeeds/models.py:29
msgid "Do not show an image to depict the news item"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:61
#: aleksis/apps/dashboardfeeds/models.py:65
msgid "RSS Widget"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:62
#: aleksis/apps/dashboardfeeds/models.py:66
msgid "RSS Widgets"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:77
#: aleksis/apps/dashboardfeeds/models.py:81
msgid "iCalendar URL"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:79
#: aleksis/apps/dashboardfeeds/models.py:83
msgid "Base URL of related calendar"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:80
#: aleksis/apps/dashboardfeeds/models.py:84
msgid "The widget will have a link to visit a related website to see more events"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:82
#: aleksis/apps/dashboardfeeds/models.py:86
msgid "Number of displayed events"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:96
#: aleksis/apps/dashboardfeeds/models.py:97
msgid "There was an error getting your calendar."
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:106
msgid "iCalendar Widget"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:97
#: aleksis/apps/dashboardfeeds/models.py:107
msgid "iCalendar Widgets"
msgstr ""
......@@ -97,7 +101,3 @@ msgstr ""
#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/rss.html:40
msgid "Further articles"
msgstr ""
#: aleksis/apps/dashboardfeeds/util/event_feed.py:98
msgid "There was an error getting your calendar"
msgstr ""
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-20 21:05+0200\n"
"POT-Creation-Date: 2021-10-30 15:27+0200\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"
......@@ -17,55 +17,59 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: aleksis/apps/dashboardfeeds/models.py:18
#: aleksis/apps/dashboardfeeds/models.py:22
msgid "RSS feed source URL"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:20
#: aleksis/apps/dashboardfeeds/models.py:24
msgid "Base URL of related website"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:21
#: aleksis/apps/dashboardfeeds/models.py:25
msgid "The widget will have a link to visit a related website to read more news"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:24
#: aleksis/apps/dashboardfeeds/models.py:28
msgid "Text only"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:25
#: aleksis/apps/dashboardfeeds/models.py:29
msgid "Do not show an image to depict the news item"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:61
#: aleksis/apps/dashboardfeeds/models.py:65
msgid "RSS Widget"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:62
#: aleksis/apps/dashboardfeeds/models.py:66
msgid "RSS Widgets"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:77
#: aleksis/apps/dashboardfeeds/models.py:81
msgid "iCalendar URL"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:79
#: aleksis/apps/dashboardfeeds/models.py:83
msgid "Base URL of related calendar"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:80
#: aleksis/apps/dashboardfeeds/models.py:84
msgid "The widget will have a link to visit a related website to see more events"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:82
#: aleksis/apps/dashboardfeeds/models.py:86
msgid "Number of displayed events"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:96
#: aleksis/apps/dashboardfeeds/models.py:97
msgid "There was an error getting your calendar."
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:106
msgid "iCalendar Widget"
msgstr ""
#: aleksis/apps/dashboardfeeds/models.py:97
#: aleksis/apps/dashboardfeeds/models.py:107
msgid "iCalendar Widgets"
msgstr ""
......@@ -97,7 +101,3 @@ msgstr ""
#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/rss.html:40
msgid "Further articles"
msgstr ""
#: aleksis/apps/dashboardfeeds/util/event_feed.py:98
msgid "There was an error getting your calendar"
msgstr ""
This diff is collapsed.
[tool.poetry]
name = "AlekSIS-App-DashboardFeeds"
version = "2.0rc1"
version = "2.0"
packages = [
{ include = "aleksis" }
]
......@@ -16,7 +16,7 @@ repository = "https://edugit.org/AlekSIS/official/AlekSIS-App-DashboardFeeds"
documentation = "https://aleksis.org/AlekSIS/docs/html/"
keywords = ["SIS", "education", "school", "calendar", "rss"]
classifiers = [
"Development Status :: 4 - Beta",
"Development Status :: 5 - Production/Stable",
"Environment :: Web Environment",
"Framework :: Django :: 3.0",
"Intended Audience :: Education",
......@@ -34,7 +34,7 @@ python = "^3.9"
feedparser = "^6.0.0"
django-feed-reader = "^1.0.0"
ics = "^0.7"
aleksis-core = "^2.0rc"
aleksis-core = "^2.0"
[tool.poetry.dev-dependencies]
aleksis-builddeps = "*"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment