Skip to content

Commit

Permalink
Merge pull request #178 from fsinfuhh/enable-mattermost
Browse files Browse the repository at this point in the history
Add back mattermost
  • Loading branch information
timonegk authored Oct 17, 2024
2 parents 4551407 + 6569fb8 commit fe4dd5c
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 8 deletions.
14 changes: 12 additions & 2 deletions locale/de_DE/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -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 <markus.neblung@uni-hamburg.de>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
15 changes: 12 additions & 3 deletions locale/en_US/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -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 <markus.neblung@uni-hamburg.de>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
10 changes: 9 additions & 1 deletion locale/en_Uwu/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -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 <kritzl@kritzl.dev>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -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"
Expand Down
14 changes: 12 additions & 2 deletions locale/fr_FR/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -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 <markus.neblung@uni-hamburg.de>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
Empty file added mafiasi/mattermost/__init__.py
Empty file.
14 changes: 14 additions & 0 deletions mafiasi/mattermost/apps.py
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 2 additions & 0 deletions mafiasi/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit fe4dd5c

Please sign in to comment.