From 4b14d3562f7565b1c3d7c8865c3c914081c928d3 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 31 Oct 2020 14:15:49 +0100 Subject: [PATCH] Add a message to add questions --- .../participation/participation_detail.html | 18 +++++-- locale/fr/LC_MESSAGES/django.po | 50 +++++++++++++------ 2 files changed, 48 insertions(+), 20 deletions(-) diff --git a/apps/participation/templates/participation/participation_detail.html b/apps/participation/templates/participation/participation_detail.html index a584bbe..5621f9e 100644 --- a/apps/participation/templates/participation/participation_detail.html +++ b/apps/participation/templates/participation/participation_detail.html @@ -35,7 +35,7 @@ - {% if user.registration.is_admin or current_phase >= 2 %} + {% if user.registration.is_admin or current_phase.phase_number >= 2 %}
@@ -95,7 +95,7 @@ {% endif %} -
{% trans "Proposed solution:" %}
+
{% trans "Proposed solution:" %}
{{ participation.received_participation.solution.link|default:novideo }} {% if participation.received_participation.solution.link %} @@ -104,10 +104,18 @@
- {# TODO Display solution #} - {% if current_phase.phase_number == 2 %} - {# TODO Send questions #} +
+ {% blocktrans trimmed %} + You received a solution about the same problem that you treated from another team. + You are now encouraged to see the video, then to ask from 3 to 6 questions about the video. + After that, you will be invited to exchange with the other team about the solution. + {% endblocktrans %} +
+ + {% if user.registration.participates %} + + {% endif %} {% elif current_phase.phase_number == 3 %}
{% blocktrans trimmed with user_id=user.pk %} diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index c6f385c..ec71e34 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Corres2math\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-31 13:32+0100\n" +"POT-Creation-Date: 2020-10-31 14:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Yohann D'ANELLO \n" "Language-Team: LANGUAGE \n" @@ -123,15 +123,15 @@ msgstr "Vous ne pouvez pas envoyer de vidéo après la date limite." msgid "Send to team" msgstr "Envoyer à l'équipe" -#: apps/participation/forms.py:162 +#: apps/participation/forms.py:163 msgid "Start date must be before the end date." msgstr "La date de début doit être avant la date de fin." -#: apps/participation/forms.py:164 +#: apps/participation/forms.py:165 msgid "This phase must start after the previous phases." msgstr "Cette phase doit commencer après les phases précédentes." -#: apps/participation/forms.py:166 +#: apps/participation/forms.py:167 msgid "This phase must end after the next phases." msgstr "Cette phase doit finir avant les phases suivantes." @@ -312,11 +312,12 @@ msgid "No video sent" msgstr "Pas de vidéo envoyée" #: apps/participation/templates/participation/participation_detail.html:23 +#: apps/participation/templates/participation/participation_detail.html:98 msgid "Proposed solution:" msgstr "Solution proposée :" #: apps/participation/templates/participation/participation_detail.html:27 -#: apps/participation/templates/participation/participation_detail.html:136 +#: apps/participation/templates/participation/participation_detail.html:150 #: apps/participation/templates/participation/upload_video.html:11 #: apps/registration/templates/registration/upload_photo_authorization.html:18 #: apps/registration/templates/registration/user_detail.html:78 @@ -324,12 +325,13 @@ msgid "Upload" msgstr "Téléverser" #: apps/participation/templates/participation/participation_detail.html:30 +#: apps/participation/templates/participation/participation_detail.html:102 msgid "Display" msgstr "Afficher" #: apps/participation/templates/participation/participation_detail.html:45 msgid "Sent solution" -msgstr "Solution envoyée :" +msgstr "Solution envoyée" #: apps/participation/templates/participation/participation_detail.html:49 msgid "Team that received your solution:" @@ -371,13 +373,29 @@ msgstr "" #: apps/participation/templates/participation/participation_detail.html:86 msgid "Received solution" -msgstr "Solution reçue :" +msgstr "Solution reçue" #: apps/participation/templates/participation/participation_detail.html:90 msgid "Team that sent you their solution:" msgstr "Équipe qui vous a envoyé leur solution :" -#: apps/participation/templates/participation/participation_detail.html:105 +#: apps/participation/templates/participation/participation_detail.html:109 +msgid "" +"You received a solution about the same problem that you treated from another " +"team. You are now encouraged to see the video, then to ask from 3 to 6 " +"questions about the video. After that, you will be invited to exchange with " +"the other team about the solution." +msgstr "" +"Vous a reçu une vidéo à propos du même problème que vous avez traité de la " +"part d'une autre équipe. Vous êtes désormais encouragés à visionner la " +"vidéo, puis à poser 3 à 6 questions à propos de la vidéo. Après cela, vous " +"serez invités à échanger avec l'autre équipe à propos de la solution." + +#: apps/participation/templates/participation/participation_detail.html:116 +msgid "Add a question" +msgstr "Ajouter une question" + +#: apps/participation/templates/participation/participation_detail.html:119 #, python-format msgid "" "You sent your questions to the other team about their solution. When they " @@ -396,12 +414,12 @@ msgstr "" "client Element dédié : element.correpondances-maths.fr" -#: apps/participation/templates/participation/participation_detail.html:124 +#: apps/participation/templates/participation/participation_detail.html:138 msgid "Define received video" msgstr "Définir la vidéo reçue" -#: apps/participation/templates/participation/participation_detail.html:125 -#: apps/participation/templates/participation/participation_detail.html:130 +#: apps/participation/templates/participation/participation_detail.html:139 +#: apps/participation/templates/participation/participation_detail.html:144 #: apps/participation/templates/participation/phase_form.html:11 #: apps/participation/templates/participation/phase_list.html:18 #: apps/participation/templates/participation/receive_participation_form.html:11 @@ -415,19 +433,21 @@ msgstr "Définir la vidéo reçue" msgid "Update" msgstr "Modifier" -#: apps/participation/templates/participation/participation_detail.html:129 +#: apps/participation/templates/participation/participation_detail.html:143 msgid "Define team that receives your video" msgstr "Définir l'équipe qui recevra votre vidéo" -#: apps/participation/templates/participation/participation_detail.html:135 +#: apps/participation/templates/participation/participation_detail.html:149 msgid "Upload video" msgstr "Envoyer la vidéo" -#: apps/participation/templates/participation/participation_detail.html:139 +#: apps/participation/templates/participation/participation_detail.html:153 +#: apps/participation/templates/participation/participation_detail.html:160 msgid "Display solution" msgstr "Afficher la solution" -#: apps/participation/templates/participation/participation_detail.html:140 +#: apps/participation/templates/participation/participation_detail.html:154 +#: apps/participation/templates/participation/participation_detail.html:161 msgid "This video platform is not supported yet." msgstr "La plateforme de cette vidéo n'est pas encore supportée."