Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add antidiscrimination toast to mafiasi and notice to footer #183

Open
wants to merge 3 commits into
base: staging
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 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-11-22 11:46+0100\n"
"PO-Revision-Date: 2024-09-03 23:52+0200\n"
"Last-Translator: Markus Neblung <[email protected]>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -88,6 +88,24 @@ 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.html:131
msgid ""
"There is no place for racism, queerophobia, anti-Semitism and discrimination "
"in any form at mafiasi.de.<br> If you are affected, the <a href=\"mailto:fsr-"
"[email protected]\">student council</a> and the "
"university's <a href=\"https://www.uni-hamburg.de/antidiskriminierung.html\" "
"rel=\"external\">anti-discrimination office</a> are there for you."
msgstr ""
"Auf mafiasi.de ist kein Platz für Rassismus, Queerfeindlichkeit, Antisemitismus "
"und Menschenfeindlichkeit in jeder Form.<br> Wenn du betroffen bist, ist der "
"<a href=\"mailto:[email protected]\">FSR</a> "
"sowie die <a href=\"https://www.uni-hamburg.de/antidiskriminierung.html\" rel=\"external\">"
"Antidiskriminierungsstelle der Uni</a> für dich da."

#: mafiasi/base/templates/base/licenses.html:4
msgid "License information"
msgstr "Lizenzinformationen"
Expand Down Expand Up @@ -1571,7 +1589,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
20 changes: 17 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-11-22 11:46+0100\n"
"PO-Revision-Date: 2024-01-18 22:42+0100\n"
"Last-Translator: Markus Neblung <[email protected]>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -80,6 +80,19 @@ msgstr ""
msgid "Problems?"
msgstr ""

#: mafiasi/base/templates/base.html:123
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.<br> If you are affected, the <a href=\"mailto:fsr-"
"[email protected]\">student council</a> and the "
"university's <a href=\"https://www.uni-hamburg.de/antidiskriminierung.html\" "
"rel=\"external\">anti-discrimination office</a> are there for you."
msgstr ""

#: mafiasi/base/templates/base/licenses.html:4
msgid "License information"
msgstr ""
Expand Down Expand Up @@ -1429,8 +1442,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
15 changes: 14 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-11-22 11:46+0100\n"
"PO-Revision-Date: 2024-01-09 22:14+0000\n"
"Last-Translator: kritzl <[email protected]>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -91,6 +91,19 @@ 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.html:131
msgid ""
"There is no place for racism, queerophobia, anti-Semitism and discrimination "
"in any form at mafiasi.de.<br> If you are affected, the <a href=\"mailto:fsr-"
"[email protected]\">student council</a> and the "
"university's <a href=\"https://www.uni-hamburg.de/antidiskriminierung.html\" "
"rel=\"external\">anti-discrimination office</a> are there for you."
msgstr ""

#: mafiasi/base/templates/base/licenses.html:4
msgid "License information"
msgstr "License information"
Expand Down
33 changes: 27 additions & 6 deletions locale/fr_FR/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: Mafiasi\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-08 09:35+0200\n"
"PO-Revision-Date: 2024-09-03 23:54+0200\n"
"Last-Translator: Markus Neblung <markus.neblung@uni-hamburg.de>\n"
"POT-Creation-Date: 2024-11-22 11:46+0100\n"
"PO-Revision-Date: 2024-11-26 16:57+0100\n"
"Last-Translator: Timon Engelke <timon.engelke@uni-hamburg.de>\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 ""
Expand Down Expand Up @@ -88,6 +88,25 @@ msgstr "Information technique"
msgid "Problems?"
msgstr "Problèmes?"

#: mafiasi/base/templates/base.html:123
msgid "This service is not run by fascists"
msgstr "Ce service n'est pas administré par des fascistes"

#: mafiasi/base/templates/base.html:131
msgid ""
"There is no place for racism, queerophobia, anti-Semitism and discrimination "
"in any form at mafiasi.de.<br> If you are affected, the <a href=\"mailto:fsr-"
"[email protected]\">student council</a> and the "
"university's <a href=\"https://www.uni-hamburg.de/antidiskriminierung.html\" "
"rel=\"external\">anti-discrimination office</a> 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.<br>\n"
"Si vous êtes concernés, le <a href=\"mailto:[email protected]"
"hamburg.de\">conseil étudiant</a> et le <a href=\"https://www.uni-hamburg.de/"
"antidiskriminierung.html\" rel=\"external\">bureau anti-discrimination</a> "
"de l'université sont là pour vous."

#: mafiasi/base/templates/base/licenses.html:4
msgid "License information"
msgstr "Informations sur la licence"
Expand Down Expand Up @@ -223,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"
Expand Down Expand Up @@ -1580,7 +1599,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
20 changes: 20 additions & 0 deletions mafiasi/base/static/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 10 additions & 0 deletions mafiasi/base/static/js/politics_toast.mjs
Original file line number Diff line number Diff line change
@@ -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);
})
12 changes: 12 additions & 0 deletions mafiasi/base/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,22 @@ <h2>{% block ptitle %}{% endblock %}</h2>
<button name="language" value="{{ lang.0 }}" class="btn-link" style="padding: 0;" type="submit">{{ lang.1 }}</button>
{% endif %}
{% endfor %}
&middot;
<span class="text-muted">{% trans "This service is not run by fascists" %}</span>
</p>
</form>
</div>
</div>

<aside id="politics-toast">
<span>
{% blocktranslate trimmed %}
There is no place for racism, queerophobia, anti-Semitism and discrimination in any form at mafiasi.de.<br>
If you are affected, the <a href="mailto:[email protected]">student council</a> and the university's <a href="https://www.uni-hamburg.de/antidiskriminierung.html" rel="external">anti-discrimination office</a> are there for you.
{% endblocktranslate %}
</span>
</aside>

{% if request.session.specialFeature == 'winter' %}
<canvas id="snow-canvas"></canvas>
<script src="{% static 'js/snow.js' %}" type="module"></script>
Expand All @@ -134,6 +145,7 @@ <h2>{% block ptitle %}{% endblock %}</h2>
<script src="{% static 'js/common.js' %}" type="text/javascript"></script>
<script src="{% static 'js/bootstrap.js' %}" type="text/javascript"></script>
<script src="{% static 'js/misc.js' %}" type="text/javascript"></script>
<script src="{% static 'js/politics_toast.mjs' %}" type="module"></script>
{% block js %}
{% endblock js %}
</body>
Expand Down