diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index ba0c401..5baad0e 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-04-01 02:11+0200\n" +"POT-Creation-Date: 2024-04-01 02:42+0200\n" "PO-Revision-Date: 2024-01-18 22:42+0100\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:42 +#: mafiasi/base/templates/base.html:46 msgid "Disable surprise" msgstr "Überraschung abschalten" -#: mafiasi/base/templates/base.html:52 +#: mafiasi/base/templates/base.html:56 msgid "Groups" msgstr "Gruppen" -#: mafiasi/base/templates/base.html:60 +#: mafiasi/base/templates/base.html:64 #: mafiasi/mailinglist/templates/mailinglist/show_list.html:46 msgid "Settings" msgstr "Einstellungen" -#: mafiasi/base/templates/base.html:63 +#: mafiasi/base/templates/base.html:67 #, python-format msgid "Logged in as %(username)s" msgstr "Angemeldet als %(username)s" -#: mafiasi/base/templates/base.html:66 +#: mafiasi/base/templates/base.html:70 msgid "Logout" msgstr "Abmelden" -#: mafiasi/base/templates/base.html:72 +#: mafiasi/base/templates/base.html:76 #: 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:74 +#: mafiasi/base/templates/base.html:78 msgid "Login" msgstr "Login" -#: mafiasi/base/templates/base.html:103 +#: mafiasi/base/templates/base.html:107 msgid "Imprint" msgstr "Impressum" -#: mafiasi/base/templates/base.html:105 +#: mafiasi/base/templates/base.html:109 msgid "Data privacy statement" msgstr "Datenschutzerklärung" -#: mafiasi/base/templates/base.html:107 +#: mafiasi/base/templates/base.html:111 msgid "Technical info" msgstr "Technik" -#: mafiasi/base/templates/base.html:109 +#: mafiasi/base/templates/base.html:113 #: mafiasi/base/templates/base/problems.html:4 msgid "Problems?" msgstr "Probleme?" diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 03c828f..e60c3d1 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-04-01 02:11+0200\n" +"POT-Creation-Date: 2024-04-01 02:42+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:42 +#: mafiasi/base/templates/base.html:46 msgid "Disable surprise" msgstr "" -#: mafiasi/base/templates/base.html:52 +#: mafiasi/base/templates/base.html:56 msgid "Groups" msgstr "" -#: mafiasi/base/templates/base.html:60 +#: mafiasi/base/templates/base.html:64 #: mafiasi/mailinglist/templates/mailinglist/show_list.html:46 msgid "Settings" msgstr "" -#: mafiasi/base/templates/base.html:63 +#: mafiasi/base/templates/base.html:67 #, python-format msgid "Logged in as %(username)s" msgstr "" -#: mafiasi/base/templates/base.html:66 +#: mafiasi/base/templates/base.html:70 msgid "Logout" msgstr "" -#: mafiasi/base/templates/base.html:72 +#: mafiasi/base/templates/base.html:76 #: mafiasi/registration/templates/registration/request_account.html:38 #: mafiasi/registration/templates/registration/request_account.html:77 msgid "Register" msgstr "" -#: mafiasi/base/templates/base.html:74 +#: mafiasi/base/templates/base.html:78 msgid "Login" msgstr "" -#: mafiasi/base/templates/base.html:103 +#: mafiasi/base/templates/base.html:107 msgid "Imprint" msgstr "" -#: mafiasi/base/templates/base.html:105 +#: mafiasi/base/templates/base.html:109 msgid "Data privacy statement" msgstr "" -#: mafiasi/base/templates/base.html:107 +#: mafiasi/base/templates/base.html:111 msgid "Technical info" msgstr "" -#: mafiasi/base/templates/base.html:109 +#: mafiasi/base/templates/base.html:113 #: mafiasi/base/templates/base/problems.html:4 msgid "Problems?" msgstr "" diff --git a/locale/en_Uwu/LC_MESSAGES/django.po b/locale/en_Uwu/LC_MESSAGES/django.po index f28a517..6ee41f0 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-04-01 02:11+0200\n" +"POT-Creation-Date: 2024-04-01 02:42+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:42 +#: mafiasi/base/templates/base.html:46 msgid "Disable surprise" msgstr "Me no like this mess ._." -#: mafiasi/base/templates/base.html:52 +#: mafiasi/base/templates/base.html:56 msgid "Groups" msgstr "frens" -#: mafiasi/base/templates/base.html:60 +#: mafiasi/base/templates/base.html:64 #: mafiasi/mailinglist/templates/mailinglist/show_list.html:46 msgid "Settings" msgstr "Change me >﹏<" -#: mafiasi/base/templates/base.html:63 +#: mafiasi/base/templates/base.html:67 #, python-format msgid "Logged in as %(username)s" msgstr "U is %(username)s" -#: mafiasi/base/templates/base.html:66 +#: mafiasi/base/templates/base.html:70 msgid "Logout" msgstr "Bye bye 👋" -#: mafiasi/base/templates/base.html:72 +#: mafiasi/base/templates/base.html:76 #: 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:74 +#: mafiasi/base/templates/base.html:78 msgid "Login" msgstr "Get inside" -#: mafiasi/base/templates/base.html:103 +#: mafiasi/base/templates/base.html:107 msgid "Imprint" msgstr "Pawprint" -#: mafiasi/base/templates/base.html:105 +#: mafiasi/base/templates/base.html:109 msgid "Data privacy statement" msgstr "How me uses ur data" -#: mafiasi/base/templates/base.html:107 +#: mafiasi/base/templates/base.html:111 msgid "Technical info" msgstr "Complicated thingies" -#: mafiasi/base/templates/base.html:109 +#: mafiasi/base/templates/base.html:113 #: mafiasi/base/templates/base/problems.html:4 msgid "Problems?" msgstr "Problems?" diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 9cc8167..144d73c 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-04-01 02:11+0200\n" +"POT-Creation-Date: 2024-04-01 02:42+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:42 +#: mafiasi/base/templates/base.html:46 msgid "Disable surprise" msgstr "Désactiver la surprise" -#: mafiasi/base/templates/base.html:52 +#: mafiasi/base/templates/base.html:56 msgid "Groups" msgstr "Groupes" -#: mafiasi/base/templates/base.html:60 +#: mafiasi/base/templates/base.html:64 #: mafiasi/mailinglist/templates/mailinglist/show_list.html:46 msgid "Settings" msgstr "Paramètres" -#: mafiasi/base/templates/base.html:63 +#: mafiasi/base/templates/base.html:67 #, python-format msgid "Logged in as %(username)s" msgstr "Connecté en tant que %(username)s" -#: mafiasi/base/templates/base.html:66 +#: mafiasi/base/templates/base.html:70 msgid "Logout" msgstr "Déconnecter" -#: mafiasi/base/templates/base.html:72 +#: mafiasi/base/templates/base.html:76 #: 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:74 +#: mafiasi/base/templates/base.html:78 msgid "Login" msgstr "Connectez-Vouz" -#: mafiasi/base/templates/base.html:103 +#: mafiasi/base/templates/base.html:107 msgid "Imprint" msgstr "Empreinte" -#: mafiasi/base/templates/base.html:105 +#: mafiasi/base/templates/base.html:109 msgid "Data privacy statement" msgstr "Politique de confidentialité" -#: mafiasi/base/templates/base.html:107 +#: mafiasi/base/templates/base.html:111 msgid "Technical info" msgstr "Information technique" -#: mafiasi/base/templates/base.html:109 +#: mafiasi/base/templates/base.html:113 #: mafiasi/base/templates/base/problems.html:4 msgid "Problems?" msgstr "Problèmes?" diff --git a/mafiasi/base/special_day_middleware.py b/mafiasi/base/special_day_middleware.py index b500bf7..cc243e6 100644 --- a/mafiasi/base/special_day_middleware.py +++ b/mafiasi/base/special_day_middleware.py @@ -17,7 +17,9 @@ def __call__(self, request): n = localdate(now(), get_current_timezone()) # check if user disabled special day surprises via cookie - if not request.COOKIES.get("disable-special", False): + if request.COOKIES.get("disable-special", False): + request.session["specialFeature"] = "DISABLED" + else: # first of april (april fools) if n.day == 1 and n.month == 4: request.session["specialDay"] = "April Fools" diff --git a/mafiasi/base/static/css/main.css b/mafiasi/base/static/css/main.css index 29ef17b..0ca2504 100644 --- a/mafiasi/base/static/css/main.css +++ b/mafiasi/base/static/css/main.css @@ -125,6 +125,6 @@ body { cursor: pointer; } -#specialfeature-off { +.special-toggle { margin-top: 14px; } diff --git a/mafiasi/base/static/js/misc.js b/mafiasi/base/static/js/misc.js index a1a19c0..b264f55 100644 --- a/mafiasi/base/static/js/misc.js +++ b/mafiasi/base/static/js/misc.js @@ -16,4 +16,12 @@ function disableSpecialFeature() { window.location.reload() } -document.querySelector('#specialfeature-off').addEventListener('click', disableSpecialFeature) +function enableSpecialFeature() { + document.cookie = `disable-special=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT; Secure`; + window.location.reload() +} + +const specialOff = document.querySelector('#special-off'); +const specialOn = document.querySelector('#special-on'); +if(specialOff) specialOff.addEventListener('click', disableSpecialFeature) +if(specialOn) specialOn.addEventListener('click', enableSpecialFeature) diff --git a/mafiasi/base/templates/base.html b/mafiasi/base/templates/base.html index 502ca65..2846d80 100644 --- a/mafiasi/base/templates/base.html +++ b/mafiasi/base/templates/base.html @@ -18,7 +18,7 @@ {% block headJS %} {% endblock %} - + @@ -37,8 +37,12 @@ {% endif %}