Better pool view for 5-teams pools

Signed-off-by: Emmy D'Anello <emmy.danello@animath.fr>
This commit is contained in:
Emmy D'Anello 2024-04-18 15:05:10 +02:00
parent 266afaf5c9
commit adc4634f3e
Signed by: ynerant
GPG Key ID: 3A75C55819C8CF85
3 changed files with 95 additions and 95 deletions

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TFJM\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-04-17 22:47+0200\n"
"POT-Creation-Date: 2024-04-18 15:04+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Emmy D'Anello <emmy.danello@animath.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,15 +29,15 @@ msgstr "équipes"
#: draw/admin.py:53 draw/admin.py:71 draw/admin.py:88 draw/models.py:26
#: participation/admin.py:79 participation/admin.py:140
#: participation/admin.py:171 participation/models.py:683
#: participation/models.py:707 participation/models.py:927
#: participation/admin.py:171 participation/models.py:693
#: participation/models.py:717 participation/models.py:937
#: registration/models.py:756
#: registration/templates/registration/payment_form.html:53
msgid "tournament"
msgstr "tournoi"
#: draw/admin.py:92 draw/models.py:234 draw/models.py:448
#: participation/models.py:931
#: participation/models.py:941
msgid "round"
msgstr "tour"
@ -175,7 +175,7 @@ msgstr "La poule en cours, où les équipes choisissent leurs problèmes"
msgid "rounds"
msgstr "tours"
#: draw/models.py:257 participation/models.py:939
#: draw/models.py:257 participation/models.py:949
msgid "letter"
msgstr "lettre"
@ -214,17 +214,17 @@ msgid "Pool {letter}{number}"
msgstr "Poule {letter}{number}"
#: draw/models.py:429 draw/models.py:456 participation/admin.py:136
#: participation/admin.py:155 participation/models.py:1397
#: participation/models.py:1406 participation/tables.py:84
#: participation/admin.py:155 participation/models.py:1429
#: participation/models.py:1438 participation/tables.py:84
msgid "pool"
msgstr "poule"
#: draw/models.py:430 participation/models.py:1398
#: draw/models.py:430 participation/models.py:1430
msgid "pools"
msgstr "poules"
#: draw/models.py:442 participation/models.py:917 participation/models.py:1547
#: participation/models.py:1577 participation/models.py:1619
#: draw/models.py:442 participation/models.py:927 participation/models.py:1579
#: participation/models.py:1609 participation/models.py:1651
msgid "participation"
msgstr "participation"
@ -248,8 +248,8 @@ msgid ""
msgstr ""
"L'ordre de choix dans la poule, entre 0 et la taille de la poule moins 1."
#: draw/models.py:479 draw/models.py:502 participation/models.py:1420
#: participation/models.py:1584
#: draw/models.py:479 draw/models.py:502 participation/models.py:1452
#: participation/models.py:1616
#, python-brace-format
msgid "Problem #{problem}"
msgstr "Problème n°{problem}"
@ -332,7 +332,7 @@ msgid "Continue draw"
msgstr "Continuer le tirage"
#: draw/templates/draw/tournament_content.html:216 participation/admin.py:167
#: participation/models.py:252 participation/models.py:698
#: participation/models.py:252 participation/models.py:708
#: participation/templates/participation/tournament_harmonize.html:15
#: registration/models.py:157 registration/models.py:747
#: registration/tables.py:39
@ -448,26 +448,26 @@ msgstr "Changelog de type \"{action}\" pour le modèle {model} le {timestamp}"
msgid "valid"
msgstr "valide"
#: participation/admin.py:87 participation/models.py:719
#: participation/admin.py:87 participation/models.py:729
msgid "selected for final"
msgstr "sélectionnée pour la finale"
#: participation/admin.py:124 participation/admin.py:183
#: participation/models.py:1427 participation/tables.py:112
#: participation/models.py:1459 participation/tables.py:112
msgid "defender"
msgstr "défenseur⋅se"
#: participation/admin.py:128 participation/models.py:1434
#: participation/models.py:1631
#: participation/admin.py:128 participation/models.py:1466
#: participation/models.py:1663
msgid "opponent"
msgstr "opposant⋅e"
#: participation/admin.py:132 participation/models.py:1441
#: participation/models.py:1632
#: participation/admin.py:132 participation/models.py:1473
#: participation/models.py:1664
msgid "reporter"
msgstr "rapporteur⋅rice"
#: participation/admin.py:187 participation/models.py:1582
#: participation/admin.py:187 participation/models.py:1614
msgid "problem"
msgstr "numéro de problème"
@ -795,36 +795,36 @@ msgstr "finale"
msgid "Google Sheet ID"
msgstr "ID de la feuille Google Sheets"
#: participation/models.py:684 registration/admin.py:125
#: participation/models.py:694 registration/admin.py:125
msgid "tournaments"
msgstr "tournois"
#: participation/models.py:713
#: participation/models.py:723
msgid "valid team"
msgstr "équipe valide"
#: participation/models.py:714
#: participation/models.py:724
msgid "The participation got the validation of the organizers."
msgstr "La participation a été validée par les organisateur⋅rices."
#: participation/models.py:720
#: participation/models.py:730
msgid "The team is selected for the final tournament."
msgstr "L'équipe est sélectionnée pour la finale."
#: participation/models.py:724
#: participation/models.py:734
msgid "mention"
msgstr "mention"
#: participation/models.py:731
#: participation/models.py:741
msgid "mention (final)"
msgstr "Mention (pour la finale) :"
#: participation/models.py:741
#: participation/models.py:751
#, python-brace-format
msgid "Participation of the team {name} ({trigram})"
msgstr "Participation de l'équipe {name} ({trigram})"
#: participation/models.py:748
#: participation/models.py:758
#, python-brace-format
msgid ""
"<p>The team {trigram} has {nb_missing_payments} missing payments. Each "
@ -837,11 +837,11 @@ msgstr ""
"notification de bourse) pour participer au tournoi.</p><p>Les participant⋅es "
"qui n'ont pas encore payé sont : {participants}.</p>"
#: participation/models.py:756
#: participation/models.py:766
msgid "Missing payments"
msgstr "Paiements manquants"
#: participation/models.py:773
#: participation/models.py:783
msgid ""
"<p>The solutions for the tournament of {tournament} are due on the {date:%Y-"
"%m-%d %H:%M}.</p><p>You have currently sent <strong>{nb_solutions}</strong> "
@ -856,11 +856,11 @@ msgstr ""
"pouvez envoyer vos solutions sur <a href='{url}'>votre page de "
"participation</a>.</p>"
#: participation/models.py:783 participation/models.py:797
#: participation/models.py:793 participation/models.py:807
msgid "Solutions due"
msgstr "Rendu des solutions"
#: participation/models.py:789
#: participation/models.py:799
msgid ""
"<p>The solutions for the tournament of {tournament} are due on the {date:%Y-"
"%m-%d %H:%M}.</p><p>Remember that you can only fix minor changes to your "
@ -873,7 +873,7 @@ msgstr ""
"parties.</p><p>Vous pouvez envoyer vos solutions sur <a href='{url}'>votre "
"page de participation</a>.</p>"
#: participation/models.py:803 registration/models.py:600
#: participation/models.py:813 registration/models.py:600
msgid ""
"<p>The draw of the solutions for the tournament {tournament} is planned on "
"the {date:%Y-%m-%d %H:%M}. You can join it on <a href='{url}'>this link</a>."
@ -883,11 +883,11 @@ msgstr ""
"{date:%d/%m/%Y %H:%M}. Vous pouvez y participer sur <a href='{url}'>ce lien</"
"a>.</p>"
#: participation/models.py:809 registration/models.py:607
#: participation/models.py:819 registration/models.py:607
msgid "Draw of solutions"
msgstr "Tirage au sort des solutions"
#: participation/models.py:820
#: participation/models.py:830
#, python-brace-format
msgid ""
"<p>The solutions draw is ended. You can check the result on <a "
@ -899,7 +899,7 @@ msgstr ""
"tour, vous défendrez <a href='{solution_url}'>votre solution du problème "
"{problem}</a>.</p>"
#: participation/models.py:829 participation/models.py:872
#: participation/models.py:839 participation/models.py:882
#, python-brace-format
msgid ""
"<p>You will oppose the solution of the team {opponent} on the <a "
@ -910,7 +910,7 @@ msgstr ""
"href='{solution_url}'>problème {problem}</a>. Vous pouvez envoyer votre note "
"de synthèse sur <a href='{passage_url}'>cette page</a>.</p>"
#: participation/models.py:838 participation/models.py:881
#: participation/models.py:848 participation/models.py:891
#, python-brace-format
msgid ""
"<p>You will report the solution of the team {reporter} on the <a "
@ -921,11 +921,11 @@ msgstr ""
"href='{solution_url}'>problème {problem}</a>. Vous pouvez envoyer votre note "
"de synthèse sur <a href='{passage_url}'>cette page</a>.</p>"
#: participation/models.py:854 registration/models.py:622
#: participation/models.py:864 registration/models.py:622
msgid "First round"
msgstr "Premier tour"
#: participation/models.py:865
#: participation/models.py:875
#, python-brace-format
msgid ""
"<p>For the second round, you will defend <a href='{solution_url}'>your "
@ -934,11 +934,11 @@ msgstr ""
"<p>Pour le second tour, vous défendrez <a href='{solution_url}'>votre "
"solution du problème {problem}</a>.</p>"
#: participation/models.py:897 registration/models.py:633
#: participation/models.py:907 registration/models.py:633
msgid "Second round"
msgstr "Second tour"
#: participation/models.py:903
#: participation/models.py:913
#, python-brace-format
msgid ""
"<p>The tournament {tournament} is ended. You can check the results on the <a "
@ -947,56 +947,56 @@ msgstr ""
"<p>Le tournoi {tournament} est terminé. Vous pouvez consulter les résultats "
"sur la <a href='{url}'>page du tournoi</a>.</p>"
#: participation/models.py:908
#: participation/models.py:918
msgid "Tournament ended"
msgstr "Tournoi terminé"
#: participation/models.py:918 participation/models.py:961
#: participation/models.py:928 participation/models.py:971
msgid "participations"
msgstr "participations"
#: participation/models.py:933 participation/models.py:934
#: participation/models.py:943 participation/models.py:944
#, python-brace-format
msgid "Round {round}"
msgstr "Tour {round}"
#: participation/models.py:949
#: participation/models.py:959
msgid "room"
msgstr "salle"
#: participation/models.py:951
#: participation/models.py:961
msgid "Room 1"
msgstr "Salle 1"
#: participation/models.py:952
#: participation/models.py:962
msgid "Room 2"
msgstr "Salle 2"
#: participation/models.py:955
#: participation/models.py:965
msgid "For 5-teams pools only"
msgstr "Pour les poules de 5 équipe uniquement"
#: participation/models.py:967
#: participation/models.py:977
msgid "juries"
msgstr "jurys"
#: participation/models.py:976
#: participation/models.py:986
msgid "president of the jury"
msgstr "président⋅e du jury"
#: participation/models.py:983
#: participation/models.py:993
msgid "BigBlueButton URL"
msgstr "Lien BigBlueButton"
#: participation/models.py:984
#: participation/models.py:994
msgid "The link of the BBB visio for this pool."
msgstr "Le lien du salon BBB pour cette poule."
#: participation/models.py:989
#: participation/models.py:999
msgid "results available"
msgstr "résultats disponibles"
#: participation/models.py:990
#: participation/models.py:1000
msgid ""
"Check this case when results become accessible to teams. They stay "
"accessible to you. Only averages are given."
@ -1005,33 +1005,33 @@ msgstr ""
"Ils restent toujours accessibles pour vous. Seules les moyennes sont "
"communiquées."
#: participation/models.py:1018
#: participation/models.py:1028
msgid "The president of the jury must be part of the jury."
msgstr "Læ président⋅e du jury doit faire partie du jury."
#: participation/models.py:1378
#: participation/models.py:1410
#, python-brace-format
msgid "The jury {jury} is not part of the jury for this pool."
msgstr "{jury} ne fait pas partie du jury pour cette poule."
#: participation/models.py:1391
#: participation/models.py:1423
#, 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}"
msgid "Pool {code} for tournament {tournament} with teams {teams}"
msgstr "Poule {code} du tournoi {tournament} avec les équipes {teams}"
#: participation/models.py:1411
#: participation/models.py:1443
msgid "position"
msgstr "position"
#: participation/models.py:1418
#: participation/models.py:1450
msgid "defended solution"
msgstr "solution défendue"
#: participation/models.py:1446
#: participation/models.py:1478
msgid "penalties"
msgstr "pénalités"
#: participation/models.py:1448
#: participation/models.py:1480
msgid ""
"Number of penalties for the defender. The defender will loose a 0.5 "
"coefficient per penalty."
@ -1039,120 +1039,120 @@ msgstr ""
"Nombre de pénalités pour l'équipe défenseuse. Elle perd un coefficient 0.5 "
"sur sa présentation orale par pénalité."
#: participation/models.py:1517 participation/models.py:1520
#: participation/models.py:1523
#: participation/models.py:1549 participation/models.py:1552
#: participation/models.py:1555
#, 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:1528
#: participation/models.py:1560
#, python-brace-format
msgid "Passage of {defender} for problem {problem}"
msgstr "Passage de {defender} pour le problème {problem}"
#: participation/models.py:1532 participation/models.py:1541
#: participation/models.py:1626 participation/models.py:1668
#: participation/models.py:1564 participation/models.py:1573
#: participation/models.py:1658 participation/models.py:1700
msgid "passage"
msgstr "passage"
#: participation/models.py:1533
#: participation/models.py:1565
msgid "passages"
msgstr "passages"
#: participation/models.py:1552
#: participation/models.py:1584
msgid "difference"
msgstr "différence"
#: participation/models.py:1553
#: participation/models.py:1585
msgid "Score to add/remove on the final score"
msgstr "Score à ajouter/retrancher au score final"
#: participation/models.py:1560
#: participation/models.py:1592
msgid "tweak"
msgstr "harmonisation"
#: participation/models.py:1561
#: participation/models.py:1593
msgid "tweaks"
msgstr "harmonisations"
#: participation/models.py:1589
#: participation/models.py:1621
msgid "solution for the final tournament"
msgstr "solution pour la finale"
#: participation/models.py:1594 participation/models.py:1637
#: participation/models.py:1626 participation/models.py:1669
msgid "file"
msgstr "fichier"
#: participation/models.py:1604
#: participation/models.py:1636
#, 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:1606
#: participation/models.py:1638
msgid "for final"
msgstr "pour la finale"
#: participation/models.py:1609
#: participation/models.py:1641
msgid "solution"
msgstr "solution"
#: participation/models.py:1610
#: participation/models.py:1642
msgid "solutions"
msgstr "solutions"
#: participation/models.py:1643
#: participation/models.py:1675
#, 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:1651
#: participation/models.py:1683
msgid "synthesis"
msgstr "note de synthèse"
#: participation/models.py:1652
#: participation/models.py:1684
msgid "syntheses"
msgstr "notes de synthèse"
#: participation/models.py:1661
#: participation/models.py:1693
msgid "jury"
msgstr "jury"
#: participation/models.py:1673
#: participation/models.py:1705
msgid "defender writing note"
msgstr "note d'écrit défenseur⋅se"
#: participation/models.py:1679
#: participation/models.py:1711
msgid "defender oral note"
msgstr "note d'oral défenseur⋅se"
#: participation/models.py:1685
#: participation/models.py:1717
msgid "opponent writing note"
msgstr "note d'écrit opposant⋅e"
#: participation/models.py:1691
#: participation/models.py:1723
msgid "opponent oral note"
msgstr "note d'oral opposant⋅e"
#: participation/models.py:1697
#: participation/models.py:1729
msgid "reporter writing note"
msgstr "note d'écrit rapporteur⋅rice"
#: participation/models.py:1703
#: participation/models.py:1735
msgid "reporter oral note"
msgstr "note d'oral du rapporteur⋅rice"
#: participation/models.py:1761
#: participation/models.py:1793
#, python-brace-format
msgid "Notes of {jury} for {passage}"
msgstr "Notes de {jury} pour le {passage}"
#: participation/models.py:1764
#: participation/models.py:1796
msgid "note"
msgstr "note"
#: participation/models.py:1765
#: participation/models.py:1797
msgid "notes"
msgstr "notes"

View File

@ -1420,8 +1420,8 @@ class Pool(models.Model):
note.save()
def __str__(self):
return _("Pool of day {round} for tournament {tournament} with teams {teams}")\
.format(round=self.round,
return _("Pool {code} for tournament {tournament} with teams {teams}")\
.format(code=self.short_name,
tournament=str(self.tournament),
teams=", ".join(participation.team.trigram for participation in self.participations.all()))

View File

@ -632,7 +632,7 @@ class TournamentDetailView(MultiTableMixin, DetailView):
def get_tables(self):
return [
ParticipationTable(self.object.participations.all()),
PoolTable(self.object.pools.order_by('id').all()),
PoolTable(self.object.pools.all()),
]