diff --git a/club/templates/club/club_detail.jinja b/club/templates/club/club_detail.jinja index 2d2c5719..33760695 100644 --- a/club/templates/club/club_detail.jinja +++ b/club/templates/club/club_detail.jinja @@ -1,6 +1,14 @@ {% extends "core/base.jinja" %} {% from 'core/macros.jinja' import user_profile_link %} +{% block title -%} + {{ club.name }} +{%- endblock %} + +{% block description -%} + {{ club.short_description }} +{%- endblock %} + {% block content %}
{% if club.logo %} diff --git a/club/templates/club/club_list.jinja b/club/templates/club/club_list.jinja index f914803e..da0a54be 100644 --- a/club/templates/club/club_list.jinja +++ b/club/templates/club/club_list.jinja @@ -1,8 +1,12 @@ {% extends "core/base.jinja" %} -{% block title %} +{% block title -%} {% trans %}Club list{% endtrans %} -{% endblock %} +{%- endblock %} + +{% block description -%} + {% trans %}The list of all clubs existing at UTBM.{% endtrans %} +{%- endblock %} {% macro display_club(club) -%} @@ -21,7 +25,7 @@ {%- if club.children.all()|length != 0 %} @@ -36,8 +40,8 @@ {% if club_list %}

{% trans %}Club list{% endtrans %}

{% else %} diff --git a/club/views.py b/club/views.py index 184e64fd..735e8291 100644 --- a/club/views.py +++ b/club/views.py @@ -171,6 +171,10 @@ class ClubListView(ListView): model = Club template_name = "club/club_list.jinja" + queryset = ( + Club.objects.filter(parent=None).order_by("name").prefetch_related("children") + ) + context_object_name = "club_list" class ClubView(ClubTabsMixin, DetailView): diff --git a/com/templates/com/news_list.jinja b/com/templates/com/news_list.jinja index 92e4dd71..1becd1ba 100644 --- a/com/templates/com/news_list.jinja +++ b/com/templates/com/news_list.jinja @@ -1,10 +1,6 @@ {% extends "core/base.jinja" %} {% from "com/macros.jinja" import news_moderation_alert %} -{% block title %} - {% trans %}News{% endtrans %} -{% endblock %} - {% block additional_css %} diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja index 225abcfd..b3cf07bb 100644 --- a/core/templates/core/base.jinja +++ b/core/templates/core/base.jinja @@ -2,8 +2,14 @@ {% block head %} - {% block title %}{% trans %}Welcome!{% endtrans %}{% endblock %} - Association des Étudiants UTBM + {% block title %}Association des Étudiants de l'UTBM{% endblock %} + diff --git a/eboutic/templates/eboutic/eboutic_main.jinja b/eboutic/templates/eboutic/eboutic_main.jinja index 18ece465..1809d0b7 100644 --- a/eboutic/templates/eboutic/eboutic_main.jinja +++ b/eboutic/templates/eboutic/eboutic_main.jinja @@ -1,8 +1,12 @@ {% extends "core/base.jinja" %} -{% block title %} +{% block title -%} {% trans %}Eboutic{% endtrans %} -{% endblock %} +{%- endblock %} + +{% block description -%} + {% trans %}The online shop of the association.{% endtrans %} +{%- endblock %} {% block additional_js %} {# This script contains the code to perform requests to manipulate the diff --git a/forum/templates/forum/main.jinja b/forum/templates/forum/main.jinja index 137617ae..a2a280b3 100644 --- a/forum/templates/forum/main.jinja +++ b/forum/templates/forum/main.jinja @@ -2,9 +2,13 @@ {% from 'core/macros.jinja' import user_profile_link %} {% from 'forum/macros.jinja' import display_forum, display_search_bar %} -{% block title %} +{% block title -%} {% trans %}Forum{% endtrans %} -{% endblock %} +{%- endblock %} + +{% block description -%} + {% trans %}A forum dedicated to the UTBM students.{% endtrans %} +{%- endblock %} {% block additional_css %} diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index f1ad16da..a638339e 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-08-23 15:30+0200\n" +"POT-Creation-Date: 2025-09-01 18:18+0200\n" "PO-Revision-Date: 2016-07-18\n" "Last-Translator: Maréchal \n" @@ -306,6 +306,10 @@ msgstr "Utilisateur non enregistré" msgid "Club list" msgstr "Liste des clubs" +#: club/templates/club/club_list.jinja +msgid "The list of all clubs existing at UTBM." +msgstr "La liste de tous les clubs existants à l'UTBM" + #: club/templates/club/club_list.jinja msgid "inactive" msgstr "inactif" @@ -901,7 +905,7 @@ msgid "News admin" msgstr "Administration des nouvelles" #: com/templates/com/news_admin_list.jinja com/templates/com/news_detail.jinja -#: com/templates/com/news_list.jinja com/views.py +#: com/views.py msgid "News" msgstr "Nouvelles" @@ -1035,7 +1039,7 @@ msgstr "Liens" msgid "Our services" msgstr "Nos services" -#: com/templates/com/news_list.jinja pedagogy/templates/pedagogy/guide.jinja +#: com/templates/com/news_list.jinja msgid "UV Guide" msgstr "Guide des UVs" @@ -1705,8 +1709,12 @@ msgid "500, Server Error" msgstr "500, Erreur Serveur" #: core/templates/core/base.jinja -msgid "Welcome!" -msgstr "Bienvenue !" +msgid "" +"AE UTBM is a voluntary organisation run by UTBM students. It organises " +"student life at UTBM and manages its student facilities." +msgstr "" +"L'AE UTBM est une association bénévole gérée par les étudiants de " +"l'UTBM. Elle organise la vie étudiante de l'UTBM et gère ses lieux de vie." #: core/templates/core/base/footer.jinja core/templates/core/base/navbar.jinja msgid "Contacts" @@ -3819,6 +3827,10 @@ msgstr "" msgid "Pay with Sith account" msgstr "Payer avec un compte AE" +#: eboutic/templates/eboutic/eboutic_main.jinja +msgid "The online shop of the association." +msgstr "La boutique en ligne de l'association." + #: eboutic/templates/eboutic/eboutic_main.jinja msgid "Clear" msgstr "Vider" @@ -4148,6 +4160,10 @@ msgstr "Message supprimé ou non-visible." msgid "Order by date" msgstr "Trier par date" +#: forum/templates/forum/main.jinja +msgid "A forum dedicated to the UTBM students." +msgstr "Un forum dédié aux étudiants de l'UTBM." + #: forum/templates/forum/main.jinja msgid "View last unread messages" msgstr "Voir les derniers messages non lus" @@ -4374,6 +4390,14 @@ msgstr "signaler" msgid "reporter" msgstr "signalant" +#: pedagogy/templates/pedagogy/guide.jinja +msgid "UE Guide" +msgstr "Guide des UEs" + +#: pedagogy/templates/pedagogy/guide.jinja +msgid "A guide of courses available at UTBM." +msgstr "Un guide de tous les cours disponibles à l'UTBM." + #: pedagogy/templates/pedagogy/guide.jinja #, python-format msgid "%(display_name)s" @@ -4666,6 +4690,11 @@ msgstr "Demande de retrait d'image" msgid "Request removal" msgstr "Demander le retrait" +#: sas/templates/sas/main.jinja +msgid "See all the photos taken during events organised by the AE." +msgstr "" +"Retrouvez toutes les photos prises lors des événements organisés par l'AE." + #: sas/templates/sas/main.jinja msgid "You must be logged in to see the SAS." msgstr "Vous devez être connecté pour voir les photos." diff --git a/pedagogy/templates/pedagogy/guide.jinja b/pedagogy/templates/pedagogy/guide.jinja index 460fdcc5..85f8dce5 100644 --- a/pedagogy/templates/pedagogy/guide.jinja +++ b/pedagogy/templates/pedagogy/guide.jinja @@ -2,9 +2,13 @@ {% from 'core/macros.jinja' import paginate_alpine %} {% block title %} - {% trans %}UV Guide{% endtrans %} + {% trans %}UE Guide{% endtrans %} {% endblock %} +{% block description -%} + {% trans %}A guide of courses available at UTBM.{% endtrans %} +{%- endblock %} + {% block additional_css %} {% endblock %} diff --git a/sas/templates/sas/main.jinja b/sas/templates/sas/main.jinja index bd66fd64..52824af7 100644 --- a/sas/templates/sas/main.jinja +++ b/sas/templates/sas/main.jinja @@ -8,6 +8,10 @@ {% trans %}SAS{% endtrans %} {% endblock %} +{% block description -%} + {% trans %}See all the photos taken during events organised by the AE.{% endtrans %} +{%- endblock %} + {% set is_sas_admin = user.is_root or user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID) %} {% from "sas/macros.jinja" import display_album %}