From b4e7ec65501f7a26166377a22ad662daef2f13a4 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 12 Jan 2021 15:42:32 +0100 Subject: [PATCH] =?UTF-8?q?There=20is=20no=20video=20in=20the=20TFJM=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/participation/apps.py | 2 +- apps/participation/forms.py | 3 +-- apps/participation/models.py | 2 +- apps/participation/signals.py | 2 +- .../templates/participation/team_detail.html | 2 +- apps/participation/views.py | 2 +- locale/fr/LC_MESSAGES/django.po | 10 ++++------ tfjm/templates/400.html | 2 +- tfjm/templates/500.html | 2 +- tfjm/templates/base.html | 2 +- 10 files changed, 13 insertions(+), 16 deletions(-) diff --git a/apps/participation/apps.py b/apps/participation/apps.py index 2ec3fd0..4a8755a 100644 --- a/apps/participation/apps.py +++ b/apps/participation/apps.py @@ -7,7 +7,7 @@ from django.db.models.signals import post_save, pre_save class ParticipationConfig(AppConfig): """ - The participation app contains the data about the teams, videos, ... + The participation app contains the data about the teams, solutions, ... """ name = 'participation' diff --git a/apps/participation/forms.py b/apps/participation/forms.py index 1b9a974..ee7ef08 100644 --- a/apps/participation/forms.py +++ b/apps/participation/forms.py @@ -14,8 +14,7 @@ from .models import Participation, Team, Tournament class TeamForm(forms.ModelForm): """ - Form to create a team, with the name and the trigram, - and if the team accepts that Animath diffuse the videos. + Form to create a team, with the name and the trigram,... """ def clean_trigram(self): trigram = self.cleaned_data["trigram"].upper() diff --git a/apps/participation/models.py b/apps/participation/models.py index da8b551..7aaeb07 100644 --- a/apps/participation/models.py +++ b/apps/participation/models.py @@ -235,7 +235,7 @@ class Tournament(models.Model): class Participation(models.Model): """ The Participation model contains all data that are related to the participation: - chosen problem, validity status, videos,... + chosen problem, validity status, solutions,... """ team = models.OneToOneField( Team, diff --git a/apps/participation/signals.py b/apps/participation/signals.py index 1b7f68a..ac391a4 100644 --- a/apps/participation/signals.py +++ b/apps/participation/signals.py @@ -7,7 +7,7 @@ from tfjm.lists import get_sympa_client def create_team_participation(instance, created, **_): """ - When a team got created, create an associated team and create Video objects. + When a team got created, create an associated participation. """ participation = Participation.objects.get_or_create(team=instance)[0] participation.save() diff --git a/apps/participation/templates/participation/team_detail.html b/apps/participation/templates/participation/team_detail.html index 25eb3e9..16cad3a 100644 --- a/apps/participation/templates/participation/team_detail.html +++ b/apps/participation/templates/participation/team_detail.html @@ -93,7 +93,7 @@ {% if team.participation.valid %}
- {% trans "Access to team participation" %} + {% trans "Access to team participation" %}
{% elif team.participation.valid == None %} {# Team did not ask for validation #} diff --git a/apps/participation/views.py b/apps/participation/views.py index 325d552..c9fc27f 100644 --- a/apps/participation/views.py +++ b/apps/participation/views.py @@ -374,7 +374,7 @@ class MyParticipationDetailView(LoginRequiredMixin, RedirectView): class ParticipationDetailView(LoginRequiredMixin, DetailView): """ - Display detail about the participation of a team, and manage the video submission. + Display detail about the participation of a team, and manage the solution submission. """ model = Participation diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 771bd04..18392ee 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -1137,12 +1137,11 @@ msgstr "Requête invalide" #: tfjm/templates/400.html:7 msgid "" "Sorry, your request was bad. Don't know what could be wrong. An email has " -"been sent to webmasters with the details of the error. You can now watch " -"some videos." +"been sent to webmasters with the details of the error. You can now think about other solutions." msgstr "" "Désolé, votre requête est invalide. Aucune idée de ce qui a pu se passer. Un " "email a été envoyé aux administrateurs avec les détails de l'erreur. Vous " -"pouvez désormais retourner voir des vidéos." +"pouvez désormais retourner chercher d'autres solutions." #: tfjm/templates/403.html:6 msgid "Permission denied" @@ -1176,12 +1175,11 @@ msgstr "Erreur du serveur" msgid "" "Sorry, an error occurred when processing your request. An email has been " "sent to webmasters with the detail of the error, and this will be fixed " -"soon. You can now watch some videos." +"soon. You can now think about other solutions." msgstr "" "Désolé, une erreur est survenue lors du traitement de votre requête. Aucune " "idée de ce qui a pu se passer. Un email a été envoyé aux administrateurs " -"avec les détails de l'erreur. Vous pouvez désormais retourner voir des " -"vidéos." +"avec les détails de l'erreur. Vous pouvez désormais retourner chercher d'autres solutions.." #: tfjm/templates/base.html:56 msgid "Home" diff --git a/tfjm/templates/400.html b/tfjm/templates/400.html index 0734a85..7e5c934 100644 --- a/tfjm/templates/400.html +++ b/tfjm/templates/400.html @@ -4,5 +4,5 @@ {% block content %}

{% trans "Bad request" %}

- {% blocktrans %}Sorry, your request was bad. Don't know what could be wrong. An email has been sent to webmasters with the details of the error. You can now watch some videos.{% endblocktrans %} + {% blocktrans %}Sorry, your request was bad. Don't know what could be wrong. An email has been sent to webmasters with the details of the error. You can now think about other solutions.{% endblocktrans %} {% endblock %} \ No newline at end of file diff --git a/tfjm/templates/500.html b/tfjm/templates/500.html index 38d12e4..e1fdc24 100644 --- a/tfjm/templates/500.html +++ b/tfjm/templates/500.html @@ -4,5 +4,5 @@ {% block content %}

{% trans "Server error" %}

- {% blocktrans %}Sorry, an error occurred when processing your request. An email has been sent to webmasters with the detail of the error, and this will be fixed soon. You can now watch some videos.{% endblocktrans %} + {% blocktrans %}Sorry, an error occurred when processing your request. An email has been sent to webmasters with the detail of the error, and this will be fixed soon. You can now think about other solutions.{% endblocktrans %} {% endblock %} diff --git a/tfjm/templates/base.html b/tfjm/templates/base.html index f2b23a0..4016f72 100644 --- a/tfjm/templates/base.html +++ b/tfjm/templates/base.html @@ -87,7 +87,7 @@
  • - {% trans "My participation" %} + {% trans "My participation" %}
    • {% endif %}