From a853be73c5bbb99f04b9a40f72cef4b6c134e722 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sat, 13 Jan 2024 17:04:45 +0100 Subject: [PATCH] Temporary remove chat feature (maybe reintroduce a better one later) Signed-off-by: Emmy D'Anello --- README.md | 2 +- locale/fr/LC_MESSAGES/django.po | 404 ++++++++---------- .../templates/participation/chat.html | 32 +- tfjm/templates/base.html | 5 +- tfjm/templates/index.html | 12 +- 5 files changed, 199 insertions(+), 256 deletions(-) diff --git a/README.md b/README.md index 8a643e2..120bafe 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Si le type de base de données sélectionné est SQLite, la variable `DJANGO_DB_ le fichier de base de données (par défaut, `db.sqlite3`). En développement, il est recommandé d'utiliser SQLite pour des raisons de simplicité. Les paramètres de mail ne seront -pas utilisés, et les mails qui doivent être envoyés seront envoyés dans la console. Les intégrations mail et Matrix +pas utilisés, et les mails qui doivent être envoyés seront envoyés dans la console. L'intégration mail seront également désactivées. En production, il est recommandé de ne pas utiliser SQLite pour des raisons de performances. diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index dfc70b8..9915335 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: TFJM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-20 17:09+0200\n" +"POT-Creation-Date: 2024-01-13 16:58+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emmy D'Anello \n" "Language-Team: LANGUAGE \n" @@ -22,19 +22,19 @@ msgid "API" msgstr "API" #: draw/admin.py:16 draw/admin.py:28 draw/admin.py:44 participation/admin.py:44 -#: participation/models.py:126 participation/tables.py:87 +#: participation/models.py:115 participation/tables.py:87 msgid "teams" msgstr "équipes" #: draw/admin.py:40 draw/admin.py:56 draw/models.py:24 #: participation/admin.py:16 participation/admin.py:73 -#: participation/admin.py:104 participation/models.py:295 -#: participation/models.py:319 participation/models.py:352 +#: participation/admin.py:104 participation/models.py:284 +#: participation/models.py:308 participation/models.py:341 msgid "tournament" msgstr "tournoi" #: draw/admin.py:60 draw/models.py:231 draw/models.py:426 -#: participation/models.py:356 +#: participation/models.py:345 msgid "round" msgstr "tour" @@ -168,7 +168,7 @@ msgstr "La poule en cours, où les équipes choisissent leurs problèmes" msgid "rounds" msgstr "tours" -#: draw/models.py:254 participation/models.py:370 +#: draw/models.py:254 participation/models.py:359 msgid "letter" msgstr "lettre" @@ -207,17 +207,17 @@ msgid "Pool {letter}{number}" msgstr "Poule {letter}{number}" #: draw/models.py:407 draw/models.py:434 participation/admin.py:69 -#: participation/admin.py:88 participation/models.py:422 -#: participation/models.py:431 participation/tables.py:83 +#: participation/admin.py:88 participation/models.py:411 +#: participation/models.py:420 participation/tables.py:83 msgid "pool" msgstr "poule" -#: draw/models.py:408 participation/models.py:423 +#: draw/models.py:408 participation/models.py:412 msgid "pools" msgstr "poules" -#: draw/models.py:420 participation/models.py:342 participation/models.py:592 -#: participation/models.py:622 participation/models.py:660 +#: draw/models.py:420 participation/models.py:331 participation/models.py:581 +#: participation/models.py:611 participation/models.py:649 msgid "participation" msgstr "participation" @@ -241,8 +241,8 @@ msgid "" msgstr "" "L'ordre de choix dans la poule, entre 0 et la taille de la poule moins 1." -#: draw/models.py:457 draw/models.py:480 participation/models.py:445 -#: participation/models.py:629 +#: draw/models.py:457 draw/models.py:480 participation/models.py:434 +#: participation/models.py:618 #, python-brace-format msgid "Problem #{problem}" msgstr "Problème n°{problem}" @@ -325,8 +325,8 @@ msgid "Continue draw" msgstr "Continuer le tirage" #: draw/templates/draw/tournament_content.html:216 participation/admin.py:100 -#: participation/models.py:125 participation/models.py:310 -#: registration/models.py:127 +#: participation/models.py:114 participation/models.py:299 +#: registration/models.py:123 msgid "team" msgstr "équipe" @@ -368,8 +368,8 @@ msgstr "Êtes-vous sûr·e de vouloir annuler le tirage au sort ?" msgid "Close" msgstr "Fermer" -#: draw/views.py:31 participation/views.py:159 participation/views.py:456 -#: participation/views.py:490 +#: draw/views.py:31 participation/views.py:151 participation/views.py:448 +#: participation/views.py:479 msgid "You are not in a team." msgstr "Vous n'êtes pas dans une équipe." @@ -442,26 +442,26 @@ msgstr "Changelog de type \"{action}\" pour le modèle {model} le {timestamp}" msgid "valid" msgstr "valide" -#: participation/admin.py:24 participation/models.py:331 +#: participation/admin.py:24 participation/models.py:320 msgid "selected for final" msgstr "sélectionnée pour la finale" #: participation/admin.py:57 participation/admin.py:116 -#: participation/models.py:452 participation/tables.py:111 +#: participation/models.py:441 participation/tables.py:111 msgid "defender" msgstr "défenseur⋅se" -#: participation/admin.py:61 participation/models.py:459 -#: participation/models.py:672 +#: participation/admin.py:61 participation/models.py:448 +#: participation/models.py:661 msgid "opponent" msgstr "opposant⋅e" -#: participation/admin.py:65 participation/models.py:466 -#: participation/models.py:673 +#: participation/admin.py:65 participation/models.py:455 +#: participation/models.py:662 msgid "reporter" msgstr "rapporteur⋅e" -#: participation/admin.py:120 participation/models.py:627 +#: participation/admin.py:120 participation/models.py:616 msgid "problem" msgstr "numéro de problème" @@ -469,7 +469,7 @@ msgstr "numéro de problème" msgid "This name is already used." msgstr "Ce nom est déjà utilisé." -#: participation/forms.py:39 participation/models.py:40 +#: participation/forms.py:39 participation/models.py:38 msgid "The trigram must be composed of three uppercase letters." msgstr "Le trigramme doit être composé de trois lettres majuscules." @@ -568,148 +568,148 @@ msgstr "Ce⋅tte défenseur⋅se ne travaille pas sur ce problème." msgid "The PDF file must not have more than 2 pages." msgstr "Le fichier PDF ne doit pas avoir plus de 2 pages." -#: participation/models.py:33 participation/models.py:136 +#: participation/models.py:31 participation/models.py:125 #: participation/tables.py:17 participation/tables.py:33 msgid "name" msgstr "nom" -#: participation/models.py:39 participation/tables.py:38 +#: participation/models.py:37 participation/tables.py:38 msgid "trigram" msgstr "trigramme" -#: participation/models.py:45 +#: participation/models.py:43 msgid "This trigram is forbidden." msgstr "Ce trigramme est interdit." -#: participation/models.py:51 +#: participation/models.py:49 msgid "access code" msgstr "code d'accès" -#: participation/models.py:52 +#: participation/models.py:50 msgid "The access code let other people to join the team." msgstr "Le code d'accès permet aux autres participants de rejoindre l'équipe." -#: participation/models.py:56 +#: participation/models.py:54 msgid "motivation letter" msgstr "lettre de motivation" -#: participation/models.py:122 +#: participation/models.py:111 #, python-brace-format msgid "Team {name} ({trigram})" msgstr "Équipe {name} ({trigram})" -#: participation/models.py:141 +#: participation/models.py:130 msgid "start" msgstr "début" -#: participation/models.py:146 +#: participation/models.py:135 msgid "end" msgstr "fin" -#: participation/models.py:152 +#: participation/models.py:141 #: participation/templates/participation/tournament_detail.html:18 msgid "place" msgstr "lieu" -#: participation/models.py:156 +#: participation/models.py:145 msgid "max team count" msgstr "nombre maximal d'équipes" -#: participation/models.py:161 +#: participation/models.py:150 #: participation/templates/participation/tournament_detail.html:21 msgid "price" msgstr "prix" -#: participation/models.py:166 +#: participation/models.py:155 #: participation/templates/participation/tournament_detail.html:24 msgid "remote" msgstr "à distance" -#: participation/models.py:171 +#: participation/models.py:160 msgid "limit date for registrations" msgstr "date limite d'inscription" -#: participation/models.py:176 +#: participation/models.py:165 msgid "limit date to upload solutions" msgstr "date limite pour envoyer les solutions" -#: participation/models.py:181 +#: participation/models.py:170 msgid "random draw for solutions" msgstr "tirage au sort des solutions" -#: participation/models.py:186 +#: participation/models.py:175 msgid "limit date to upload the syntheses for the first phase" msgstr "date limite pour envoyer les notes de synthèses pour la première phase" -#: participation/models.py:191 +#: participation/models.py:180 msgid "date when the solutions for the second round become available" msgstr "date à laquelle les solutions pour le second tour sont accessibles" -#: participation/models.py:196 +#: participation/models.py:185 msgid "limit date to upload the syntheses for the second phase" msgstr "date limite d'envoi des notes de synthèse pour la seconde phase" -#: participation/models.py:201 +#: participation/models.py:190 #: participation/templates/participation/tournament_detail.html:48 msgid "description" msgstr "description" -#: participation/models.py:207 +#: participation/models.py:196 #: participation/templates/participation/tournament_detail.html:12 msgid "organizers" msgstr "organisateur⋅rices" -#: participation/models.py:212 +#: participation/models.py:201 msgid "final" msgstr "finale" -#: participation/models.py:296 registration/admin.py:93 +#: participation/models.py:285 registration/admin.py:93 msgid "tournaments" msgstr "tournois" -#: participation/models.py:325 +#: participation/models.py:314 msgid "valid team" msgstr "équipe valide" -#: participation/models.py:326 +#: participation/models.py:315 msgid "The participation got the validation of the organizers." msgstr "La participation a été validée par les organisateur⋅rices." -#: participation/models.py:332 +#: participation/models.py:321 msgid "The team is selected for the final tournament." msgstr "L'équipe est sélectionnée pour la finale." -#: participation/models.py:339 +#: participation/models.py:328 #, python-brace-format msgid "Participation of the team {name} ({trigram})" msgstr "Participation de l'équipe {name} ({trigram})" -#: participation/models.py:343 participation/models.py:376 +#: participation/models.py:332 participation/models.py:365 msgid "participations" msgstr "participations" -#: participation/models.py:358 participation/models.py:359 +#: participation/models.py:347 participation/models.py:348 #, python-brace-format msgid "Round {round}" msgstr "Tour {round}" -#: participation/models.py:382 +#: participation/models.py:371 msgid "juries" msgstr "jurys" -#: participation/models.py:389 +#: participation/models.py:378 msgid "BigBlueButton URL" msgstr "Lien BigBlueButton" -#: participation/models.py:390 +#: participation/models.py:379 msgid "The link of the BBB visio for this pool." msgstr "Le lien du salon BBB pour cette poule." -#: participation/models.py:395 +#: participation/models.py:384 msgid "results available" msgstr "résultats disponibles" -#: participation/models.py:396 +#: participation/models.py:385 msgid "" "Check this case when results become accessible to teams. They stay " "accessible to you. Only averages are given." @@ -718,28 +718,28 @@ msgstr "" "Ils restent toujours accessibles pour vous. Seules les moyennes sont " "communiquées." -#: participation/models.py:416 +#: participation/models.py:405 #, python-brace-format msgid "Pool of day {round} for tournament {tournament} with teams {teams}" msgstr "Poule du jour {round} du tournoi {tournament} avec les équipes {teams}" -#: participation/models.py:436 +#: participation/models.py:425 msgid "position" msgstr "position" -#: participation/models.py:443 +#: participation/models.py:432 msgid "defended solution" msgstr "solution défendue" -#: participation/models.py:476 +#: participation/models.py:465 msgid "observer" msgstr "observateur⋅rice" -#: participation/models.py:481 +#: participation/models.py:470 msgid "penalties" msgstr "pénalités" -#: participation/models.py:483 +#: participation/models.py:472 msgid "" "Number of penalties for the defender. The defender will loose a 0.5 " "coefficient per penalty." @@ -747,124 +747,124 @@ msgstr "" "Nombre de pénalités pour læ défenseur⋅se. Læ défenseur⋅se perd un " "coefficient 0.5 sur sa présentation orale par pénalité." -#: participation/models.py:559 participation/models.py:562 -#: participation/models.py:565 participation/models.py:568 +#: participation/models.py:548 participation/models.py:551 +#: participation/models.py:554 participation/models.py:557 #, python-brace-format msgid "Team {trigram} is not registered in the pool." msgstr "L'équipe {trigram} n'est pas inscrite dans la poule." -#: participation/models.py:573 +#: participation/models.py:562 #, python-brace-format msgid "Passage of {defender} for problem {problem}" msgstr "Passage de {defender} pour le problème {problem}" -#: participation/models.py:577 participation/models.py:586 -#: participation/models.py:667 participation/models.py:709 +#: participation/models.py:566 participation/models.py:575 +#: participation/models.py:656 participation/models.py:698 msgid "passage" msgstr "passage" -#: participation/models.py:578 +#: participation/models.py:567 msgid "passages" msgstr "passages" -#: participation/models.py:597 +#: participation/models.py:586 msgid "difference" msgstr "différence" -#: participation/models.py:598 +#: participation/models.py:587 msgid "Score to add/remove on the final score" msgstr "Score à ajouter/retrancher au score final" -#: participation/models.py:605 +#: participation/models.py:594 msgid "tweak" msgstr "harmonisation" -#: participation/models.py:606 +#: participation/models.py:595 msgid "tweaks" msgstr "harmonisations" -#: participation/models.py:634 +#: participation/models.py:623 msgid "solution for the final tournament" msgstr "solution pour la finale" -#: participation/models.py:639 participation/models.py:678 +#: participation/models.py:628 participation/models.py:667 msgid "file" msgstr "fichier" -#: participation/models.py:645 +#: participation/models.py:634 #, python-brace-format msgid "Solution of team {team} for problem {problem}" msgstr "Solution de l'équipe {team} pour le problème {problem}" -#: participation/models.py:647 +#: participation/models.py:636 msgid "for final" msgstr "pour la finale" -#: participation/models.py:650 +#: participation/models.py:639 msgid "solution" msgstr "solution" -#: participation/models.py:651 +#: participation/models.py:640 msgid "solutions" msgstr "solutions" -#: participation/models.py:684 +#: participation/models.py:673 #, python-brace-format msgid "Synthesis of {team} as {type} for problem {problem} of {defender}" msgstr "" "Note de synthèse de l'équipe {team} en tant que {type} pour le problème " "{problem} de {defender}" -#: participation/models.py:692 +#: participation/models.py:681 msgid "synthesis" msgstr "note de synthèse" -#: participation/models.py:693 +#: participation/models.py:682 msgid "syntheses" msgstr "notes de synthèse" -#: participation/models.py:702 +#: participation/models.py:691 msgid "jury" msgstr "jury" -#: participation/models.py:714 +#: participation/models.py:703 msgid "defender writing note" msgstr "note d'écrit de læ défenseur⋅se" -#: participation/models.py:720 +#: participation/models.py:709 msgid "defender oral note" msgstr "note d'oral de læ défenseur⋅se" -#: participation/models.py:726 +#: participation/models.py:715 msgid "opponent writing note" msgstr "note d'écrit de l'opposant⋅e" -#: participation/models.py:732 +#: participation/models.py:721 msgid "opponent oral note" msgstr "note d'oral de l'opposant⋅e" -#: participation/models.py:738 +#: participation/models.py:727 msgid "reporter writing note" msgstr "note d'écrit de læ rapporteur⋅e" -#: participation/models.py:744 +#: participation/models.py:733 msgid "reporter oral note" msgstr "note d'oral de læ rapporteur⋅e" -#: participation/models.py:750 +#: participation/models.py:739 msgid "observer note" msgstr "note de l'observateur⋅rice" -#: participation/models.py:779 +#: participation/models.py:768 #, python-brace-format msgid "Notes of {jury} for {passage}" msgstr "Notes de {jury} pour le {passage}" -#: participation/models.py:786 +#: participation/models.py:775 msgid "note" msgstr "note" -#: participation/models.py:787 +#: participation/models.py:776 msgid "notes" msgstr "notes" @@ -899,38 +899,14 @@ msgid "No defined team" msgstr "Pas d'équipe définie" #: participation/templates/participation/chat.html:7 -msgid "The chat is located on the dedicated Matrix server:" -msgstr "Le chat est situé sur le serveur Matrix dédié au TFJM² :" - -#: participation/templates/participation/chat.html:14 -msgid "Access to the Matrix server" -msgstr "Accéder au serveur Matrix" - -#: participation/templates/participation/chat.html:20 msgid "" -"To connect to the server, you can select \"Log in\", then use your " -"credentials of this platform to connect with the central authentication " -"server, then you must trust the connection between the Matrix account and " -"the platform. Finally, you will be able to access to the chat platform." +"The chat feature is now out of usage. If you feel that having a chat feature " +"between participants is important, for example to build a team, please " +"contact us." msgstr "" -"Pour se connecter au serveur, vous pouvez sélectionner « Se connecter », " -"puis utiliser vos identifiants de cette plateforme via l'authentication " -"centralisée. Vous devrez ensuite approuver la connexion entre le compte " -"Matrix et la plateforme. Enfin, vous pourrez accéder à la plateforme de chat." - -#: participation/templates/participation/chat.html:28 -msgid "" -"You will be invited in some basic rooms. You must confirm the invitations to " -"join channels." -msgstr "" -"Vous serez invités dans quelques salons basiques. Vous devez confirmer les " -"invitations pour rejoindre les canaux." - -#: participation/templates/participation/chat.html:34 -msgid "If you have any trouble, don't hesitate to contact us :)" -msgstr "" -"Si vous rencontrez le moindre problème, n'hésitez surtout pas à nous " -"contacter :)" +"La fonctionnalité de chat est désormais hors-service. Si vous pensez qu'avoir " +"un chat entre les participant⋅es est important, par exemple pour former une " +"équipe, merci de nous contacter." #: participation/templates/participation/create_team.html:11 #: participation/templates/participation/tournament_form.html:14 @@ -1366,7 +1342,7 @@ msgid "Invalidate" msgstr "Invalider" #: participation/templates/participation/team_detail.html:186 -#: participation/views.py:341 +#: participation/views.py:333 msgid "Upload motivation letter" msgstr "Envoyer la lettre de motivation" @@ -1375,7 +1351,7 @@ msgid "Update team" msgstr "Modifier l'équipe" #: participation/templates/participation/team_detail.html:196 -#: participation/views.py:450 +#: participation/views.py:442 msgid "Leave team" msgstr "Quitter l'équipe" @@ -1491,44 +1467,44 @@ msgstr "Modèles :" msgid "Warning: non-free format" msgstr "Attention : format non libre" -#: participation/views.py:52 tfjm/templates/base.html:73 +#: participation/views.py:51 tfjm/templates/base.html:73 #: tfjm/templates/base.html:256 msgid "Create team" msgstr "Créer une équipe" -#: participation/views.py:61 participation/views.py:106 +#: participation/views.py:60 participation/views.py:101 msgid "You don't participate, so you can't create a team." msgstr "Vous ne participez pas, vous ne pouvez pas créer d'équipe." -#: participation/views.py:63 participation/views.py:108 +#: participation/views.py:62 participation/views.py:103 msgid "You are already in a team." msgstr "Vous êtes déjà dans une équipe." -#: participation/views.py:97 tfjm/templates/base.html:78 +#: participation/views.py:92 tfjm/templates/base.html:78 #: tfjm/templates/base.html:251 msgid "Join team" msgstr "Rejoindre une équipe" -#: participation/views.py:160 participation/views.py:491 +#: participation/views.py:152 participation/views.py:480 msgid "You don't participate, so you don't have any team." msgstr "Vous ne participez pas, vous n'avez donc pas d'équipe." -#: participation/views.py:186 +#: participation/views.py:178 #, python-brace-format msgid "Detail of team {trigram}" msgstr "Détails de l'équipe {trigram}" -#: participation/views.py:223 +#: participation/views.py:215 msgid "You don't participate, so you can't request the validation of the team." msgstr "" "Vous ne participez pas, vous ne pouvez pas demander la validation de " "l'équipe." -#: participation/views.py:226 +#: participation/views.py:218 msgid "The validation of the team is already done or pending." msgstr "La validation de l'équipe est déjà faite ou en cours." -#: participation/views.py:229 +#: participation/views.py:221 msgid "" "The team can't be validated: missing email address confirmations, " "authorizations, people, motivation letter or the tournament is not set." @@ -1537,103 +1513,103 @@ msgstr "" "d'adresse e-mail, soit une autorisation, soit des personnes, soit la lettre " "de motivation, soit le tournoi n'a pas été choisi." -#: participation/views.py:251 +#: participation/views.py:243 msgid "You are not an organizer of the tournament." msgstr "Vous n'êtes pas un⋅e organisateur⋅rice du tournoi." -#: participation/views.py:254 +#: participation/views.py:246 msgid "This team has no pending validation." msgstr "L'équipe n'a pas de validation en attente." -#: participation/views.py:284 +#: participation/views.py:276 msgid "You must specify if you validate the registration or not." msgstr "Vous devez spécifier si vous validez l'inscription ou non." -#: participation/views.py:319 +#: participation/views.py:311 #, python-brace-format msgid "Update team {trigram}" msgstr "Mise à jour de l'équipe {trigram}" -#: participation/views.py:380 participation/views.py:436 +#: participation/views.py:372 participation/views.py:428 #, python-brace-format msgid "Motivation letter of {team}.{ext}" msgstr "Lettre de motivation de {team}.{ext}" -#: participation/views.py:411 +#: participation/views.py:403 #, python-brace-format msgid "Photo authorization of {participant}.{ext}" msgstr "Autorisation de droit à l'image de {participant}.{ext}" -#: participation/views.py:417 +#: participation/views.py:409 #, python-brace-format msgid "Parental authorization of {participant}.{ext}" msgstr "Autorisation parentale de {participant}.{ext}" -#: participation/views.py:424 +#: participation/views.py:416 #, python-brace-format msgid "Health sheet of {participant}.{ext}" msgstr "Fiche sanitaire de {participant}.{ext}" -#: participation/views.py:430 +#: participation/views.py:422 #, python-brace-format msgid "Vaccine sheet of {participant}.{ext}" msgstr "Carnet de vaccination de {participant}.{ext}" -#: participation/views.py:440 +#: participation/views.py:432 #, python-brace-format msgid "Photo authorizations of team {trigram}.zip" msgstr "Autorisations de droit à l'image de l'équipe {trigram}.zip" -#: participation/views.py:458 +#: participation/views.py:450 msgid "The team is already validated or the validation is pending." msgstr "La validation de l'équipe est déjà faite ou en cours." -#: participation/views.py:505 +#: participation/views.py:494 msgid "The team is not validated yet." msgstr "L'équipe n'est pas encore validée." -#: participation/views.py:519 +#: participation/views.py:508 #, python-brace-format msgid "Participation of team {trigram}" msgstr "Participation de l'équipe {trigram}" -#: participation/views.py:655 +#: participation/views.py:644 msgid "You can't upload a solution after the deadline." msgstr "Vous ne pouvez pas envoyer de solution après la date limite." -#: participation/views.py:763 +#: participation/views.py:752 #, python-brace-format msgid "Solutions for pool {pool} of tournament {tournament}.zip" msgstr "Solutions pour la poule {pool} du tournoi {tournament}.zip" -#: participation/views.py:764 +#: participation/views.py:753 #, python-brace-format msgid "Syntheses for pool {pool} of tournament {tournament}.zip" msgstr "Notes de synthèses pour la poule {pool} du tournoi {tournament}.zip" -#: participation/views.py:782 +#: participation/views.py:771 #, python-brace-format msgid "Jurys of {pool}" msgstr "Juré⋅es de la {pool}" -#: participation/views.py:809 +#: participation/views.py:798 msgid "New TFJM² jury account" msgstr "Nouveau compte de juré⋅e pour le TFJM²" -#: participation/views.py:822 +#: participation/views.py:811 #, python-brace-format msgid "The jury {name} has been successfully added!" msgstr "Læ juré⋅e {name} a été ajouté⋅e avec succès !" -#: participation/views.py:859 +#: participation/views.py:848 msgid "The following user is not registered as a jury:" msgstr "L'utilisateur⋅rice suivant n'est pas inscrit⋅e en tant que juré⋅e :" -#: participation/views.py:873 +#: participation/views.py:862 msgid "Notes were successfully uploaded." msgstr "Les notes ont bien été envoyées." -#: participation/views.py:1537 +#: participation/views.py:1526 msgid "You can't upload a synthesis after the deadline." msgstr "Vous ne pouvez pas envoyer de note de synthèse après la date limite." @@ -1659,7 +1635,7 @@ msgstr "rôle" msgid "participant" msgstr "participant⋅e" -#: registration/forms.py:25 registration/models.py:285 +#: registration/forms.py:25 registration/models.py:281 msgid "coach" msgstr "encadrant⋅e" @@ -1684,51 +1660,51 @@ msgstr "email confirmé" msgid "Activate your TFJM² account" msgstr "Activez votre compte du TFJM²" -#: registration/models.py:99 registration/models.py:338 +#: registration/models.py:95 registration/models.py:334 msgid "registration" msgstr "inscription" -#: registration/models.py:100 +#: registration/models.py:96 msgid "registrations" msgstr "inscriptions" -#: registration/models.py:132 +#: registration/models.py:128 msgid "gender" msgstr "genre" -#: registration/models.py:134 +#: registration/models.py:130 msgid "Female" msgstr "Femme" -#: registration/models.py:135 +#: registration/models.py:131 msgid "Male" msgstr "Homme" -#: registration/models.py:136 +#: registration/models.py:132 msgid "Other" msgstr "Autre" -#: registration/models.py:143 +#: registration/models.py:139 msgid "address" msgstr "adresse" -#: registration/models.py:147 +#: registration/models.py:143 msgid "zip code" msgstr "code postal" -#: registration/models.py:153 +#: registration/models.py:149 msgid "city" msgstr "ville" -#: registration/models.py:157 +#: registration/models.py:153 msgid "phone number" msgstr "numéro de téléphone" -#: registration/models.py:162 +#: registration/models.py:158 msgid "health issues" msgstr "problèmes de santé" -#: registration/models.py:164 +#: registration/models.py:160 msgid "" "You can indicate here your allergies or anything that is important to know " "for organizers" @@ -1736,95 +1712,95 @@ msgstr "" "Vous pouvez indiquer ici vos allergies ou n'importe quoi qui peut être bon à " "savoir pour les organisateur⋅rices" -#: registration/models.py:168 +#: registration/models.py:164 msgid "photo authorization" msgstr "autorisation de droit à l'image" -#: registration/models.py:195 +#: registration/models.py:191 msgid "participant registration" msgstr "inscription de participant⋅e" -#: registration/models.py:196 +#: registration/models.py:192 msgid "participant registrations" msgstr "inscriptions de participant⋅es" -#: registration/models.py:205 +#: registration/models.py:201 msgid "birth date" msgstr "date de naissance" -#: registration/models.py:211 +#: registration/models.py:207 msgid "12th grade" msgstr "Terminale" -#: registration/models.py:212 +#: registration/models.py:208 msgid "11th grade" msgstr "Première" -#: registration/models.py:213 +#: registration/models.py:209 msgid "10th grade or lower" msgstr "Seconde ou inférieur" -#: registration/models.py:215 +#: registration/models.py:211 msgid "student class" msgstr "classe" -#: registration/models.py:220 +#: registration/models.py:216 msgid "school" msgstr "école" -#: registration/models.py:225 +#: registration/models.py:221 msgid "responsible name" msgstr "nom de læ responsable légal⋅e" -#: registration/models.py:230 +#: registration/models.py:226 msgid "responsible phone number" msgstr "numéro de téléphone de læ responsable légal⋅e" -#: registration/models.py:235 +#: registration/models.py:231 msgid "responsible email address" msgstr "adresse e-mail de læ responsable légal⋅e" -#: registration/models.py:240 +#: registration/models.py:236 msgid "parental authorization" msgstr "autorisation parentale" -#: registration/models.py:247 +#: registration/models.py:243 msgid "health sheet" msgstr "fiche sanitaire" -#: registration/models.py:254 +#: registration/models.py:250 msgid "vaccine sheet" msgstr "carnet de vaccination" -#: registration/models.py:262 +#: registration/models.py:258 msgid "student" msgstr "étudiant⋅e" -#: registration/models.py:270 +#: registration/models.py:266 msgid "student registration" msgstr "inscription d'élève" -#: registration/models.py:271 +#: registration/models.py:267 msgid "student registrations" msgstr "inscriptions d'élève" -#: registration/models.py:280 registration/models.py:302 +#: registration/models.py:276 registration/models.py:298 msgid "professional activity" msgstr "activité professionnelle" -#: registration/models.py:293 +#: registration/models.py:289 msgid "coach registration" msgstr "inscription d'encadrant⋅e" -#: registration/models.py:294 +#: registration/models.py:290 msgid "coach registrations" msgstr "inscriptions d'encadrant⋅es" -#: registration/models.py:306 +#: registration/models.py:302 msgid "administrator" msgstr "administrateur⋅rice" -#: registration/models.py:307 +#: registration/models.py:303 msgid "" "An administrator has all rights. Please don't give this right to all juries " "and volunteers." @@ -1832,76 +1808,76 @@ msgstr "" "Un⋅e administrateur⋅rice a tous les droits. Merci de ne pas donner ce droit " "à toustes les juré⋅es et bénévoles." -#: registration/models.py:317 +#: registration/models.py:313 msgid "admin" msgstr "admin" -#: registration/models.py:317 +#: registration/models.py:313 msgid "volunteer" msgstr "bénévole" -#: registration/models.py:325 +#: registration/models.py:321 msgid "volunteer registration" msgstr "inscription de bénévole" -#: registration/models.py:326 +#: registration/models.py:322 msgid "volunteer registrations" msgstr "inscriptions de bénévoles" -#: registration/models.py:342 +#: registration/models.py:338 msgid "type" msgstr "type" -#: registration/models.py:345 +#: registration/models.py:341 msgid "No payment" msgstr "Pas de paiement" -#: registration/models.py:347 +#: registration/models.py:343 msgid "Scholarship" msgstr "Notification de bourse" -#: registration/models.py:348 +#: registration/models.py:344 msgid "Bank transfer" msgstr "Virement bancaire" -#: registration/models.py:349 +#: registration/models.py:345 msgid "Other (please indicate)" msgstr "Autre (veuillez spécifier)" -#: registration/models.py:350 +#: registration/models.py:346 msgid "The tournament is free" msgstr "Le tournoi est gratuit" -#: registration/models.py:357 +#: registration/models.py:353 msgid "scholarship file" msgstr "Notification de bourse" -#: registration/models.py:358 +#: registration/models.py:354 msgid "only if you have a scholarship." msgstr "Nécessaire seulement si vous déclarez être boursier." -#: registration/models.py:365 +#: registration/models.py:361 msgid "additional information" msgstr "informations additionnelles" -#: registration/models.py:366 +#: registration/models.py:362 msgid "To help us to find your payment." msgstr "Pour nous aider à retrouver votre paiement, si nécessaire." -#: registration/models.py:372 +#: registration/models.py:368 msgid "payment valid" msgstr "paiement valide" -#: registration/models.py:381 +#: registration/models.py:377 #, python-brace-format msgid "Payment of {registration}" msgstr "Paiement de {registration}" -#: registration/models.py:384 +#: registration/models.py:380 msgid "payment" msgstr "paiement" -#: registration/models.py:385 +#: registration/models.py:381 msgid "payments" msgstr "paiements" @@ -2342,11 +2318,11 @@ msgstr "Autorisation parentale de {student}.{ext}" msgid "Scholarship attestation of {user}.{ext}" msgstr "Notification de bourse de {user}.{ext}" -#: tfjm/settings.py:170 +#: tfjm/settings.py:167 msgid "English" msgstr "Anglais" -#: tfjm/settings.py:171 +#: tfjm/settings.py:168 msgid "French" msgstr "Français" diff --git a/participation/templates/participation/chat.html b/participation/templates/participation/chat.html index 3a385f3..bf47704 100644 --- a/participation/templates/participation/chat.html +++ b/participation/templates/participation/chat.html @@ -5,35 +5,9 @@ {% block content %}
{% blocktrans trimmed %} - The chat is located on the dedicated Matrix server: + The chat feature is now out of usage. If you feel that having a chat + feature between participants is important, for example to build a + team, please contact us. {% endblocktrans %}
- -
- - {% trans "Access to the Matrix server" %} - -
- -
-

- {% blocktrans trimmed %} - To connect to the server, you can select "Log in", then use your credentials of this platform to connect - with the central authentication server, then you must trust the connection between the Matrix account and the - platform. Finally, you will be able to access to the chat platform. - {% endblocktrans %} -

- -

- {% blocktrans trimmed %} - You will be invited in some basic rooms. You must confirm the invitations to join channels. - {% endblocktrans %} -

- -

- {% blocktrans trimmed %} - If you have any trouble, don't hesitate to contact us :) - {% endblocktrans %} -

-
{% endblock %} diff --git a/tfjm/templates/base.html b/tfjm/templates/base.html index 81968ad..ec4f0c4 100644 --- a/tfjm/templates/base.html +++ b/tfjm/templates/base.html @@ -100,9 +100,10 @@ {% endif %} {% endif %} -
  • +
  • - {% trans "Chat" %} + {% trans "Chat" %} +
    • {% if user.registration.is_admin %}
  • diff --git a/tfjm/templates/index.html b/tfjm/templates/index.html index c60d69f..9d08806 100644 --- a/tfjm/templates/index.html +++ b/tfjm/templates/index.html @@ -55,18 +55,10 @@

    Je ne trouve pas d'équipe, aidez-moi !

    -

    - En ayant créé un compte sur cette plateforme, vous créez également un compte sur la plateforme de chat dédiée - au 𝕋𝔽𝕁𝕄², basée sur le protocole Matrix et le client - Element. Cette interface de chat vous permet de communiquer avec les membres - de votre équipe, mais surtout de pouvoir participer au tirage au sort et discuter avec les autres équipes et - les organisateur⋅rices. -

    - Ce chat contient également un salon #je-cherche-une-equipe où vous pouvez crier à l'aide pour trouver - une équipe, ou compléter la votre s'il vous manque des participant⋅es. C'est un petit coin auprès du feu, - ne cherchez pas à être trop formel⋅le. + Vous pouvez nous contacter à l'adresse contact@tfjm.org pour que nous + puissions vous aider à vous mettre en relation avec d'autres participant⋅es qui cherchent également une équipe.

    J'ai une question