From 83caad9285ad3d7e7fe76bbf5b788fc6df7b02e6 Mon Sep 17 00:00:00 2001 From: lilly Date: Fri, 22 Nov 2024 11:20:16 +0100 Subject: [PATCH 1/3] add note that this service is not run by fascists --- locale/de_DE/LC_MESSAGES/django.po | 10 ++++++++-- locale/en_US/LC_MESSAGES/django.po | 11 ++++++++--- locale/en_Uwu/LC_MESSAGES/django.po | 6 +++++- locale/fr_FR/LC_MESSAGES/django.po | 10 ++++++++-- mafiasi/base/templates/base.html | 2 ++ 5 files changed, 31 insertions(+), 8 deletions(-) diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index a7a4923..7f7774f 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-10-08 09:35+0200\n" +"POT-Creation-Date: 2024-11-22 11:16+0100\n" "PO-Revision-Date: 2024-09-03 23:52+0200\n" "Last-Translator: Markus Neblung \n" "Language-Team: \n" @@ -88,6 +88,10 @@ msgstr "Technik" msgid "Problems?" msgstr "Probleme?" +#: mafiasi/base/templates/base.html:123 +msgid "This service is not run by fascists" +msgstr "Dieser Dienst wird nicht von Faschist*innen betrieben" + #: mafiasi/base/templates/base/licenses.html:4 msgid "License information" msgstr "Lizenzinformationen" @@ -1571,7 +1575,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" diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 3b035d4..71c3bfc 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-10-08 09:35+0200\n" +"POT-Creation-Date: 2024-11-22 11:16+0100\n" "PO-Revision-Date: 2024-01-18 22:42+0100\n" "Last-Translator: Markus Neblung \n" "Language-Team: \n" @@ -80,6 +80,10 @@ msgstr "" msgid "Problems?" msgstr "" +#: mafiasi/base/templates/base.html:123 +msgid "This service is not run by fascists" +msgstr "" + #: mafiasi/base/templates/base/licenses.html:4 msgid "License information" msgstr "" @@ -1429,8 +1433,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" diff --git a/locale/en_Uwu/LC_MESSAGES/django.po b/locale/en_Uwu/LC_MESSAGES/django.po index 8a32d45..ca4e2e8 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-10-08 09:35+0200\n" +"POT-Creation-Date: 2024-11-22 11:16+0100\n" "PO-Revision-Date: 2024-01-09 22:14+0000\n" "Last-Translator: kritzl \n" "Language-Team: \n" @@ -91,6 +91,10 @@ msgstr "Complicated thingies" msgid "Problems?" msgstr "Problems?" +#: mafiasi/base/templates/base.html:123 +msgid "This service is not run by fascists" +msgstr "This sevwis is not run by fascists! Nu-uh!" + #: mafiasi/base/templates/base/licenses.html:4 msgid "License information" msgstr "License information" diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index b1a757a..db1cfd4 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-10-08 09:35+0200\n" +"POT-Creation-Date: 2024-11-22 11:16+0100\n" "PO-Revision-Date: 2024-09-03 23:54+0200\n" "Last-Translator: Markus Neblung \n" "Language-Team: \n" @@ -88,6 +88,10 @@ msgstr "Information technique" msgid "Problems?" msgstr "Problèmes?" +#: mafiasi/base/templates/base.html:123 +msgid "This service is not run by fascists" +msgstr "" + #: mafiasi/base/templates/base/licenses.html:4 msgid "License information" msgstr "Informations sur la licence" @@ -1580,7 +1584,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" diff --git a/mafiasi/base/templates/base.html b/mafiasi/base/templates/base.html index 0e68bf4..423b343 100644 --- a/mafiasi/base/templates/base.html +++ b/mafiasi/base/templates/base.html @@ -119,6 +119,8 @@

{% block ptitle %}{% endblock %}

{% endif %} {% endfor %} + · + {% trans "This service is not run by fascists" %}

From eebf78cdccbb816df2de85ef27d734f2a3d3cecc Mon Sep 17 00:00:00 2001 From: lilly Date: Fri, 22 Nov 2024 11:57:01 +0100 Subject: [PATCH 2/3] add messsage against discrimination to base template --- locale/de_DE/LC_MESSAGES/django.po | 16 +++++++++++++++- locale/en_US/LC_MESSAGES/django.po | 11 ++++++++++- locale/en_Uwu/LC_MESSAGES/django.po | 11 ++++++++++- locale/fr_FR/LC_MESSAGES/django.po | 11 ++++++++++- mafiasi/base/static/css/main.css | 20 ++++++++++++++++++++ mafiasi/base/static/js/politics_toast.mjs | 10 ++++++++++ mafiasi/base/templates/base.html | 10 ++++++++++ 7 files changed, 85 insertions(+), 4 deletions(-) create mode 100644 mafiasi/base/static/js/politics_toast.mjs diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index 7f7774f..149ede8 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-11-22 11:16+0100\n" +"POT-Creation-Date: 2024-11-22 11:46+0100\n" "PO-Revision-Date: 2024-09-03 23:52+0200\n" "Last-Translator: Markus Neblung \n" "Language-Team: \n" @@ -92,6 +92,20 @@ msgstr "Probleme?" msgid "This service is not run by fascists" msgstr "Dieser Dienst wird nicht von Faschist*innen betrieben" +#: mafiasi/base/templates/base.html:131 +msgid "" +"There is no place for racism, queerophobia, anti-Semitism and discrimination " +"in any form at mafiasi.de.
If you are affected, the student council and the " +"university's anti-discrimination office are there for you." +msgstr "" +"Auf mafiasi.de ist kein Platz für Rassismus, Queerfeindlichkeit, Antisemitismus " +"und Menschenfeindlichkeit in jeder Form.
Wenn du betroffen bist, ist der " +"FSR " +"sowie die " +"Antidiskriminierungsstelle der Uni für dich da." + #: mafiasi/base/templates/base/licenses.html:4 msgid "License information" msgstr "Lizenzinformationen" diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 71c3bfc..fd9dd7f 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-11-22 11:16+0100\n" +"POT-Creation-Date: 2024-11-22 11:46+0100\n" "PO-Revision-Date: 2024-01-18 22:42+0100\n" "Last-Translator: Markus Neblung \n" "Language-Team: \n" @@ -84,6 +84,15 @@ msgstr "" msgid "This service is not run by fascists" msgstr "" +#: mafiasi/base/templates/base.html:131 +msgid "" +"There is no place for racism, queerophobia, anti-Semitism and discrimination " +"in any form at mafiasi.de.
If you are affected, the student council and the " +"university's anti-discrimination office are there for you." +msgstr "" + #: mafiasi/base/templates/base/licenses.html:4 msgid "License information" msgstr "" diff --git a/locale/en_Uwu/LC_MESSAGES/django.po b/locale/en_Uwu/LC_MESSAGES/django.po index ca4e2e8..0b2100e 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-11-22 11:16+0100\n" +"POT-Creation-Date: 2024-11-22 11:46+0100\n" "PO-Revision-Date: 2024-01-09 22:14+0000\n" "Last-Translator: kritzl \n" "Language-Team: \n" @@ -95,6 +95,15 @@ msgstr "Problems?" msgid "This service is not run by fascists" msgstr "This sevwis is not run by fascists! Nu-uh!" +#: mafiasi/base/templates/base.html:131 +msgid "" +"There is no place for racism, queerophobia, anti-Semitism and discrimination " +"in any form at mafiasi.de.
If you are affected, the student council and the " +"university's anti-discrimination office are there for you." +msgstr "" + #: mafiasi/base/templates/base/licenses.html:4 msgid "License information" msgstr "License information" diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index db1cfd4..0002139 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-11-22 11:16+0100\n" +"POT-Creation-Date: 2024-11-22 11:46+0100\n" "PO-Revision-Date: 2024-09-03 23:54+0200\n" "Last-Translator: Markus Neblung \n" "Language-Team: \n" @@ -92,6 +92,15 @@ msgstr "Problèmes?" msgid "This service is not run by fascists" msgstr "" +#: mafiasi/base/templates/base.html:131 +msgid "" +"There is no place for racism, queerophobia, anti-Semitism and discrimination " +"in any form at mafiasi.de.
If you are affected, the student council and the " +"university's anti-discrimination office are there for you." +msgstr "" + #: mafiasi/base/templates/base/licenses.html:4 msgid "License information" msgstr "Informations sur la licence" diff --git a/mafiasi/base/static/css/main.css b/mafiasi/base/static/css/main.css index 0ca2504..3155a31 100644 --- a/mafiasi/base/static/css/main.css +++ b/mafiasi/base/static/css/main.css @@ -81,6 +81,26 @@ body { border-radius: 10px; } +#politics-toast { + position: fixed; + bottom: 1vw; + left: auto; + right: 1vw; + margin: 0; + max-width: 512px; + cursor: pointer; + user-select: none; + + border: none; + padding: 10px 16px; + background: #23527c; + color: white; + border-radius: 4px; +} +#politics-toast a { + color: var(--mafiasi-dark-btn-primary); +} + /* ------- MISC -------*/ .clickable { cursor: pointer; diff --git a/mafiasi/base/static/js/politics_toast.mjs b/mafiasi/base/static/js/politics_toast.mjs new file mode 100644 index 0000000..58a0b16 --- /dev/null +++ b/mafiasi/base/static/js/politics_toast.mjs @@ -0,0 +1,10 @@ +document.addEventListener("DOMContentLoaded", () => { + const toast = document.getElementById("politics-toast"); + + // close dialog when clicked + const close = () => toast.style.display = "none"; + toast.addEventListener("click", close); + + // alternatively, also close dialog after 20 seconds + setTimeout(close, 20 * 1000); +}) diff --git a/mafiasi/base/templates/base.html b/mafiasi/base/templates/base.html index 423b343..f44e07f 100644 --- a/mafiasi/base/templates/base.html +++ b/mafiasi/base/templates/base.html @@ -126,6 +126,15 @@

{% block ptitle %}{% endblock %}

+ + {% if request.session.specialFeature == 'winter' %} @@ -136,6 +145,7 @@

{% block ptitle %}{% endblock %}

+ {% block js %} {% endblock js %} From 11f7497dd11472ef181324522acc8985a2f458a2 Mon Sep 17 00:00:00 2001 From: Timon Engelke Date: Tue, 26 Nov 2024 16:57:52 +0100 Subject: [PATCH 3/3] Add french translations --- locale/fr_FR/LC_MESSAGES/django.po | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 0002139..84757d7 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -3,15 +3,15 @@ msgstr "" "Project-Id-Version: Mafiasi\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-11-22 11:46+0100\n" -"PO-Revision-Date: 2024-09-03 23:54+0200\n" -"Last-Translator: Markus Neblung \n" +"PO-Revision-Date: 2024-11-26 16:57+0100\n" +"Last-Translator: Timon Engelke \n" "Language-Team: \n" "Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 3.4.4\n" +"X-Generator: Poedit 3.0.1\n" #: mafiasi/base/middleware.py:18 msgid "" @@ -90,7 +90,7 @@ msgstr "Problèmes?" #: mafiasi/base/templates/base.html:123 msgid "This service is not run by fascists" -msgstr "" +msgstr "Ce service n'est pas administré par des fascistes" #: mafiasi/base/templates/base.html:131 msgid "" @@ -100,6 +100,12 @@ msgid "" "university's anti-discrimination office are there for you." msgstr "" +"Le racisme, la queerophobie, l'antisémitisme et la discrimination sous " +"toutes ses formes n'ont pas de place à mafiasi.de.
\n" +"Si vous êtes concernés, le conseil étudiant et le bureau anti-discrimination " +"de l'université sont là pour vous." #: mafiasi/base/templates/base/licenses.html:4 msgid "License information" @@ -236,7 +242,7 @@ msgstr "Livre Mafiasi Purple" #: mafiasi/dashboard/templates/dashboard/may_day.html:10 msgid "Server-Rooms are being occupied…" -msgstr "" +msgstr "Les salles de serveurs sont occupées..." #: mafiasi/discourse/apps.py:11 msgid "Discourse"