Merge branch 'master' into staging

fsinfuhh · Nov 18, 2024 · 22463bf · 22463bf
2 parents 5a10ed8 + 4b542a2
commit 22463bf
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 0 deletions.
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
@@ -3,6 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mafiasi\n"
 "Report-Msgid-Bugs-To: \n"
+
 "POT-Creation-Date: 2024-11-18 22:47+0100\n"
 "PO-Revision-Date: 2024-09-03 23:52+0200\n"
 "Last-Translator: Markus Neblung <[email protected]>\n"
@@ -1555,6 +1556,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"

diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
@@ -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"

diff --git a/locale/en_Uwu/LC_MESSAGES/django.po b/locale/en_Uwu/LC_MESSAGES/django.po
@@ -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
@@ -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"

diff --git a/mafiasi/mattermost/__init__.py b/mafiasi/mattermost/__init__.py
diff --git a/mafiasi/mattermost/apps.py 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
@@ -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 = 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"