CHANGELOG.rst

@@ -6,6 +6,19 @@ 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.1`_ - 2022-06-23
+-------------------
+
+Added
+~~~~~
+
+* Add Ukrainian locale (contributed by Sergiy Gorichenko from Fre(i)e Software GmbH).
+
+Changed
+~~~~~~~
+
+* The `base_url` of iCal and RSS widgets is now optional
+
 `2.0.1`_ - 2022-01-21
 ---------------------
 
@@ -75,3 +88,4 @@ Added
 .. _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
 .. _2.0.1: https://edugit.org/AlekSIS/Official/AlekSIS-App-DashboardFeeds/-/tags/2.0.1
+.. _2.1: https://edugit.org/AlekSIS/Official/AlekSIS-App-DashboardFeeds/-/tags/2.1

README.rst

@@ -19,6 +19,7 @@ Licence
 
   Copyright © 2020 Dominik George <dominik.george@teckids.org>
   Copyright © 2020 Julian Leucker <leuckerj@gmail.com>
+  Copyright © 2022 Jonathan Weth <dev@jonathanweth.de>
 
   Licenced under the EUPL, version 1.2 or later, by Teckids e.V. (Bonn, Germany).
 

aleksis/apps/dashboardfeeds/apps.py

@@ -12,4 +12,5 @@ class DefaultConfig(AppConfig):
     copyright_info = (
         ([2020], "Dominik George", "dominik.george@teckids.org"),
         ([2020], "Julian Leucker", "leuckeju@katharineum.de"),
+        ([2022], "Jonathan Weth", "dev@jonathanweth.de"),
     )

aleksis/apps/dashboardfeeds/locale/ru/LC_MESSAGES/django.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-04-23 12:43+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
+#: aleksis/apps/dashboardfeeds/models.py:22
+msgid "RSS feed source URL"
+msgstr ""
+
+#: aleksis/apps/dashboardfeeds/models.py:24
+msgid "Base URL of related website"
+msgstr ""
+
+#: 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:28
+msgid "Text only"
+msgstr ""
+
+#: aleksis/apps/dashboardfeeds/models.py:29
+msgid "Do not show an image to depict the news item"
+msgstr ""
+
+#: aleksis/apps/dashboardfeeds/models.py:65
+msgid "RSS Widget"
+msgstr ""
+
+#: aleksis/apps/dashboardfeeds/models.py:66
+msgid "RSS Widgets"
+msgstr ""
+
+#: aleksis/apps/dashboardfeeds/models.py:81
+msgid "iCalendar URL"
+msgstr ""
+
+#: aleksis/apps/dashboardfeeds/models.py:83
+msgid "Base URL of related calendar"
+msgstr ""
+
+#: 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:86
+msgid "Number of displayed events"
+msgstr ""
+
+#: 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:107
+msgid "iCalendar Widgets"
+msgstr ""
+
+#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/ical.html:5
+msgid "Current Events"
+msgstr ""
+
+#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/ical.html:12
+msgid "No events to display"
+msgstr ""
+
+#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/ical.html:18
+msgid "Further events"
+msgstr ""
+
+#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/rss.html:19
+#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/rss.html:21
+msgid "title image"
+msgstr ""
+
+#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/rss.html:24
+msgid "no feed image"
+msgstr ""
+
+#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/rss.html:36
+msgid "Read more"
+msgstr ""
+
+#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/rss.html:40
+msgid "Further articles"
+msgstr ""

aleksis/apps/dashboardfeeds/locale/uk/LC_MESSAGES/django.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-04-23 12:43+0000\n"
+"PO-Revision-Date: 2022-04-29 14:24+0000\n"
+"Last-Translator: Serhii Horichenko <m@sgg.im>\n"
+"Language-Team: Ukrainian <https://translate.edugit.org/projects/aleksis/"
+"aleksis-app-dashboardfeeds/uk/>\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 "
+"? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > "
+"14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % "
+"100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
+"X-Generator: Weblate 4.8\n"
+
+#: aleksis/apps/dashboardfeeds/models.py:22
+msgid "RSS feed source URL"
+msgstr "Посилання-джерело для RSS"
+
+#: aleksis/apps/dashboardfeeds/models.py:24
+msgid "Base URL of related website"
+msgstr "Основний URL пов'язаного сайту"
+
+#: 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:28
+msgid "Text only"
+msgstr "Лише текст"
+
+#: aleksis/apps/dashboardfeeds/models.py:29
+msgid "Do not show an image to depict the news item"
+msgstr "Не показувати зображення для опису новин"
+
+#: aleksis/apps/dashboardfeeds/models.py:65
+msgid "RSS Widget"
+msgstr "Віджет RSS"
+
+#: aleksis/apps/dashboardfeeds/models.py:66
+msgid "RSS Widgets"
+msgstr "Віджети RSS"
+
+#: aleksis/apps/dashboardfeeds/models.py:81
+msgid "iCalendar URL"
+msgstr "Посилання для iCalendar"
+
+#: aleksis/apps/dashboardfeeds/models.py:83
+msgid "Base URL of related calendar"
+msgstr "Основне посилання пов'язаного календаря"
+
+#: 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:86
+msgid "Number of displayed events"
+msgstr "Кількість зображених подій"
+
+#: 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 "Віджет iCalendar"
+
+#: aleksis/apps/dashboardfeeds/models.py:107
+msgid "iCalendar Widgets"
+msgstr "Віджети iCalendar"
+
+#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/ical.html:5
+msgid "Current Events"
+msgstr "Поточні події"
+
+#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/ical.html:12
+msgid "No events to display"
+msgstr "Немає подій для відображення"
+
+#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/ical.html:18
+msgid "Further events"
+msgstr "Майбутні події"
+
+#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/rss.html:19
+#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/rss.html:21
+msgid "title image"
+msgstr "фото для заголовка"
+
+#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/rss.html:24
+msgid "no feed image"
+msgstr "немає фото"
+
+#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/rss.html:36
+msgid "Read more"
+msgstr "Читати ще"
+
+#: aleksis/apps/dashboardfeeds/templates/dashboardfeeds/rss.html:40
+msgid "Further articles"
+msgstr "Майбутні статті"

aleksis/apps/dashboardfeeds/migrations/0002_link_field_optional.py

+# Generated by Django 3.2.13 on 2022-05-03 18:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboardfeeds', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='icalfeedwidget',
+            name='base_url',
+            field=models.URLField(blank=True, help_text='The widget will have a link to visit a related website to see more events', verbose_name='Base URL of related calendar'),
+        ),
+        migrations.AlterField(
+            model_name='rssfeedwidget',
+            name='base_url',
+            field=models.URLField(blank=True, help_text='The widget will have a link to visit a related website to read more news', verbose_name='Base URL of related website'),
+        ),
+    ]

aleksis/apps/dashboardfeeds/models.py

@@ -23,6 +23,7 @@ class RSSFeedWidget(DashboardWidget):
     base_url = models.URLField(
         verbose_name=_("Base URL of related website"),
         help_text=_("The widget will have a link to visit a related website to read more news"),
+        blank=True,
     )
     text_only = models.BooleanField(
         verbose_name=_("Text only"),
@@ -80,6 +81,7 @@ class ICalFeedWidget(DashboardWidget):
 
     url = models.URLField(verbose_name=_("iCalendar URL"))
     base_url = models.URLField(
+        blank=True,
         verbose_name=_("Base URL of related calendar"),
         help_text=_("The widget will have a link to visit a related website to see more events"),
     )

aleksis/apps/dashboardfeeds/templates/dashboardfeeds/ical.html

@@ -12,7 +12,7 @@
       <span>{% trans "No events to display" %}</span>
     {% endfor %}
   </div>
-  {% if feed_events %}
+  {% if feed_events and base_url %}
     <div class="card-action">
       <a href="{{ base_url }}" target="_blank">
         {% trans "Further events" %}

aleksis/apps/dashboardfeeds/templates/dashboardfeeds/rss.html

@@ -36,8 +36,10 @@
       <a href="{{ result.link }}" target="_blank">{% trans "Read more" %}</a>
     </div>
   </div>
-  <a class="btn hundred-percent primary-color" href="{{ base_url }}" target="_blank">
-    {% trans "Further articles" %}
-    <i class="material-icons right">arrow_forward</i>
-  </a>
+  {% if base_url %}
+    <a class="btn hundred-percent primary-color" href="{{ base_url }}" target="_blank">
+      {% trans "Further articles" %}
+      <i class="material-icons right">arrow_forward</i>
+    </a>
+  {% endif %}
 </div>

docs/conf.py

@@ -29,9 +29,9 @@ copyright = "2020-2022 The AlekSIS team"
 author = "The AlekSIS Team"
 
 # The short X.Y version
-version = "2.0"
+version = "2.1"
 # The full version, including alpha/beta/rc tags
-release = "2.0.1"
+release = "2.1"
 
 
 # -- General configuration ---------------------------------------------------

pyproject.toml

 [tool.poetry]
 name = "AlekSIS-App-DashboardFeeds"
-version = "2.0.1"
+version = "2.1"
 packages = [
     { include = "aleksis" }
 ]
@@ -44,7 +44,7 @@ ics = "^0.7"
 aleksis-core = "^2.0"
 
 [tool.poetry.dev-dependencies]
-aleksis-builddeps = "^6"
+aleksis-builddeps = "*"
 
 [tool.poetry.plugins."aleksis.app"]
 dashboardfeeds = "aleksis.apps.dashboardfeeds.apps:DefaultConfig"

tox.ini

@@ -49,8 +49,8 @@ commands =
 
 [testenv:makemessages]
 commands =
-    poetry run aleksis-admin makemessages --no-wrap -e html,txt,py,email -i static -l ar -l de_DE -l fr -l nb_NO -l tr_TR -l la
-    poetry run aleksis-admin makemessages --no-wrap -d djangojs -i **/node_modules -l ar -l de_DE -l fr -l nb_NO -l tr_TR -l la
+    poetry run aleksis-admin makemessages --no-wrap -e html,txt,py,email -i static -l ar -l de_DE -l fr -l nb_NO -l tr_TR -l la -l uk -l ru
+    poetry run aleksis-admin makemessages --no-wrap -d djangojs -i **/node_modules -l ar -l de_DE -l fr -l nb_NO -l tr_TR -l la -l uk -l ru
 
 [flake8]
 max_line_length = 100