mirror of
https://gitlab.com/animath/si/plateforme-corres2math.git
synced 2024-12-05 02:06:52 +00:00
Add a message to add questions
This commit is contained in:
Yohann D'ANELLO
parent
0ea51f47b3
commit
4b14d3562f
@ -35,7 +35,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if user.registration.is_admin or current_phase >= 2 %}
|
||||
{% if user.registration.is_admin or current_phase.phase_number >= 2 %}
|
||||
<hr>
|
||||
|
||||
<div class="row">
|
||||
@ -95,7 +95,7 @@
|
||||
</dd>
|
||||
{% endif %}
|
||||
|
||||
<dt class="col-xl-5">{% trans "Proposed solution:" %}</dt>
|
||||
<dt class="col-xl-5 text-right">{% trans "Proposed solution:" %}</dt>
|
||||
<dd class="col-sm-7"><a href="{{ participation.received_participation.solution.link|default:"#" }}"{% if participation.received_participation.solution.link %} target="_blank"{% endif %}>
|
||||
{{ participation.received_participation.solution.link|default:novideo }}</a>
|
||||
{% if participation.received_participation.solution.link %}
|
||||
@ -104,10 +104,18 @@
|
||||
</dd>
|
||||
</dl>
|
||||
|
||||
{# TODO Display solution #}
|
||||
|
||||
{% if current_phase.phase_number == 2 %}
|
||||
{# TODO Send questions #}
|
||||
<div class="alert alert-info">
|
||||
{% 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 %}
|
||||
</div>
|
||||
|
||||
{% if user.registration.participates %}
|
||||
<button class="btn btn-success"><i class="fas fa-plus-circle"></i> {% trans "Add a question" %}</button>
|
||||
{% endif %}
|
||||
{% elif current_phase.phase_number == 3 %}
|
||||
<div class="alert alert-info">
|
||||
{% blocktrans trimmed with user_id=user.pk %}
|
||||
|
||||
@ -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 <yohann.danello@animath.fr>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\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é : <a href=\"https://element.correspondances-maths.fr"
|
||||
"\">element.correpondances-maths.fr</a>"
|
||||
|
||||
#: 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."
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user