From 6569fb83c5790a565d5a0ccb7a7155cbdb2c9bfb Mon Sep 17 00:00:00 2001 From: Timon Engelke Date: Thu, 17 Oct 2024 16:08:23 +0200 Subject: [PATCH 1/2] Add back mattermost This partially reverts commit a0a13c5a322e2ba691e567b8cc3550f04afe71cb. --- locale/de_DE/LC_MESSAGES/django.po | 14 ++++++++++++-- locale/en_US/LC_MESSAGES/django.po | 15 ++++++++++++--- locale/en_Uwu/LC_MESSAGES/django.po | 10 +++++++++- locale/fr_FR/LC_MESSAGES/django.po | 14 ++++++++++++-- mafiasi/mattermost/__init__.py | 0 mafiasi/mattermost/apps.py | 14 ++++++++++++++ mafiasi/settings.py | 2 ++ 7 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 mafiasi/mattermost/__init__.py create mode 100644 mafiasi/mattermost/apps.py diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index 21050648..1ca2fba2 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Mafiasi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-10-08 09:35+0200\n" +"POT-Creation-Date: 2024-10-17 16:04+0200\n" "PO-Revision-Date: 2024-09-03 23:52+0200\n" "Last-Translator: Markus Neblung \n" "Language-Team: \n" @@ -1555,6 +1555,14 @@ msgstr "" "Matrix ermöglicht dezentrales Chatten und VoIP mit Ende-zu-Ende-" "Verschlüsselung." +#: mafiasi/mattermost/apps.py:11 +msgid "Chat" +msgstr "Chat" + +#: mafiasi/mattermost/apps.py:12 +msgid "An online team chat service" +msgstr "Mattermost ist ein Online-Chatservice für Teams" + #: mafiasi/mensa/apps.py:11 msgid "Mensa" msgstr "Mensa" @@ -1563,7 +1571,9 @@ msgstr "Mensa" msgid "" "Look at what is available in the canteens and filter according to diet, " "allergens, etc." -msgstr "Schaue was es in den Mensen zu essen gibt und filtere nach Ernährungsweise, Allergenen usw." +msgstr "" +"Schaue was es in den Mensen zu essen gibt und filtere nach Ernährungsweise, " +"Allergenen usw." #: mafiasi/modulkompass/apps.py:11 msgid "Modulkompass" diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 7906bfdc..61a4c69d 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Mafiasi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-10-08 09:35+0200\n" +"POT-Creation-Date: 2024-10-17 16:04+0200\n" "PO-Revision-Date: 2024-01-18 22:42+0100\n" "Last-Translator: Markus Neblung \n" "Language-Team: \n" @@ -1413,6 +1413,14 @@ msgstr "" msgid "Matrix provides decentralized messaging and VoIP with E2E encryption." msgstr "" +#: mafiasi/mattermost/apps.py:11 +msgid "Chat" +msgstr "Chat" + +#: mafiasi/mattermost/apps.py:12 +msgid "An online team chat service" +msgstr "An online team chat service" + #: mafiasi/mensa/apps.py:11 msgid "Mensa" msgstr "Canteen" @@ -1421,8 +1429,9 @@ msgstr "Canteen" msgid "" "Look at what is available in the canteens and filter according to diet, " "allergens, etc." -msgstr "Look at what is available in the canteens and filter according to diet, " - "allergens, etc." +msgstr "" +"Look at what is available in the canteens and filter according to diet, " +"allergens, etc." #: mafiasi/modulkompass/apps.py:11 msgid "Modulkompass" diff --git a/locale/en_Uwu/LC_MESSAGES/django.po b/locale/en_Uwu/LC_MESSAGES/django.po index b10ce52b..0988bd2e 100644 --- a/locale/en_Uwu/LC_MESSAGES/django.po +++ b/locale/en_Uwu/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Mafiasi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-10-08 09:35+0200\n" +"POT-Creation-Date: 2024-10-17 16:04+0200\n" "PO-Revision-Date: 2024-01-09 22:14+0000\n" "Last-Translator: kritzl \n" "Language-Team: \n" @@ -1642,6 +1642,14 @@ msgstr "Meowtrix" msgid "Matrix provides decentralized messaging and VoIP with E2E encryption." msgstr "Hug frens. Virtually." +#: mafiasi/mattermost/apps.py:11 +msgid "Chat" +msgstr "Talksies" + +#: mafiasi/mattermost/apps.py:12 +msgid "An online team chat service" +msgstr "Hug frens. Virtually." + #: mafiasi/mensa/apps.py:11 msgid "Mensa" msgstr "Nomsies" diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 680fdf64..d526d7bf 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Mafiasi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-10-08 09:35+0200\n" +"POT-Creation-Date: 2024-10-17 16:04+0200\n" "PO-Revision-Date: 2024-09-03 23:54+0200\n" "Last-Translator: Markus Neblung \n" "Language-Team: \n" @@ -1564,6 +1564,14 @@ msgstr "" "Matrix fournit messagerie décentralisée et VoIP avec chiffrement de bout en " "bout." +#: mafiasi/mattermost/apps.py:11 +msgid "Chat" +msgstr "Chat" + +#: mafiasi/mattermost/apps.py:12 +msgid "An online team chat service" +msgstr "Mattermost est un service de chat de groupe en ligne" + #: mafiasi/mensa/apps.py:11 msgid "Mensa" msgstr "Cantine" @@ -1572,7 +1580,9 @@ msgstr "Cantine" msgid "" "Look at what is available in the canteens and filter according to diet, " "allergens, etc." -msgstr "Regarde ce qu'il y a à manger dans les restaurants universitaires et filtre en fonction du régime alimentaire, des allergènes, etc." +msgstr "" +"Regarde ce qu'il y a à manger dans les restaurants universitaires et filtre " +"en fonction du régime alimentaire, des allergènes, etc." #: mafiasi/modulkompass/apps.py:11 msgid "Modulkompass" diff --git a/mafiasi/mattermost/__init__.py b/mafiasi/mattermost/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/mafiasi/mattermost/apps.py b/mafiasi/mattermost/apps.py new file mode 100644 index 00000000..41823cd6 --- /dev/null +++ b/mafiasi/mattermost/apps.py @@ -0,0 +1,14 @@ +from django.conf import settings +from django.utils.translation import gettext_lazy as _ + +from mafiasi.base.base_apps import BaseService + + +class MattermostConfig(BaseService): + default = True + name = "mafiasi.mattermost" + verbose_name = "Mattermost" + title = _("Chat") + description = _("An online team chat service") + link = settings.MATTERMOST_URL + image = "img/services/mattermost.svg" diff --git a/mafiasi/settings.py b/mafiasi/settings.py index dbceca39..12248ddf 100644 --- a/mafiasi/settings.py +++ b/mafiasi/settings.py @@ -158,6 +158,7 @@ "mafiasi.nextcloud", "mafiasi.etherpad", "mafiasi.bitpoll", + "mafiasi.mattermost" if env.bool("MAFIASI_ENABLE_MATTERMOST", False) else None, "mafiasi.matrix" if env.bool("MAFIASI_ENABLE_MATRIX", True) else None, "mafiasi.mensa" if env.bool("MAFIASI_ENABLE_MENSA", True) else None, "mafiasi.modulkompass" if env.bool("MAFIASI_ENABLE_MODULKOMPASS", True) else None, @@ -316,6 +317,7 @@ BITPOLL_URL = env.str("MAFIASI_BITPOLL_URL", "https://bitpoll.mafiasi.de") WHITEBOARD_URL = "https://spacedeck.mafiasi.de" KANBOARD_URL = "https://kanboard.mafiasi.de" +MATTERMOST_URL = "https://mattermost.mafiasi.de" MATRIX_URL = "https://matrix.mafiasi.de" MENSA_URL = "https://mensa.mafiasi.de" MODULKOMPASS_URL = "https://modulkompass.mafiasi.de" From 1b10bd95b131952422215e54e7e6ad175ab0160d Mon Sep 17 00:00:00 2001 From: Timon Engelke Date: Thu, 17 Oct 2024 16:41:52 +0200 Subject: [PATCH 2/2] Use mattermost url from environment variable --- mafiasi/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mafiasi/settings.py b/mafiasi/settings.py index 12248ddf..dbed542c 100644 --- a/mafiasi/settings.py +++ b/mafiasi/settings.py @@ -317,7 +317,7 @@ BITPOLL_URL = env.str("MAFIASI_BITPOLL_URL", "https://bitpoll.mafiasi.de") WHITEBOARD_URL = "https://spacedeck.mafiasi.de" KANBOARD_URL = "https://kanboard.mafiasi.de" -MATTERMOST_URL = "https://mattermost.mafiasi.de" +MATTERMOST_URL = env.str("MAFIASI_MATTERMOST_URL", "https://mattermost.mafiasi.de") MATRIX_URL = "https://matrix.mafiasi.de" MENSA_URL = "https://mensa.mafiasi.de" MODULKOMPASS_URL = "https://modulkompass.mafiasi.de"