Merge branch 'master' into staging

fsinfuhh · Sep 9, 2024 · 592588b · 592588b
2 parents 1f6dd15 + 6ff9c79
commit 592588b
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 63 deletions.
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
@@ -39,51 +39,51 @@ msgstr ""
 "Bitte versuche es später nochmal. Falls das Problem bestehen bleibt, schaue "
 "auf unsere <a href=\"%(problems_url)s\">Fehlermeldeseite</a>."
 
-#: mafiasi/base/templates/base.html:46
+#: mafiasi/base/templates/base.html:47
 msgid "Disable surprise"
 msgstr "Überraschung abschalten"
 
-#: mafiasi/base/templates/base.html:56
+#: mafiasi/base/templates/base.html:57
 msgid "Groups"
 msgstr "Gruppen"
 
-#: mafiasi/base/templates/base.html:64
+#: mafiasi/base/templates/base.html:65
 #: mafiasi/mailinglist/templates/mailinglist/show_list.html:46
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: mafiasi/base/templates/base.html:67
+#: mafiasi/base/templates/base.html:68
 #, python-format
 msgid "Logged in as %(username)s"
 msgstr "Angemeldet als %(username)s"
 
-#: mafiasi/base/templates/base.html:70
+#: mafiasi/base/templates/base.html:71
 msgid "Logout"
 msgstr "Abmelden"
 
-#: mafiasi/base/templates/base.html:76
+#: mafiasi/base/templates/base.html:77
 #: mafiasi/registration/templates/registration/request_account.html:38
 #: mafiasi/registration/templates/registration/request_account.html:77
 msgid "Register"
 msgstr "Registrieren"
 
-#: mafiasi/base/templates/base.html:78
+#: mafiasi/base/templates/base.html:79
 msgid "Login"
 msgstr "Login"
 
-#: mafiasi/base/templates/base.html:107
+#: mafiasi/base/templates/base.html:108
 msgid "Imprint"
 msgstr "Impressum"
 
-#: mafiasi/base/templates/base.html:109
+#: mafiasi/base/templates/base.html:110
 msgid "Data privacy statement"
 msgstr "Datenschutzerklärung"
 
-#: mafiasi/base/templates/base.html:111
+#: mafiasi/base/templates/base.html:112
 msgid "Technical info"
 msgstr "Technik"
 
-#: mafiasi/base/templates/base.html:113
+#: mafiasi/base/templates/base.html:114
 #: mafiasi/base/templates/base/problems.html:4
 msgid "Problems?"
 msgstr "Probleme?"
@@ -128,10 +128,6 @@ msgstr "Diese Seite benutzt folgende Software/Komponenten:"
 msgid "Listed in no particular order."
 msgstr "In willkürlicher Reihenfolge aufgelistet."
 
-#: mafiasi/base/templates/base_raw.html:7
-msgid "Mafiasi"
-msgstr "Mafiasi"
-
 #: mafiasi/base/tokenbucket.py:27
 msgid "Limit for {} reached. Please wait until {}."
 msgstr "Grenze für {} erreicht. Bitte warte bis {}."
@@ -2299,3 +2295,6 @@ msgstr "Wiki"
 msgid "In the wiki you will find important information regarding your studies."
 msgstr ""
 "Im Wiki findest du wichtige Informationen zum Studium. Beteiligen erwünscht!"
+
+#~ msgid "Mafiasi"
+#~ msgstr "Mafiasi"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
@@ -31,51 +31,51 @@ msgid ""
 "href=\"%(problems_url)s\">problem reporting page</a>."
 msgstr ""
 
-#: mafiasi/base/templates/base.html:46
+#: mafiasi/base/templates/base.html:47
 msgid "Disable surprise"
 msgstr ""
 
-#: mafiasi/base/templates/base.html:56
+#: mafiasi/base/templates/base.html:57
 msgid "Groups"
 msgstr ""
 
-#: mafiasi/base/templates/base.html:64
+#: mafiasi/base/templates/base.html:65
 #: mafiasi/mailinglist/templates/mailinglist/show_list.html:46
 msgid "Settings"
 msgstr ""
 
-#: mafiasi/base/templates/base.html:67
+#: mafiasi/base/templates/base.html:68
 #, python-format
 msgid "Logged in as %(username)s"
 msgstr ""
 
-#: mafiasi/base/templates/base.html:70
+#: mafiasi/base/templates/base.html:71
 msgid "Logout"
 msgstr ""
 
-#: mafiasi/base/templates/base.html:76
+#: mafiasi/base/templates/base.html:77
 #: mafiasi/registration/templates/registration/request_account.html:38
 #: mafiasi/registration/templates/registration/request_account.html:77
 msgid "Register"
 msgstr ""
 
-#: mafiasi/base/templates/base.html:78
+#: mafiasi/base/templates/base.html:79
 msgid "Login"
 msgstr ""
 
-#: mafiasi/base/templates/base.html:107
+#: mafiasi/base/templates/base.html:108
 msgid "Imprint"
 msgstr ""
 
-#: mafiasi/base/templates/base.html:109
+#: mafiasi/base/templates/base.html:110
 msgid "Data privacy statement"
 msgstr ""
 
-#: mafiasi/base/templates/base.html:111
+#: mafiasi/base/templates/base.html:112
 msgid "Technical info"
 msgstr ""
 
-#: mafiasi/base/templates/base.html:113
+#: mafiasi/base/templates/base.html:114
 #: mafiasi/base/templates/base/problems.html:4
 msgid "Problems?"
 msgstr ""
@@ -115,10 +115,6 @@ msgstr ""
 msgid "Listed in no particular order."
 msgstr ""
 
-#: mafiasi/base/templates/base_raw.html:7
-msgid "Mafiasi"
-msgstr ""
-
 #: mafiasi/base/tokenbucket.py:27
 msgid "Limit for {} reached. Please wait until {}."
 msgstr ""

diff --git a/locale/en_Uwu/LC_MESSAGES/django.po b/locale/en_Uwu/LC_MESSAGES/django.po
@@ -42,51 +42,51 @@ msgstr ""
 "again later. If the problem persists, see our <a "
 "href=\"%(problems_url)s\">problem reporting page</a>."
 
-#: mafiasi/base/templates/base.html:46
+#: mafiasi/base/templates/base.html:47
 msgid "Disable surprise"
 msgstr "Me no like this mess ._."
 
-#: mafiasi/base/templates/base.html:56
+#: mafiasi/base/templates/base.html:57
 msgid "Groups"
 msgstr "frens"
 
-#: mafiasi/base/templates/base.html:64
+#: mafiasi/base/templates/base.html:65
 #: mafiasi/mailinglist/templates/mailinglist/show_list.html:46
 msgid "Settings"
 msgstr "Change me ＞﹏＜"
 
-#: mafiasi/base/templates/base.html:67
+#: mafiasi/base/templates/base.html:68
 #, python-format
 msgid "Logged in as %(username)s"
 msgstr "U is %(username)s"
 
-#: mafiasi/base/templates/base.html:70
+#: mafiasi/base/templates/base.html:71
 msgid "Logout"
 msgstr "Bye bye 👋"
 
-#: mafiasi/base/templates/base.html:76
+#: mafiasi/base/templates/base.html:77
 #: mafiasi/registration/templates/registration/request_account.html:38
 #: mafiasi/registration/templates/registration/request_account.html:77
 msgid "Register"
 msgstr "Become fren <3"
 
-#: mafiasi/base/templates/base.html:78
+#: mafiasi/base/templates/base.html:79
 msgid "Login"
 msgstr "Get inside"
 
-#: mafiasi/base/templates/base.html:107
+#: mafiasi/base/templates/base.html:108
 msgid "Imprint"
 msgstr "Pawprint"
 
-#: mafiasi/base/templates/base.html:109
+#: mafiasi/base/templates/base.html:110
 msgid "Data privacy statement"
 msgstr "How me uses ur data"
 
-#: mafiasi/base/templates/base.html:111
+#: mafiasi/base/templates/base.html:112
 msgid "Technical info"
 msgstr "Complicated thingies"
 
-#: mafiasi/base/templates/base.html:113
+#: mafiasi/base/templates/base.html:114
 #: mafiasi/base/templates/base/problems.html:4
 msgid "Problems?"
 msgstr "Problems?"
@@ -129,10 +129,6 @@ msgstr "This site uses the following software/components:"
 msgid "Listed in no particular order."
 msgstr "Listed in no particular order."
 
-#: mafiasi/base/templates/base_raw.html:7
-msgid "Mafiasi"
-msgstr "Mafiasi UwU"
-
 #: mafiasi/base/tokenbucket.py:27
 msgid "Limit for {} reached. Please wait until {}."
 msgstr "Limit for {} reached. Please wait until {}."
@@ -2375,6 +2371,9 @@ msgstr "Knowings"
 msgid "In the wiki you will find important information regarding your studies."
 msgstr "Knowings has many impawtant info! Pls read! :3"
 
+#~ msgid "Mafiasi"
+#~ msgstr "Mafiasi UwU"
+
 #, fuzzy
 #~| msgid ""
 #~| "\n"

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
@@ -39,51 +39,51 @@ msgstr ""
 "problème persiste, consultez notre <a href=\"%(problems_url)s\"> page de "
 "rapports d'incidents </a>."
 
-#: mafiasi/base/templates/base.html:46
+#: mafiasi/base/templates/base.html:47
 msgid "Disable surprise"
 msgstr "Désactiver la surprise"
 
-#: mafiasi/base/templates/base.html:56
+#: mafiasi/base/templates/base.html:57
 msgid "Groups"
 msgstr "Groupes"
 
-#: mafiasi/base/templates/base.html:64
+#: mafiasi/base/templates/base.html:65
 #: mafiasi/mailinglist/templates/mailinglist/show_list.html:46
 msgid "Settings"
 msgstr "Paramètres"
 
-#: mafiasi/base/templates/base.html:67
+#: mafiasi/base/templates/base.html:68
 #, python-format
 msgid "Logged in as %(username)s"
 msgstr "Connecté en tant que %(username)s"
 
-#: mafiasi/base/templates/base.html:70
+#: mafiasi/base/templates/base.html:71
 msgid "Logout"
 msgstr "Déconnecter"
 
-#: mafiasi/base/templates/base.html:76
+#: mafiasi/base/templates/base.html:77
 #: mafiasi/registration/templates/registration/request_account.html:38
 #: mafiasi/registration/templates/registration/request_account.html:77
 msgid "Register"
 msgstr "Enregistrez-Vous"
 
-#: mafiasi/base/templates/base.html:78
+#: mafiasi/base/templates/base.html:79
 msgid "Login"
 msgstr "Connectez-Vouz"
 
-#: mafiasi/base/templates/base.html:107
+#: mafiasi/base/templates/base.html:108
 msgid "Imprint"
 msgstr "Empreinte"
 
-#: mafiasi/base/templates/base.html:109
+#: mafiasi/base/templates/base.html:110
 msgid "Data privacy statement"
 msgstr "Politique de confidentialité"
 
-#: mafiasi/base/templates/base.html:111
+#: mafiasi/base/templates/base.html:112
 msgid "Technical info"
 msgstr "Information technique"
 
-#: mafiasi/base/templates/base.html:113
+#: mafiasi/base/templates/base.html:114
 #: mafiasi/base/templates/base/problems.html:4
 msgid "Problems?"
 msgstr "Problèmes?"
@@ -129,10 +129,6 @@ msgstr "Ce site utilise les logiciels / composants suivants:"
 msgid "Listed in no particular order."
 msgstr "Inscrite dans aucun ordre particulier."
 
-#: mafiasi/base/templates/base_raw.html:7
-msgid "Mafiasi"
-msgstr "Mafiasi"
-
 #: mafiasi/base/tokenbucket.py:27
 msgid "Limit for {} reached. Please wait until {}."
 msgstr "Limite pour {} atteint. S'il vous plaît attendre {}."
@@ -2303,3 +2299,6 @@ msgid "In the wiki you will find important information regarding your studies."
 msgstr ""
 "Dans le wiki, vous trouverez des informations importantes concernant vos "
 "études."
+
+#~ msgid "Mafiasi"
+#~ msgstr "Mafiasi"
diff --git a/mafiasi/base/static/img/favicon_cml.ico b/mafiasi/base/static/img/favicon_cml.ico
diff --git a/mafiasi/base/templates/base.html b/mafiasi/base/templates/base.html
@@ -3,13 +3,14 @@
 {% load settings_value %}
 {% load static %}
 {% value_from_settings BANNER_IMG as banner_img %}
+{% value_from_settings FAVICON_PATH as favicon_path %}
 <!DOCTYPE html>
 <html {% if request.session.specialFeature %}data-feature="{{request.session.specialFeature}}"{% endif %}{% if request.session.specialFeaturePersist %}data-feature-persisted="true"{% endif %}>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <title>{% block wtitle %}{% endblock %} &middot; {% value_from_settings PROJECT_NAME %}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<link rel="shortcut icon" href="{% static 'img/favicon.ico' %}" />
+	<link rel="shortcut icon" href="{% static favicon_path %}" />
     <link rel="stylesheet" href="{% static 'css/bootstrap.css' %}">
     <link rel="stylesheet" href="{% static 'css/smoothness/jquery-ui-1.12.1.custom.css' %}">
     <link rel="stylesheet" href="{% static 'css/main.css' %}">

diff --git a/mafiasi/base/templates/base_raw.html b/mafiasi/base/templates/base_raw.html
@@ -1,12 +1,14 @@
 {% load i18n %}
 {% load static %}
+{% load settings_value %}
+{% value_from_settings FAVICON_PATH as favicon_path %}
 <!DOCTYPE html>
 <html>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>{% block wtitle %}{% endblock %} &middot; {% trans "Mafiasi" %}</title>
+    <title>{% block wtitle %}{% endblock %} &middot; {% value_from_settings PROJECT_NAME %}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<link rel="shortcut icon" href="{% static 'img/favicon.ico' %}" />
+	<link rel="shortcut icon" href="{% static favicon_path %}" />
     <link rel="stylesheet" href="{% static 'css/bootstrap.css' %}">
     <link rel="stylesheet" href="{% static 'css/smoothness/jquery-ui-1.12.1.custom.css' %}">
     <link rel="stylesheet" href="{% static 'css/main.css' %}">

diff --git a/mafiasi/settings.py b/mafiasi/settings.py
@@ -203,6 +203,7 @@
     "MAIL_GREETING_DE",
     "MAIL_GREETING_EN",
     "BANNER_IMG",
+    "FAVICON_PATH",
     "GUEST_INVITE_HINT",
     "USER_LOGIN_HINT",
     "GUEST_INVITE_INSTRUCTION_LINK",
@@ -294,6 +295,7 @@
 PROJECT_NAME = env.str("MAFIASI_PROJECT_NAME", default="mafiasi.de")
 PROJECT_BANNER = env.str("MAFIASI_PROJECT_BANNER", "Mafiasi Hub")
 BANNER_IMG = env.str("MAFIASI_BANNER_IMG", "")
+FAVICON_PATH = env.str("MAFIASI_FAVICON_PATH", "img/favicon.ico")
 
 HKP_URL = "hkps://mafiasi.de"