2025-02-23 23:01:19 +00:00
28 changed files with 549 additions and 711 deletions
--- a/chat/static/tfjm/chat_tfjm.webmanifest
+++ b/chat/static/tfjm/chat_tfjm.webmanifest
--- a/chat/static/tfjm/chat_eteam.webmanifest
+++ b/chat/static/tfjm/chat_eteam.webmanifest
@ -1,17 +0,0 @@
-{
-    "background_color": "white",
-    "description": "Chat for ETEAM",
-    "display": "standalone",
-    "icons": [
-        {
-            "src": "/static/tfjm/img/eteam.png",
-            "sizes": "512x512",
-            "type": "image/png",
-            "purpose": "maskable"
-        }
-    ],
-    "name": "ETEAM Chat",
-    "short_name": "ETEAM Chat",
-    "start_url": "/chat/fullscreen",
-    "theme_color": "black"
-}
--- a/chat/templates/chat/chat.html
+++ b/chat/templates/chat/chat.html
@ -6,11 +6,7 @@

 {% block extracss %}
    {# Webmanifest PWA permettant l'installation de l'application sur un écran d'accueil, pour navigateurs supportés #}
-    {% if TFJM.APP == "TFJM" %}
-        <link rel="manifest" href="{% static "tfjm/chat_tfjm.webmanifest" %}">
-    {% elif TFJM.APP == "ETEAM" %}
-        <link rel="manifest" href="{% static "tfjm/chat_eteam.webmanifest" %}">
-    {% endif %}
+    <link rel="manifest" href="{% static "tfjm/chat.webmanifest" %}">
 {% endblock %}

 {% block content-title %}{% endblock %}
--- a/chat/templates/chat/fullscreen.html
+++ b/chat/templates/chat/fullscreen.html
@ -6,13 +6,10 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    {% if TFJM.APP == "TFJM" %}
-        <title>{% trans "TFJM² Chat" %}</title>
+    <title>
+        {% trans "TFJM² Chat" %}
+    </title>
    <meta name="description" content="{% trans "TFJM² Chat" %}">
-    {% elif TFJM.APP == "ETEAM" %}
-        <title>{% trans "ETEAM Chat" %}</title>
-        <meta name="description" content="{% trans "ETEAM Chat" %}">
-    {% endif %}

    {# Favicon #}
    <link rel="shortcut icon" href="{% static "favicon.ico" %}">
@ -30,11 +27,7 @@
    <script type="application/javascript" src="{% static "bootstrap/js/bootstrap.bundle.min.js" %}" charset="utf-8"></script>

    {# Webmanifest PWA permettant l'installation de l'application sur un écran d'accueil, pour navigateurs supportés #}
-    {% if TFJM.APP == "TFJM" %}
-        <link rel="manifest" href="{% static "tfjm/chat_tfjm.webmanifest" %}">
-    {% elif TFJM.APP == "ETEAM" %}
-        <link rel="manifest" href="{% static "tfjm/chat_eteam.webmanifest" %}">
-    {% endif %}
+    <link rel="manifest" href="{% static "tfjm/chat.webmanifest" %}">
 </head>
 <body class="d-flex w-100 h-100 flex-column">
 {% include "chat/content.html" with fullscreen=True %}
--- a/chat/templates/chat/login.html
+++ b/chat/templates/chat/login.html
@ -7,9 +7,9 @@
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>
-        {% trans "Chat" %} - {% trans "Log in" %}
+        {% trans "TFJM² Chat" %} - {% trans "Log in" %}
    </title>
-    <meta name="description" content="{% trans "Chat" %}">
+    <meta name="description" content="{% trans "TFJM² Chat" %}">

    {# Favicon #}
    <link rel="shortcut icon" href="{% static "favicon.ico" %}">
@ -25,11 +25,7 @@
    <script type="application/javascript" src="{% static "bootstrap/js/bootstrap.bundle.min.js" %}" charset="utf-8"></script>

    {# Webmanifest PWA permettant l'installation de l'application sur un écran d'accueil, pour navigateurs supportés #}
-    {% if TFJM.APP == "TFJM" %}
-        <link rel="manifest" href="{% static "tfjm/chat_tfjm.webmanifest" %}">
-    {% elif TFJM.APP == "ETEAM" %}
-        <link rel="manifest" href="{% static "tfjm/chat_eteam.webmanifest" %}">
-    {% endif %}
+    <link rel="manifest" href="{% static "tfjm/chat.webmanifest" %}">
 </head>
 <body class="d-flex w-100 h-100 flex-column">
    <div class="container">
--- a/draw/consumers.py
+++ b/draw/consumers.py
@ -417,7 +417,7 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):

        return error

-    async def process_dice_select_poules(self):  # noqa: C901
+    async def process_dice_select_poules(self):
        """
        Called when all teams launched their dice.
        Place teams into pools and order their passage.
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
--- a/participation/forms.py
+++ b/participation/forms.py
@ -111,7 +111,7 @@ class RequestValidationForm(forms.Form):
    )

    engagement = forms.BooleanField(
-        label=_("I engage myself to participate to the whole tournament."),
+        label=_("I engage myself to participate to the whole TFJM²."),
        required=True,
    )

--- a/participation/models.py
+++ b/participation/models.py
@ -1,8 +1,7 @@
 # Copyright (C) 2020 by Animath
 # SPDX-License-Identifier: GPL-3.0-or-later
-
-from datetime import date, timedelta
 import math
+from datetime import date, timedelta
 import os

 from django.conf import settings
@ -28,7 +27,7 @@ def get_motivation_letter_filename(instance, filename):

 class Team(models.Model):
    """
-    The Team model represents a real team that participates to the tournament.
+    The Team model represents a real team that participates to the TFJM².
    This only includes the registration detail.
    """
    name = models.CharField(
--- a/participation/templates/participation/mails/team_validated.html
+++ b/participation/templates/participation/mails/team_validated.html
@ -15,10 +15,10 @@

 {% if payment %}
    <p>
-        You must now pay your participation fee of € {{ payment.amount }}.
+        You must now pay your participation fee of € {{ team.participation.amount }}.
        You can pay by credit card or bank transfer. You'll find information
        on the payment page which you can find on
-        <a href="https://{{ domain }}{% url 'registration:my_account_detail' %}">your account</a>.
+        <a href="https://{{ domain }}{% url 'registration:my_account_detail' %}"your account</a>.
        If you have a scholarship, registration is free, but you must submit a justification on the same page.
    </p>
 {% elif registration.is_coach and team.participation.tournament.price %}
--- a/participation/templates/participation/mails/team_validated.txt
+++ b/participation/templates/participation/mails/team_validated.txt
@ -2,8 +2,8 @@ Hello {{registration }},

 Congratulations! Your team "{{ team.name }}" ({{ team.trigram }}) is now validated! You are now ready to
 to work on your problems. You can then upload your solutions to the platform.
-{% if payment %}
-You must now pay your participation fee of € {{ payment.amount }}.
+{% if team.participation.amount %}
+You must now pay your participation fee of € {{ team.participation.amount }}.
 You can pay by credit card or bank transfer. You'll find information
 on the payment page which you can find on your account:
 https://{{ domain }}{% url 'registration:my_account_detail' %}
--- a/participation/templates/participation/tournament_detail.html
+++ b/participation/templates/participation/tournament_detail.html
@ -192,19 +192,22 @@
            <h4>IMPORTANT</h4>

            <p>
-                The files accessible below may contain personal information.
-                In compliance with European law and out of respect for the confidentiality of participants' data, 
-                you may only use this data for purposes strictly necessary to the organization of the tournament.
+                Les fichiers accessibles ci-dessous peuvent contenir des informations personnelles.
+                Par conformité avec le droit européen et par respect de la confidentialité des données
+                des participant⋅es, vous ne devez utiliser ces données que dans un cadre strictement
+                nécessaire en lien avec l'organisation du tournoi.
            </p>

            <p>
-                Moreover, it is your responsibility to delete these files once you no longer need them, especially at the end of the tournament.
+                De plus, il est de votre responsabilité de supprimer ces fichiers une fois que vous
+                n'en avez plus besoin, notamment à la fin du tournoi.
            </p>

            <p class="text-center">
                <button class="btn btn-warning" data-bs-toggle="collapse" href=".files-to-download-collapse"
                        role="button" aria-expanded="false" aria-controls="files-to-download files-to-download-popup">
-                        I agree not to divulge participants' data and to delete them at the end of the tournament.
+                    Je m'engage à ne pas divulguer les données des participant⋅es
+                    et de les supprimer à l'issue du tournoi
                </button>
            </p>
        </div>
@ -214,48 +217,48 @@
                <ul>
                    <li>
                        <a href="{% url "participation:tournament_csv" pk=tournament.pk %}">
-                            Validated team participant data spreadsheet
+                            Tableur de données des participant⋅es des équipes validées
                        </a>
                    </li>
                    <li>
                        <a href="{% url "participation:tournament_csv" pk=tournament.pk %}?all">
-                            All teams participant data spreadsheet
+                            Tableur de données des participant⋅es de toutes les équipes
                        </a>
                    </li>
                    <li>
                        <a href="{% url "participation:tournament_authorizations" tournament_id=tournament.id %}">
-                            Archive of all authorisations sorted by team and person
+                            Archive de toutes les autorisations triées par équipe et par personne
                        </a>
                    </li>
                    <li>
                        <a href="{% url "participation:tournament_solutions" tournament_id=tournament.id %}">
-                            Archive of all submitted solutions sorted by team
+                            Archive de toutes les solutions envoyées triées par équipe
                        </a>
                    </li>
                    <li>
                        <a href="{% url "participation:tournament_solutions" tournament_id=tournament.id %}?sort_by=problem">
-                            Archive of all sent solutions sorted by problem
+                            Archive de toutes les solutions envoyées triées par problème
                        </a>
                    </li>
                    <li>
                        <a href="{% url "participation:tournament_solutions" tournament_id=tournament.id %}?sort_by=pool">
-                            Archive of all sent solutions sorted by pool
+                            Archive de toutes les solutions envoyées triées par poule
                        </a>
                    </li>
                    <li>
                        <a href="{% url "participation:tournament_syntheses" tournament_id=tournament.id %}?sort_by=pool">
-                            Archive of all summary notes sorted by pool and passage
+                            Archive de toutes les notes de synthèse triées par poule et par passage
                        </a>
                    </li>
                    <li>
                        <a href="https://docs.google.com/spreadsheets/d/{{ tournament.notes_sheet_id }}/edit">
                            <i class="fas fa-table"></i>
-                            Note spreadsheet on Google Sheets
+                            Tableur de notes sur Google Sheets
                        </a>
                    </li>
                    <li>
                        <a href="{% url "participation:tournament_notation_sheets" tournament_id=tournament.id %}">
-                            Archive of all printable note sheets sorted by pool
+                            Archive de toutes les feuilles de notes à imprimer triées par poule
                        </a>
                    </li>
                </ul>
--- a/participation/views.py
+++ b/participation/views.py
@ -231,7 +231,7 @@ class TeamDetailView(LoginRequiredMixin, FormMixin, ProcessFormView, DetailView)
        mail_context = dict(team=self.object, domain=Site.objects.first().domain)
        mail_plain = render_to_string("participation/mails/request_validation.txt", mail_context)
        mail_html = render_to_string("participation/mails/request_validation.html", mail_context)
-        send_mail(f"[{settings.APP_NAME}] {_('Team validation')}", mail_plain, settings.DEFAULT_FROM_EMAIL,
+        send_mail("[TFJM²] Validation d'équipe", mail_plain, settings.DEFAULT_FROM_EMAIL,
                  [self.object.participation.tournament.organizers_email], html_message=mail_html)

        return super().form_valid(form)
@ -255,8 +255,7 @@ class TeamDetailView(LoginRequiredMixin, FormMixin, ProcessFormView, DetailView)

            domain = Site.objects.first().domain
            for registration in self.object.participants.all():
-                if settings.PAYMENT_MANAGEMENT and \
-                        registration.is_student and self.object.participation.tournament.price:
+                if registration.is_student and self.object.participation.tournament.price:
                    payment = Payment.objects.get(registrations=registration, final=False)
                else:
                    payment = None
@ -266,8 +265,7 @@ class TeamDetailView(LoginRequiredMixin, FormMixin, ProcessFormView, DetailView)
                                         message=form.cleaned_data["message"].replace('\n', '<br>'))
                mail_plain = render_to_string("participation/mails/team_validated.txt", mail_context_plain)
                mail_html = render_to_string("participation/mails/team_validated.html", mail_context_html)
-                registration.user.email_user(f"[{settings.APP_NAME}] {_('Team validated')}", mail_plain,
-                                             html_message=mail_html)
+                registration.user.email_user("[TFJM²] Équipe validée", mail_plain, html_message=mail_html)
        elif "invalidate" in self.request.POST:
            self.object.participation.valid = None
            self.object.participation.save()
@ -275,8 +273,8 @@ class TeamDetailView(LoginRequiredMixin, FormMixin, ProcessFormView, DetailView)
            mail_context_html = dict(team=self.object, message=form.cleaned_data["message"].replace('\n', '<br>'))
            mail_plain = render_to_string("participation/mails/team_not_validated.txt", mail_context_plain)
            mail_html = render_to_string("participation/mails/team_not_validated.html", mail_context_html)
-            send_mail(f"[{settings.APP_NAME}] {_('Team not validated')}", mail_plain,
-                      None, [self.object.email], html_message=mail_html)
+            send_mail("[TFJM²] Équipe non validée", mail_plain, None, [self.object.email],
+                      html_message=mail_html)
        else:
            form.add_error(None, _("You must specify if you validate the registration or not."))
            return self.form_invalid(form)
@ -1137,7 +1135,7 @@ class PoolJuryView(VolunteerMixin, FormView, DetailView):
            user.save()

            # Send welcome mail
-            subject = f"[{settings.APP_NAME}] " + str(_("New jury account"))
+            subject = "[TFJM²] " + str(_("New TFJM² jury account"))
            site = Site.objects.first()
            message = render_to_string('registration/mails/add_organizer.txt', dict(user=user,
                                                                                    inviter=self.request.user,
--- a/registration/models.py
+++ b/registration/models.py
@ -50,7 +50,7 @@ class Registration(PolymorphicModel):
        The account got created or the email got changed.
        Send an email that contains a link to validate the address.
        """
-        subject = f"[{settings.APP_NAME}] " + str(_("Activate your account"))
+        subject = "[TFJM²] " + str(_("Activate your TFJM² account"))
        token = email_validation_token.make_token(self.user)
        uid = urlsafe_base64_encode(force_bytes(self.user.pk))
        site = Site.objects.first()
@ -309,7 +309,7 @@ class ParticipantRegistration(Registration):
        The team is selected for final.
        """
        translation.activate(settings.PREFERRED_LANGUAGE_CODE)
-        subject = f"[{settings.APP_NAME}] " + str(_("Team selected for the final tournament"))
+        subject = "[TFJM²] " + str(_("Team selected for the final tournament"))
        site = Site.objects.first()
        from participation.models import Tournament
        tournament = Tournament.final_tournament()
@ -803,7 +803,7 @@ class Payment(models.Model):

    def send_remind_mail(self):
        translation.activate(settings.PREFERRED_LANGUAGE_CODE)
-        subject = f"[{settings.APP_NAME}] " + str(_("Reminder for your payment"))
+        subject = "[TFJM²] " + str(_("Reminder for your payment"))
        site = Site.objects.first()
        for registration in self.registrations.all():
            message = loader.render_to_string('registration/mails/payment_reminder.txt',
@ -814,7 +814,7 @@ class Payment(models.Model):

    def send_helloasso_payment_confirmation_mail(self):
        translation.activate(settings.PREFERRED_LANGUAGE_CODE)
-        subject = f"[{settings.APP_NAME}] " + str(_("Payment confirmation"))
+        subject = "[TFJM²] " + str(_("Payment confirmation"))
        site = Site.objects.first()
        for registration in self.registrations.all():
            message = loader.render_to_string('registration/mails/payment_confirmation.txt',
--- a/registration/templates/registration/mails/final_selection.html
+++ b/registration/templates/registration/mails/final_selection.html
@ -1,75 +0,0 @@
-<!DOCTYPE html>
-<html lang="fr">
-<head>
-    <meta charset="UTF-8">
-    <title></title>
-</head>
-<body>
-<p>
-    Bonjour {{ user.registration }},
-</p>
-
-<p>
-    Félicitations ! Votre équipe {{ user.registration.team.name }} ({{ user.registration.team.trigram }})
-    est sélectionnée pour le tournoi final du TFJM² !
-</p>
-
-<p>
-    La finale aura lieu du {{ tournament.date_start|date:"d/m/Y" }} au {{ tournament.date_end|date:"d/m/Y" }}
-    à : {{ tournament.place }}.
-    Les organisateurices de la finale vous recontacteront pour plus de détails.
-</p>
-
-<p>
-    D'ores-et-déjà, vous pouvez soumettre votre autorisation de droit à l'image spécifique à la finale sur votre espace personnel :
-    <a href="https://{{ domain }}{% url 'registration:user_detail' pk=user.pk %}">
-        https://{{ domain }}{% url 'registration:user_detail' pk=user.pk %}
-    </a>.
-    {% if user.registration.is_student and user.registration.under_18_final %}
-        Vous pouvez également transmettre puisque vous êtes mineur⋅e votre autorisation parentale spécifique pour la finale sur la même page.
-    {% endif %}
-</p>
-
-<p>
-    {% if tournament.price > 0 %}
-        {% if user.registration.is_student %}
-            {% if payment.type == "scholarship" %}
-                Votre statut de boursièr⋅e déjà enregistré vous exempte à nouveau des frais de participation de la finale.
-            {% else %}
-                Vous devez régler les frais de participation à la finale de {{ tournament.price }} €.
-                Rendez-vous pour cela sur la page du paiement :
-                <a href="https://{{ domain }}{% url 'registration:update_payment' pk=payment.pk %}">
-                    https://{{ domain }}{% url 'registration:update_payment' pk=payment.pk %}
-                </a>.
-            {% endif %}
-        {% else %}
-            En tant qu'encadrant⋅e, vous n'avez toujours rien à payer, mais veillez bien à ce que les membres de votre équipe
-            règlent les frais de participation à la finale de {{ tournament.price }} €.
-        {% endif %}
-    {% endif %}
-</p>
-
-<p>
-    Conformément au règlement du TFJM², vous pouvez soumettre de nouvelles versions de vos solutions,
-    pour améliorer vos explications, corriger des erreurs mineures ou la mise en page, ou supprimer
-    des éléments faux, mais il vous est en revanche interdit d'ajouter des résultats ou des preuves
-    ou de corriger des erreurs majeures.
-</p>
-
-<p>
-    Pour mettre à jour vos solutions, rendez-vous sur la page de votre équipe :
-    <a href="https://{{ domain }}{% url 'participation:participation_detail' pk=user.registration.team.participation.pk %}">
-        https://{{ domain }}{% url 'participation:participation_detail' pk=user.registration.team.participation.pk %}
-    </a>.
-</p>
-
-<p>
-    Cordialement,
-</p>
-
-- 
-<p>
-    L'équipe du TFJM²
-</p>
-</body>
-</html>
--- a/registration/templates/registration/mails/final_selection.txt
+++ b/registration/templates/registration/mails/final_selection.txt
@ -1,38 +0,0 @@
-Bonjour {{ user.registration }},
-
-Félicitations ! Votre équipe {{ user.registration.team.name }} ({{ user.registration.team.trigram }}) est sélectionnée pour le tournoi final du TFJM² !
-
-La finale aura lieu du {{ tournament.date_start|date:"d/m/Y" }} au {{ tournament.date_end|date:"d/m/Y" }} à : {{ tournament.place }}.
-Les organisateurices de la finale vous recontacteront pour plus de détails.
-
-D'ores-et-déjà, vous pouvez soumettre votre autorisation de droit à l'image spécifique à la finale sur votre espace personnel :
-https://{{ domain }}{% url 'registration:user_detail' pk=user.pk %}
-{% if user.registration.is_student and user.registration.under_18_final %}
-Vous pouvez également transmettre puisque vous êtes mineur⋅e votre autorisation parentale spécifique pour la finale sur la même page.
-{% endif %}
-{% if tournament.price > 0 %}
-{% if user.registration.is_student %}
-{% if payment.type == "scholarship" %}
-Votre statut de boursièr⋅e déjà enregistré vous exempte à nouveau des frais de participation de la finale.
-{% else %}
-Vous devez régler les frais de participation à la finale de {{ tournament.price }} €.
-Rendez-vous pour cela sur la page du paiement :
-https://{{ domain }}{% url 'registration:update_payment' pk=payment.pk %}
-{% endif %}
-{% else %}
-En tant qu'encadrant⋅e, vous n'avez toujours rien à payer, mais veillez bien à ce que les membres de votre équipe
-règlent les frais de participation à la finale de {{ tournament.price }} €.
-{% endif %}
-{% endif %}
-Conformément au règlement du TFJM², vous pouvez soumettre de nouvelles versions de vos solutions,
-pour améliorer vos explications, corriger des erreurs mineures ou la mise en page, ou supprimer
-des éléments faux, mais il vous est en revanche interdit d'ajouter des résultats ou des preuves
-ou de corriger des erreurs majeures.
-
-Pour mettre à jour vos solutions, rendez-vous sur la page de votre équipe :
-https://{{ domain }}{% url 'participation:participation_detail' pk=user.registration.team.participation.pk %}
-
-Cordialement,
-
--
-L'équipe du TFJM²
--- a/registration/templates/registration/mails/payment_confirmation.html
+++ b/registration/templates/registration/mails/payment_confirmation.html
@ -14,7 +14,7 @@

 <p>
    {% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament.name %}
-        We successfully received the payment of {{ amount }} € for your participation for the ETEAM in the team {{ team }}!
+        We successfully received the payment of {{ amount }} € for your participation for the ETEAM in the team {{ team }} for the tournament {{ tournament }}!
    {% endblocktrans %}
 </p>

--- a/registration/templates/registration/mails/payment_confirmation.txt
+++ b/registration/templates/registration/mails/payment_confirmation.txt
@ -2,7 +2,7 @@
 {% trans "Hi" %} {{ registration|safe }},

 {% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament.name %}
-We successfully received the payment of {{ amount }} € for your participation for the ETEAM in the team {{ team }}!
+We successfully received the payment of {{ amount }} € for your participation for the ETEAM in the team {{ team }} for the tournament {{ tournament }}!
 {% endblocktrans %}

 {% trans "Your registration is now fully completed, and you can work on your solutions." %}
--- a/registration/templates/registration/mails/payment_reminder.html
+++ b/registration/templates/registration/mails/payment_reminder.html
@ -14,7 +14,7 @@

 <p>
    {% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament %}
-    You are registered for the ETEAM. Your team {{ team }} has been successfully validated.
+    You are registered for the ETEAM of {{ tournament }}. Your team {{ team }} has been successfully validated.
    To end your inscription, you must pay the amount of {{ amount }} €.
    {% endblocktrans %}
 </p>
--- a/registration/templates/registration/mails/payment_reminder.txt
+++ b/registration/templates/registration/mails/payment_reminder.txt
@ -2,7 +2,7 @@
 {% trans "Hi" %} {{ registration|safe }},

 {% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament %}
-You are registered for the ETEAM. Your team {{ team }} has been successfully validated.
+You are registered for the ETEAM of {{ tournament }}. Your team {{ team }} has been successfully validated.
 To end your inscription, you must pay the amount of {{ amount }} €.
 {% endblocktrans %}
 {% if payment.grouped %}
--- a/registration/views.py
+++ b/registration/views.py
@ -18,7 +18,7 @@ from django.http import FileResponse, Http404
 from django.shortcuts import redirect, resolve_url
 from django.template.loader import render_to_string
 from django.urls import reverse_lazy
-from django.utils import translation
+from django.utils import timezone, translation
 from django.utils.crypto import get_random_string
 from django.utils.http import urlsafe_base64_decode
 from django.utils.text import format_lazy
@ -121,7 +121,7 @@ class AddOrganizerView(VolunteerMixin, CreateView):
        form.instance.set_password(password)
        form.instance.save()

-        subject = f"[{settings.APP_NAME}] " + str(_("New organizer account"))
+        subject = "[TFJM²] " + str(_("New TFJM² organizer account"))
        site = Site.objects.first()
        message = render_to_string('registration/mails/add_organizer.txt', dict(user=registration.user,
                                                                                inviter=self.request.user,
--- a/tfjm/context_processors.py
+++ b/tfjm/context_processors.py
@ -1,7 +1,5 @@
-# Copyright (C) 2024 by Animath
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 from django.conf import settings
+
 from participation.models import Tournament


@ -9,7 +7,6 @@ def tfjm_context(request):
    return {
        'TFJM': {
            'APP': settings.TFJM_APP,
-            'APP_NAME': settings.APP_NAME,
            'ML_MANAGEMENT': settings.ML_MANAGEMENT,
            'PAYMENT_MANAGEMENT': settings.PAYMENT_MANAGEMENT,
            'SINGLE_TOURNAMENT':
--- a/tfjm/settings.py
+++ b/tfjm/settings.py
@ -347,7 +347,6 @@ except ImportError:

 if TFJM_APP == "TFJM":
    PREFERRED_LANGUAGE_CODE = 'fr'
-    APP_NAME = "TFJM²"
    TEAM_CODE_LENGTH = 3
    RECOMMENDED_SOLUTIONS_COUNT = 5
    NB_ROUNDS = 2
@ -370,7 +369,6 @@ if TFJM_APP == "TFJM":
    ]
 elif TFJM_APP == "ETEAM":
    PREFERRED_LANGUAGE_CODE = 'en'
-    APP_NAME = "ETEAM"
    TEAM_CODE_LENGTH = 4
    RECOMMENDED_SOLUTIONS_COUNT = 6
    NB_ROUNDS = 3
--- a/tfjm/templates/base.html
+++ b/tfjm/templates/base.html
@ -9,13 +9,11 @@
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>
-        {% block title %}{{ title }}{% endblock title %} - {{ TFJM.APP_NAME }}
+        {# TODO ETEAM Plus d'uniformité #}
+        {% block title %}{{ title }}{% endblock title %} - {% trans "ETEAM Platform" %}
    </title>
-    {% if TFJM.APP == "TFJM" %}
-        <meta name="description" content="{% trans "Registration platform to the TFJM²." %}">
-    {% elif TFJM.APP == "ETEAM" %}
+    {# TODO ETEAM Plus d'uniformité #}
    <meta name="description" content="{% trans "Registration platform to the ETEAM." %}">
-    {% endif %}

    {# Favicon #}
    <link rel="shortcut icon" href="{% static "favicon.ico" %}">
--- a/tfjm/templates/index_eteam.html
+++ b/tfjm/templates/index_eteam.html
@ -2,8 +2,6 @@

 {% load i18n %}

-{% block content-title %}{% endblock %}
-
 {% block content %}
    <div class="jumbotron p-5">
        <div class="row text-center">
@ -58,7 +56,7 @@
            {% blocktrans trimmed %}
                Do not hesitate to consult the <a href="/doc/" target="_blank">documentation</a> of the site, to check if
                the answer is not already there. Also refer of course to the
-                <a href="https://eteam.tfjm.org/rules/" target="_blank">ETEAM rules</a>.
+                <a href="https://eteam.tfjm.org/rules/" target="_blank">𝕋𝔽𝕁𝕄² rules</a>.
                For any other question, do not hesitate to contact us by email at the address
                <a href="mailto:eteam_moc@proton.me ">
                    eteam_moc@proton.me
--- a/tfjm/templates/index_tfjm.html
+++ b/tfjm/templates/index_tfjm.html
@ -2,8 +2,6 @@

 {% load i18n %}

-{% block content-title %}{% endblock %}
-
 {% block content %}
    <div class="jumbotron p-5">
        <div class="row text-center">
--- a/tfjm/urls.py
+++ b/tfjm/urls.py
@ -18,7 +18,6 @@ Including another URLconf
 """
 from django.conf import settings
 from django.contrib import admin
-from django.utils.translation import gettext_lazy as _
 from django.urls import include, path
 from django.views.defaults import bad_request, page_not_found, permission_denied, server_error
 from django.views.generic import TemplateView
@ -30,9 +29,7 @@ from .views import AdminSearchView

 urlpatterns = [
    # TODO ETEAM Rendre ça plus joli
-    path('', TemplateView.as_view(template_name=f"index_{settings.TFJM_APP.lower()}.html",
-                                  extra_context={'title': _("Home")}),
-         name='index'),
+    path('', TemplateView.as_view(template_name=f"index_{settings.TFJM_APP.lower()}.html"), name='index'),
    path('about/', TemplateView.as_view(template_name="about.html"), name='about'),
    path('i18n/', include('django.conf.urls.i18n')),
    path('admin/doc/', include('django.contrib.admindocs.urls')),
--- a/tox.ini
+++ b/tox.ini
@ -26,7 +26,7 @@ deps =
    pep8-naming
    pyflakes
 commands =
-    flake8 api/ chat/ draw/ logs/ participation/ registration/ tfjm/
+    flake8 api/ chat/ss draw/ logs/ participation/ registration/ tfjm/

 [flake8]
 exclude =