From 384fbfd0b2dc6451b4cd1ca355fdf836528d4091 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 11 May 2021 17:03:25 +0200 Subject: [PATCH] Better participation detail page --- .../participation/participation_detail.html | 25 +- locale/fr/LC_MESSAGES/django.po | 248 ++++-------------- 2 files changed, 62 insertions(+), 211 deletions(-) diff --git a/apps/participation/templates/participation/participation_detail.html b/apps/participation/templates/participation/participation_detail.html index 0b824b5..792cdce 100644 --- a/apps/participation/templates/participation/participation_detail.html +++ b/apps/participation/templates/participation/participation_detail.html @@ -24,24 +24,33 @@
{% trans "Solutions:" %}
- {% for solution in participation.solutions.all %} - {{ solution }}{% if not forloop.last %}, {% endif %} - {% empty %} - {% trans "No solution was uploaded yet." %} - {% endfor %} +
{% if participation.pools.all %}
{% trans "Pools:" %}
- {% for pool in participation.pools.all %} - {{ pool }}{% if not forloop.last %}, {% endif %} - {% endfor %} +
{% endif %}
+ {% if participation.final %} +
+ {% trans "If you upload a solution, this will replace the version for the final tournament." %} +
+ {% endif %}
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index bc1355f..b126cea 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: 2021-04-29 15:45+0200\n" +"POT-Creation-Date: 2021-05-11 17:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Yohann D'ANELLO \n" "Language-Team: LANGUAGE \n" @@ -602,20 +602,27 @@ msgstr "Tournoi :" msgid "Solutions:" msgstr "Solutions :" -#: apps/participation/templates/participation/participation_detail.html:30 +#: apps/participation/templates/participation/participation_detail.html:31 msgid "No solution was uploaded yet." msgstr "Aucune solution n'a encore été envoyée." -#: apps/participation/templates/participation/participation_detail.html:35 +#: apps/participation/templates/participation/participation_detail.html:37 msgid "Pools:" msgstr "Poules :" -#: apps/participation/templates/participation/participation_detail.html:45 -#: apps/participation/templates/participation/participation_detail.html:49 +#: apps/participation/templates/participation/participation_detail.html:51 +msgid "" +"If you upload a solution, this will replace the version for the final " +"tournament." +msgstr "" +"Si vous envoyez une solution, elle va remplacer la version pour la finale." + +#: apps/participation/templates/participation/participation_detail.html:54 +#: apps/participation/templates/participation/participation_detail.html:58 msgid "Upload solution" msgstr "Envoyer une solution" -#: apps/participation/templates/participation/participation_detail.html:50 +#: apps/participation/templates/participation/participation_detail.html:59 #: apps/participation/templates/participation/passage_detail.html:117 #: apps/participation/templates/participation/team_detail.html:172 #: apps/participation/templates/participation/upload_motivation_letter.html:13 @@ -894,7 +901,7 @@ msgid "Invalidate" msgstr "Invalider" #: apps/participation/templates/participation/team_detail.html:171 -#: apps/participation/views.py:323 +#: apps/participation/views.py:327 msgid "Upload motivation letter" msgstr "Envoyer la lettre de motivation" @@ -903,7 +910,7 @@ msgid "Update team" msgstr "Modifier l'équipe" #: apps/participation/templates/participation/team_detail.html:181 -#: apps/participation/views.py:423 +#: apps/participation/views.py:429 msgid "Leave team" msgstr "Quitter l'équipe" @@ -1029,31 +1036,31 @@ msgstr "Vous êtes déjà dans une équipe." msgid "Join team" msgstr "Rejoindre une équipe" -#: apps/participation/views.py:150 apps/participation/views.py:429 -#: apps/participation/views.py:462 +#: apps/participation/views.py:150 apps/participation/views.py:435 +#: apps/participation/views.py:468 msgid "You are not in a team." msgstr "Vous n'êtes pas dans une équipe." -#: apps/participation/views.py:151 apps/participation/views.py:463 +#: apps/participation/views.py:151 apps/participation/views.py:469 msgid "You don't participate, so you don't have any team." msgstr "Vous ne participez pas, vous n'avez donc pas d'équipe." -#: apps/participation/views.py:175 +#: apps/participation/views.py:177 #, python-brace-format msgid "Detail of team {trigram}" msgstr "Détails de l'équipe {trigram}" -#: apps/participation/views.py:211 +#: apps/participation/views.py:213 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." -#: apps/participation/views.py:214 +#: apps/participation/views.py:216 msgid "The validation of the team is already done or pending." msgstr "La validation de l'équipe est déjà faite ou en cours." -#: apps/participation/views.py:217 +#: apps/participation/views.py:219 msgid "" "The team can't be validated: missing email address confirmations, " "authorizations, people, motivation letter or the tournament is not set." @@ -1062,66 +1069,66 @@ msgstr "" "d'adresse e-mail, soit une autorisation, soit des personnes, soit la lettre " "de motivation, soit le tournoi n'a pas été choisi." -#: apps/participation/views.py:239 +#: apps/participation/views.py:241 msgid "You are not an organizer of the tournament." msgstr "Vous n'êtes pas un organisateur du tournoi." -#: apps/participation/views.py:242 +#: apps/participation/views.py:244 msgid "This team has no pending validation." msgstr "L'équipe n'a pas de validation en attente." -#: apps/participation/views.py:272 +#: apps/participation/views.py:274 msgid "You must specify if you validate the registration or not." msgstr "Vous devez spécifier si vous validez l'inscription ou non." -#: apps/participation/views.py:303 +#: apps/participation/views.py:307 #, python-brace-format msgid "Update team {trigram}" msgstr "Mise à jour de l'équipe {trigram}" -#: apps/participation/views.py:361 apps/participation/views.py:409 +#: apps/participation/views.py:365 apps/participation/views.py:415 #, python-brace-format msgid "Motivation letter of {team}.{ext}" msgstr "Lettre de motivation de {team}.{ext}" -#: apps/participation/views.py:390 +#: apps/participation/views.py:396 #, python-brace-format msgid "Photo authorization of {participant}.{ext}" msgstr "Autorisation de droit à l'image de {participant}.{ext}" -#: apps/participation/views.py:396 +#: apps/participation/views.py:402 #, python-brace-format msgid "Parental authorization of {participant}.{ext}" msgstr "Autorisation parentale de {participant}.{ext}" -#: apps/participation/views.py:403 +#: apps/participation/views.py:409 #, python-brace-format msgid "Health sheet of {participant}.{ext}" msgstr "Fiche sanitaire de {participant}.{ext}" -#: apps/participation/views.py:413 +#: apps/participation/views.py:419 #, python-brace-format msgid "Photo authorizations of team {trigram}.zip" msgstr "Autorisations de droit à l'image de l'équipe {trigram}.zip" -#: apps/participation/views.py:431 +#: apps/participation/views.py:437 msgid "The team is already validated or the validation is pending." msgstr "La validation de l'équipe est déjà faite ou en cours." -#: apps/participation/views.py:477 +#: apps/participation/views.py:483 msgid "The team is not validated yet." msgstr "L'équipe n'est pas encore validée." -#: apps/participation/views.py:489 +#: apps/participation/views.py:497 #, python-brace-format msgid "Participation of team {trigram}" msgstr "Participation de l'équipe {trigram}" -#: apps/participation/views.py:580 +#: apps/participation/views.py:589 msgid "You can't upload a solution after the deadline." msgstr "Vous ne pouvez pas envoyer de solution après la date limite." -#: apps/participation/views.py:766 +#: apps/participation/views.py:775 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." @@ -1704,18 +1711,18 @@ msgid "Impersonate" msgstr "Impersonifier" #: apps/registration/templates/registration/user_detail.html:162 -#: apps/registration/views.py:313 +#: apps/registration/views.py:315 msgid "Upload photo authorization" msgstr "Téléverser l'autorisation de droit à l'image" #: apps/registration/templates/registration/user_detail.html:167 -#: apps/registration/views.py:334 +#: apps/registration/views.py:336 msgid "Upload health sheet" msgstr "Téléverser la fiche sanitaire" #: apps/registration/templates/registration/user_detail.html:172 #: apps/registration/templates/registration/user_detail.html:177 -#: apps/registration/views.py:355 +#: apps/registration/views.py:357 msgid "Upload parental authorization" msgstr "Téléverser l'autorisation parentale" @@ -1743,32 +1750,32 @@ msgstr "Mail de confirmation de l'adresse mail envoyé" msgid "Resend email validation link" msgstr "Renvoyé le lien de validation de l'adresse mail" -#: apps/registration/views.py:253 +#: apps/registration/views.py:255 #, python-brace-format msgid "Detail of user {user}" msgstr "Détails de l'utilisateur {user}" -#: apps/registration/views.py:277 +#: apps/registration/views.py:279 #, python-brace-format msgid "Update user {user}" msgstr "Mise à jour de l'utilisateur {user}" -#: apps/registration/views.py:461 +#: apps/registration/views.py:463 #, python-brace-format msgid "Photo authorization of {student}.{ext}" msgstr "Autorisation de droit à l'image de {student}.{ext}" -#: apps/registration/views.py:484 +#: apps/registration/views.py:486 #, python-brace-format msgid "Health sheet of {student}.{ext}" msgstr "Fiche sanitaire de {student}.{ext}" -#: apps/registration/views.py:507 +#: apps/registration/views.py:509 #, python-brace-format msgid "Parental authorization of {student}.{ext}" msgstr "Autorisation parentale de {student}.{ext}" -#: apps/registration/views.py:529 +#: apps/registration/views.py:531 #, python-brace-format msgid "Scholarship attestation of {user}.{ext}" msgstr "Notification de bourse de {user}.{ext}" @@ -1937,168 +1944,3 @@ msgstr "Résultats" #: tfjm/templates/search/search.html:25 msgid "No results found." msgstr "Aucun résultat." - -#, fuzzy -#~| msgid "This name is already used." -#~ msgid "This field is required." -#~ msgstr "Ce nom est déjà utilisé." - -#, fuzzy -#~| msgid "passages" -#~ msgid "Messages" -#~ msgstr "passages" - -#, fuzzy -#~| msgid "responsible email address" -#~ msgid "Enter a valid email address." -#~ msgstr "adresse e-mail du responsable légal" - -#, fuzzy -#~| msgid "phone number" -#~ msgid "Enter a number." -#~ msgstr "numéro de téléphone" - -#, fuzzy -#~| msgid "end" -#~ msgid "and" -#~ msgstr "fin" - -#, fuzzy -#~| msgid "phone number" -#~ msgid "Decimal number" -#~ msgstr "numéro de téléphone" - -#, fuzzy -#~| msgid "action" -#~ msgid "Duration" -#~ msgstr "action" - -#, fuzzy -#~| msgid "address" -#~ msgid "Email address" -#~ msgstr "adresse" - -#, fuzzy -#~| msgid "phone number" -#~ msgid "Floating point number" -#~ msgstr "numéro de téléphone" - -#, fuzzy -#~| msgid "IP Address" -#~ msgid "IPv4 address" -#~ msgstr "Adresse IP" - -#, fuzzy -#~| msgid "IP Address" -#~ msgid "IP address" -#~ msgstr "Adresse IP" - -#, fuzzy -#~| msgid "phone number" -#~ msgid "Enter a whole number." -#~ msgstr "numéro de téléphone" - -#, fuzzy -#~| msgid "Not validated" -#~ msgid "Enter a valid date." -#~ msgstr "Non validée" - -#, fuzzy -#~| msgid "Email validation" -#~ msgid "Enter a valid duration." -#~ msgstr "Validation de l'adresse mail" - -#, fuzzy -#~| msgid "delete" -#~ msgid "Delete" -#~ msgstr "supprimer" - -#, fuzzy -#~| msgid "changelog" -#~ msgid "Change" -#~ msgstr "changelog" - -#, fuzzy -#~| msgid "yes,no,pending" -#~ msgid "yes,no,maybe" -#~ msgstr "oui,non,en attente" - -#, fuzzy -#~| msgid "end" -#~ msgid "Wed" -#~ msgstr "fin" - -#, fuzzy -#~| msgid "Search" -#~ msgid "March" -#~ msgstr "Chercher" - -#, fuzzy -#~| msgid "any" -#~ msgid "May" -#~ msgstr "aucun·e" - -#, fuzzy -#~| msgid "phone number" -#~ msgid "November" -#~ msgstr "numéro de téléphone" - -#, fuzzy -#~| msgid "any" -#~ msgid "jan" -#~ msgstr "aucun·e" - -#, fuzzy -#~| msgid "any" -#~ msgid "may" -#~ msgstr "aucun·e" - -#, fuzzy -#~| msgid "Search" -#~ msgctxt "abbrev. month" -#~ msgid "March" -#~ msgstr "Chercher" - -#, fuzzy -#~| msgid "any" -#~ msgctxt "abbrev. month" -#~ msgid "May" -#~ msgstr "aucun·e" - -#, fuzzy -#~| msgid "Search" -#~ msgctxt "alt. month" -#~ msgid "March" -#~ msgstr "Chercher" - -#, fuzzy -#~| msgid "any" -#~ msgctxt "alt. month" -#~ msgid "May" -#~ msgstr "aucun·e" - -#, fuzzy -#~| msgid "phone number" -#~ msgctxt "alt. month" -#~ msgid "November" -#~ msgstr "numéro de téléphone" - -#, fuzzy -#~| msgid "The team is not validated yet." -#~ msgid "This is not a valid IPv6 address." -#~ msgstr "L'équipe n'est pas encore validée." - -#, fuzzy -#~| msgid "Search" -#~ msgid "Search In" -#~ msgstr "Chercher" - -#, fuzzy -#~| msgid "Search results" -#~ msgid "Search Queries" -#~ msgstr "Résultats de la recherche" - -#, fuzzy -#~| msgid "Contact us" -#~ msgid "Contents" -#~ msgstr "Nous contacter"