From 06e59496cc86fc9ec3596636ce5e094f94124b25 Mon Sep 17 00:00:00 2001 From: Timon Engelke Date: Wed, 24 Jul 2024 21:20:52 +0200 Subject: [PATCH] Add CML favicon --- locale/de_DE/LC_MESSAGES/django.po | 31 ++++++++++++------------ locale/en_US/LC_MESSAGES/django.po | 28 +++++++++------------ locale/en_Uwu/LC_MESSAGES/django.po | 31 ++++++++++++------------ locale/fr_FR/LC_MESSAGES/django.po | 31 ++++++++++++------------ mafiasi/base/static/img/favicon_cml.ico | Bin 0 -> 4286 bytes mafiasi/base/templates/base.html | 3 ++- mafiasi/base/templates/base_raw.html | 6 +++-- mafiasi/settings.py | 2 ++ 8 files changed, 65 insertions(+), 67 deletions(-) create mode 100644 mafiasi/base/static/img/favicon_cml.ico diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index 5e6d10a6..f5af5983 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-05-01 00:25+0200\n" +"POT-Creation-Date: 2024-07-24 21:29+0200\n" "PO-Revision-Date: 2024-05-01 00:26+0200\n" "Last-Translator: Markus Neblung \n" "Language-Team: \n" @@ -39,51 +39,51 @@ msgstr "" "Bitte versuche es später nochmal. Falls das Problem bestehen bleibt, schaue " "auf unsere Fehlermeldeseite." -#: 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 {}." @@ -2287,3 +2283,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 index b67423ff..224f54d0 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-05-01 00:25+0200\n" +"POT-Creation-Date: 2024-07-24 21:29+0200\n" "PO-Revision-Date: 2024-01-18 22:42+0100\n" "Last-Translator: Markus Neblung \n" "Language-Team: \n" @@ -31,51 +31,51 @@ msgid "" "href=\"%(problems_url)s\">problem reporting page." 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 index 145b9978..bcbd55ed 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-05-01 00:25+0200\n" +"POT-Creation-Date: 2024-07-24 21:29+0200\n" "PO-Revision-Date: 2024-01-09 22:14+0000\n" "Last-Translator: kritzl \n" "Language-Team: \n" @@ -42,51 +42,51 @@ msgstr "" "again later. If the problem persists, see our problem reporting page." -#: 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 {}." @@ -2365,6 +2361,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 index 153d0c00..89c6fc4f 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-05-01 00:25+0200\n" +"POT-Creation-Date: 2024-07-24 21:29+0200\n" "PO-Revision-Date: 2024-01-18 22:41+0100\n" "Last-Translator: Markus Neblung \n" "Language-Team: \n" @@ -39,51 +39,51 @@ msgstr "" "problème persiste, consultez notre page de " "rapports d'incidents ." -#: 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 {}." @@ -2291,3 +2287,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 new file mode 100644 index 0000000000000000000000000000000000000000..d64ae318e58a5039cba26c47fbb3e28fecd818a3 GIT binary patch literal 4286 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 {% block wtitle %}{% endblock %} · {% value_from_settings PROJECT_NAME %} - + diff --git a/mafiasi/base/templates/base_raw.html b/mafiasi/base/templates/base_raw.html index 2455e3eb..7b6db3d2 100644 --- 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 %} - {% block wtitle %}{% endblock %} · {% trans "Mafiasi" %} + {% block wtitle %}{% endblock %} · {% value_from_settings PROJECT_NAME %} - + diff --git a/mafiasi/settings.py b/mafiasi/settings.py index 0be54421..9068b2d1 100644 --- a/mafiasi/settings.py +++ b/mafiasi/settings.py @@ -202,6 +202,7 @@ "MAIL_GREETING_DE", "MAIL_GREETING_EN", "BANNER_IMG", + "FAVICON_PATH", "GUEST_INVITE_HINT", "USER_LOGIN_HINT", "GUEST_INVITE_INSTRUCTION_LINK", @@ -293,6 +294,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"