From bbd8ad43cdc96f53d0e44e2fab5a919ed979b8b1 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 10 Apr 2021 10:02:49 +0200 Subject: [PATCH] Clarify syntheses name --- apps/participation/forms.py | 2 +- apps/participation/models.py | 7 ++++++- locale/fr/LC_MESSAGES/django.po | 34 +++++++++++++++++---------------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/apps/participation/forms.py b/apps/participation/forms.py index 19c7023..cf6ac6f 100644 --- a/apps/participation/forms.py +++ b/apps/participation/forms.py @@ -169,7 +169,7 @@ class SolutionForm(forms.ModelForm): class PoolForm(forms.ModelForm): class Meta: model = Pool - fields = ('tournament', 'round', 'bbb_url', 'juries',) + fields = ('tournament', 'round', 'bbb_url', 'results_available', 'juries',) widgets = { "juries": forms.CheckboxSelectMultiple, } diff --git a/apps/participation/models.py b/apps/participation/models.py index c546986..0411a92 100644 --- a/apps/participation/models.py +++ b/apps/participation/models.py @@ -598,7 +598,12 @@ class Synthesis(models.Model): ) def __str__(self): - return _("Synthesis for the {type} of the {passage}").format(type=self.get_type_display(), passage=self.passage) + return _("Synthesis of {team} as {type} for problem {problem} of {defender}").format( + team=self.participation.team.trigram, + type=self.get_type_display(), + problem=self.passage.solution_number, + defender=self.passage.defender.team.trigram, + ) class Meta: verbose_name = _("synthesis") diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 9f789ae..0aece0d 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-10 09:57+0200\n" +"POT-Creation-Date: 2021-04-10 10:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Yohann D'ANELLO \n" "Language-Team: LANGUAGE \n" @@ -391,7 +391,7 @@ msgid "Passage of {defender} for problem {problem}" msgstr "Passage de {defender} pour le problème {problem}" #: apps/participation/models.py:520 apps/participation/models.py:582 -#: apps/participation/models.py:620 +#: apps/participation/models.py:625 msgid "passage" msgstr "passage" @@ -426,55 +426,57 @@ msgstr "solutions" #: apps/participation/models.py:601 #, python-brace-format -msgid "Synthesis for the {type} of the {passage}" -msgstr "Synthèse de {type} du {passage}" +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}" -#: apps/participation/models.py:604 +#: apps/participation/models.py:609 msgid "synthesis" msgstr "note de synthèse" -#: apps/participation/models.py:605 +#: apps/participation/models.py:610 msgid "syntheses" msgstr "notes de synthèse" -#: apps/participation/models.py:613 +#: apps/participation/models.py:618 msgid "jury" msgstr "jury" -#: apps/participation/models.py:625 +#: apps/participation/models.py:630 msgid "defender writing note" msgstr "note d'écrit du défenseur" -#: apps/participation/models.py:631 +#: apps/participation/models.py:636 msgid "defender oral note" msgstr "note d'oral du défenseur" -#: apps/participation/models.py:637 +#: apps/participation/models.py:642 msgid "opponent writing note" msgstr "note d'écrit de l'opposant" -#: apps/participation/models.py:643 +#: apps/participation/models.py:648 msgid "opponent oral note" msgstr "note d'oral de l'opposant" -#: apps/participation/models.py:649 +#: apps/participation/models.py:654 msgid "reporter writing note" msgstr "not d'écrit du rapporteur" -#: apps/participation/models.py:655 +#: apps/participation/models.py:660 msgid "reporter oral note" msgstr "note d'oral du rapporteur" -#: apps/participation/models.py:664 +#: apps/participation/models.py:669 #, python-brace-format msgid "Notes of {jury} for {passage}" msgstr "Notes de {jury} pour le {passage}" -#: apps/participation/models.py:671 +#: apps/participation/models.py:676 msgid "note" msgstr "note" -#: apps/participation/models.py:672 +#: apps/participation/models.py:677 msgid "notes" msgstr "notes"