Skip to content

Commit

Permalink
Add CML favicon
Browse files Browse the repository at this point in the history
  • Loading branch information
timonegk committed Jul 24, 2024
1 parent 10b79bc commit 06e5949
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 67 deletions.
31 changes: 15 additions & 16 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-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 <markus.neblung@uni-hamburg.de>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -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?"
Expand Down Expand Up @@ -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 {}."
Expand Down Expand Up @@ -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"
28 changes: 12 additions & 16 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-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 <markus.neblung@uni-hamburg.de>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -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 ""
Expand Down Expand Up @@ -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 ""
Expand Down
31 changes: 15 additions & 16 deletions 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-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 <kritzl@kritzl.dev>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -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?"
Expand Down Expand Up @@ -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 {}."
Expand Down Expand Up @@ -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"
Expand Down
31 changes: 15 additions & 16 deletions locale/fr_FR/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-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 <markus.neblung@uni-hamburg.de>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -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?"
Expand Down Expand Up @@ -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 {}."
Expand Down Expand Up @@ -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"
Binary file added mafiasi/base/static/img/favicon_cml.ico
Binary file not shown.
3 changes: 2 additions & 1 deletion mafiasi/base/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}">
Expand Down
6 changes: 4 additions & 2 deletions mafiasi/base/templates/base_raw.html
Original file line number Diff line number Diff line change
@@ -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' %}">
Expand Down
Loading

0 comments on commit 06e5949

Please sign in to comment.