From 02ca1d1efea87eb9ff78897219c31474841320a3 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 14 Nov 2020 21:28:01 +0100 Subject: [PATCH 01/10] Fix matrix bot avatar --- .../management/commands/fix_matrix_channels.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/participation/management/commands/fix_matrix_channels.py b/apps/participation/management/commands/fix_matrix_channels.py index 764b41e..ec7802b 100644 --- a/apps/participation/management/commands/fix_matrix_channels.py +++ b/apps/participation/management/commands/fix_matrix_channels.py @@ -16,10 +16,8 @@ class Command(BaseCommand): if not os.path.isfile(".matrix_avatar"): stat_file = os.stat("corres2math/static/logo.png") with open("corres2math/static/logo.png", "rb") as f: - resp, _ = Matrix.upload(f, filename="logo.png", content_type="image/png", - filesize=stat_file.st_size) - if not hasattr(resp, "content_uri"): - raise Exception(resp) + resp = Matrix.upload(f, filename="logo.png", content_type="image/png", + filesize=stat_file.st_size)[0][0] avatar_uri = resp.content_uri with open(".matrix_avatar", "w") as f: f.write(avatar_uri) From 10932d1cc50809c4646498b378401267c40cf4dd Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 14 Nov 2020 22:18:35 +0100 Subject: [PATCH 02/10] Create more mailing lists --- .../management/commands/fix_sympa_lists.py | 39 +++++++++++++++++++ apps/participation/models.py | 11 ++++++ apps/participation/views.py | 5 +++ 3 files changed, 55 insertions(+) create mode 100644 apps/participation/management/commands/fix_sympa_lists.py diff --git a/apps/participation/management/commands/fix_sympa_lists.py b/apps/participation/management/commands/fix_sympa_lists.py new file mode 100644 index 0000000..f558a8a --- /dev/null +++ b/apps/participation/management/commands/fix_sympa_lists.py @@ -0,0 +1,39 @@ +from django.db.models import Q + +from corres2math.lists import get_sympa_client +from django.core.management import BaseCommand +from participation.models import Team +from registration.models import CoachRegistration, StudentRegistration + + +class Command(BaseCommand): + def handle(self, *args, **options): + """ + Create Sympa mailing lists and register teams. + """ + sympa = get_sympa_client() + + sympa.create_list("equipes", "Équipes des Correspondances", "hotline", + "Liste de diffusion pour contacter toutes les équipes validées des Correspondances.", + "education", raise_error=False) + sympa.create_list("equipes-non-valides", "Équipes des Correspondances", "hotline", + "Liste de diffusion pour contacter toutes les équipes non-validées des Correspondances.", + "education", raise_error=False) + + for problem in range(1, 4): + sympa.create_list(f"probleme-{problem}", + f"Équipes des Correspondances participant au problème {problem}", "hotline", + f"Liste de diffusion pour contacter les équipes participant au problème {problem}" + f" des Correspondances.", "education", raise_error=False) + + for team in Team.objects.filter(participation__valid=True).all(): + sympa.subscribe(team.email, "equipes", f"Equipe {team.name}", True, True) + sympa.subscribe(team.email, f"probleme-{team.participation.problem}", f"Equipe {team.name}", True) + + for team in Team.objects.filter(Q(participation__valid=False) | Q(participation__valid__isnull=True)).all(): + sympa.subscribe(team.email, "equipes-non-valides", f"Equipe {team.name}", True) + + for student in StudentRegistration.objects.filter(team__isnull=False).all(): + sympa.subscribe(student.user.email, f"equipe-{student.team.trigram.lower}", True, f"{student}") + for coach in CoachRegistration.objects.filter(team__isnull=False).all(): + sympa.subscribe(coach.user.email, f"equipe-{coach.team.trigram.lower}", True, f"{coach}") diff --git a/apps/participation/models.py b/apps/participation/models.py index 8b6af3e..3c64a7e 100644 --- a/apps/participation/models.py +++ b/apps/participation/models.py @@ -65,11 +65,22 @@ class Team(models.Model): "education", raise_error=False, ) + if self.participation.valid: + get_sympa_client().subscribe(self.email, "equipes", False, f"Equipe {self.name}") + get_sympa_client().subscribe(self.email, f"probleme-{self.participation.problem}", False, + f"Equipe {self.name}") + else: + get_sympa_client().subscribe(self.email, "equipes-non-valides", False) def delete_mailing_list(self): """ Drop the Sympa mailing list, if the team is empty or if the trigram changed. """ + if self.participation.valid: + get_sympa_client().unsubscribe(self.email, "equipes", False) + get_sympa_client().unsubscribe(self.email, f"probleme-{self.participation.problem}", False) + else: + get_sympa_client().unsubscribe(self.email, "equipes-non-valides", False) get_sympa_client().delete_list(f"equipe-{self.trigram}") def save(self, *args, **kwargs): diff --git a/apps/participation/views.py b/apps/participation/views.py index de74762..f83a37b 100644 --- a/apps/participation/views.py +++ b/apps/participation/views.py @@ -223,6 +223,11 @@ class TeamDetailView(LoginRequiredMixin, FormMixin, ProcessFormView, DetailView) mail_plain = render_to_string("participation/mails/team_validated.txt", mail_context) mail_html = render_to_string("participation/mails/team_validated.html", mail_context) send_mail("[Corres2math] Équipe validée", mail_plain, None, [self.object.email], html_message=mail_html) + + get_sympa_client().subscribe(self.object.email, "equipes", False, f"Equipe {self.object.name}") + get_sympa_client().unsubscribe(self.object.email, "equipes-non-valides", False) + get_sympa_client().subscribe(self.object.email, f"probleme-{self.object.participation.problem}", False, + f"Equipe {self.object.name}") elif "invalidate" in self.request.POST: self.object.participation.valid = None self.object.participation.save() From 48b34e4362bb70548ea0ce01a687619db5d0c71d Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 14 Nov 2020 23:43:42 +0100 Subject: [PATCH 03/10] Ensure that teams have a participation --- apps/participation/models.py | 2 +- apps/participation/signals.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/participation/models.py b/apps/participation/models.py index 3c64a7e..c19f9f8 100644 --- a/apps/participation/models.py +++ b/apps/participation/models.py @@ -65,7 +65,7 @@ class Team(models.Model): "education", raise_error=False, ) - if self.participation.valid: + if self.pk and self.participation.valid: get_sympa_client().subscribe(self.email, "equipes", False, f"Equipe {self.name}") get_sympa_client().subscribe(self.email, f"probleme-{self.participation.problem}", False, f"Equipe {self.name}") diff --git a/apps/participation/signals.py b/apps/participation/signals.py index a7ee7d4..67998d9 100644 --- a/apps/participation/signals.py +++ b/apps/participation/signals.py @@ -2,7 +2,7 @@ from corres2math.lists import get_sympa_client from participation.models import Participation, Team, Video -def create_team_participation(instance, **_): +def create_team_participation(instance, created, **_): """ When a team got created, create an associated team and create Video objects. """ @@ -12,6 +12,8 @@ def create_team_participation(instance, **_): if not participation.synthesis: participation.synthesis = Video.objects.create() participation.save() + if not created: + participation.team.create_mailing_list() def update_mailing_list(instance: Team, **_): From 9867e5e2a828a19f6fae7820651aa81c59b1a0fd Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 14 Nov 2020 23:44:53 +0100 Subject: [PATCH 04/10] Linting --- apps/participation/management/commands/fix_matrix_channels.py | 2 +- apps/participation/management/commands/fix_sympa_lists.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/participation/management/commands/fix_matrix_channels.py b/apps/participation/management/commands/fix_matrix_channels.py index ec7802b..d9459d0 100644 --- a/apps/participation/management/commands/fix_matrix_channels.py +++ b/apps/participation/management/commands/fix_matrix_channels.py @@ -17,7 +17,7 @@ class Command(BaseCommand): stat_file = os.stat("corres2math/static/logo.png") with open("corres2math/static/logo.png", "rb") as f: resp = Matrix.upload(f, filename="logo.png", content_type="image/png", - filesize=stat_file.st_size)[0][0] + filesize=stat_file.st_size)[0][0] avatar_uri = resp.content_uri with open(".matrix_avatar", "w") as f: f.write(avatar_uri) diff --git a/apps/participation/management/commands/fix_sympa_lists.py b/apps/participation/management/commands/fix_sympa_lists.py index f558a8a..63152b5 100644 --- a/apps/participation/management/commands/fix_sympa_lists.py +++ b/apps/participation/management/commands/fix_sympa_lists.py @@ -1,7 +1,6 @@ -from django.db.models import Q - from corres2math.lists import get_sympa_client from django.core.management import BaseCommand +from django.db.models import Q from participation.models import Team from registration.models import CoachRegistration, StudentRegistration From 0fe1f9c34857f909b88194493dffbf3af67b14f5 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 14 Nov 2020 23:50:02 +0100 Subject: [PATCH 05/10] Don't migrate in Dockerfile --- Dockerfile | 4 +--- entrypoint.sh | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index cce2279..ef04fb3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,9 +16,7 @@ RUN pip install -r requirements.txt --no-cache-dir COPY . /code/ RUN python manage.py collectstatic --noinput && \ - python manage.py compilemessages && \ - python manage.py migrate && \ - python manage.py loaddata initial + python manage.py compilemessages # Configure nginx RUN mkdir /run/nginx diff --git a/entrypoint.sh b/entrypoint.sh index 044f92e..0b67ca4 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -2,10 +2,13 @@ crond -l 0 +python manage.py migrate +python manage.py loaddata initial + nginx if [ "$CORRES2MATH_STAGE" = "prod" ]; then gunicorn -b 0.0.0.0:8000 --workers=2 --threads=4 --worker-class=gthread corres2math.wsgi --access-logfile '-' --error-logfile '-'; else - ./manage.py runserver 0.0.0.0:8000; + python manage.py runserver 0.0.0.0:8000; fi From d304c3565c112c9c79130aa7b35fc6002c82a335 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 15 Nov 2020 00:55:25 +0100 Subject: [PATCH 06/10] resolve_room_alias was broken --- corres2math/matrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corres2math/matrix.py b/corres2math/matrix.py index d01e44f..a6265a9 100644 --- a/corres2math/matrix.py +++ b/corres2math/matrix.py @@ -216,7 +216,7 @@ class Matrix: """ client = await cls._get_client() resp = await client.room_resolve_alias(room_alias) - return resp.room_id if resp else None + return resp.room_id if resp and hasattr(resp, "room_id") else None @classmethod @async_to_sync From 2e0028c0638a3a4027ead2eb0dd8ec8ff252f5a2 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 15 Nov 2020 01:14:31 +0100 Subject: [PATCH 07/10] Send display name to Matrix --- apps/registration/fixtures/initial.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/apps/registration/fixtures/initial.json b/apps/registration/fixtures/initial.json index 40afb61..209fc21 100644 --- a/apps/registration/fixtures/initial.json +++ b/apps/registration/fixtures/initial.json @@ -13,5 +13,14 @@ "single_log_out": true, "single_log_out_callback": "" } + }, + { + "model": "cas_server.replaceattributname", + "pk": 1, + "fields": { + "name": "display_name", + "replace": "", + "service_pattern": 1 + } } ] From ece1e800abe27aac70b667e0c0259710f6f4765f Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 15 Nov 2020 01:29:53 +0100 Subject: [PATCH 08/10] Add #flood --- .../management/commands/fix_matrix_channels.py | 14 ++++++++++++++ apps/registration/signals.py | 1 + 2 files changed, 15 insertions(+) diff --git a/apps/participation/management/commands/fix_matrix_channels.py b/apps/participation/management/commands/fix_matrix_channels.py index d9459d0..7ce878c 100644 --- a/apps/participation/management/commands/fix_matrix_channels.py +++ b/apps/participation/management/commands/fix_matrix_channels.py @@ -56,9 +56,20 @@ class Command(BaseCommand): preset=RoomPreset.public_chat, ) + if not async_to_sync(Matrix.resolve_room_alias)("#flood:correspondances-maths.fr"): + Matrix.create_room( + visibility=RoomVisibility.public, + alias="flood", + name="Flood", + topic="Discutez de tout et de rien !", + federate=False, + preset=RoomPreset.public_chat, + ) + Matrix.set_room_avatar("#annonces:correspondances-maths.fr", avatar_uri) Matrix.set_room_avatar("#faq:correspondances-maths.fr", avatar_uri) Matrix.set_room_avatar("#je-cherche-une-equipe:correspondances-maths.fr", avatar_uri) + Matrix.set_room_avatar("#flood:correspondances-maths.fr", avatar_uri) Matrix.set_room_power_level_event("#annonces:correspondances-maths.fr", "events_default", 50) @@ -67,9 +78,12 @@ class Command(BaseCommand): Matrix.invite("#faq:correspondances-maths.fr", f"@{r.matrix_username}:correspondances-maths.fr") Matrix.invite("#je-cherche-une-equipe:correspondances-maths.fr", f"@{r.matrix_username}:correspondances-maths.fr") + Matrix.invite("#flood:correspondances-maths.fr", f"@{r.matrix_username}:correspondances-maths.fr") for admin in AdminRegistration.objects.all(): Matrix.set_room_power_level("#annonces:correspondances-maths.fr", f"@{admin.matrix_username}:correspondances-maths.fr", 95) Matrix.set_room_power_level("#faq:correspondances-maths.fr", f"@{admin.matrix_username}:correspondances-maths.fr", 95) + Matrix.set_room_power_level("#flood:correspondances-maths.fr", + f"@{admin.matrix_username}:correspondances-maths.fr", 95) diff --git a/apps/registration/signals.py b/apps/registration/signals.py index 71b761e..0a6edec 100644 --- a/apps/registration/signals.py +++ b/apps/registration/signals.py @@ -50,3 +50,4 @@ def invite_to_public_rooms(instance: Registration, created: bool, **_): Matrix.invite("#faq:correspondances-maths.fr", f"@{instance.matrix_username}:correspondances-maths.fr") Matrix.invite("#je-cherche-une-equip:correspondances-maths.fr", f"@{instance.matrix_username}:correspondances-maths.fr") + Matrix.invite("#flood:correspondances-maths.fr", f"@{instance.matrix_username}:correspondances-maths.fr") From d3e18a8fbb897033e04133d296ea512b819ec67b Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 15 Nov 2020 01:40:20 +0100 Subject: [PATCH 09/10] We can only register during the first phase --- apps/participation/models.py | 10 ++++------ apps/participation/tests.py | 2 +- apps/registration/forms.py | 6 ++++++ apps/registration/tests.py | 20 ++++++++++++++++++++ 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/apps/participation/models.py b/apps/participation/models.py index c19f9f8..55e808c 100644 --- a/apps/participation/models.py +++ b/apps/participation/models.py @@ -65,7 +65,7 @@ class Team(models.Model): "education", raise_error=False, ) - if self.pk and self.participation.valid: + if self.pk and self.participation.valid: # pragma: no cover get_sympa_client().subscribe(self.email, "equipes", False, f"Equipe {self.name}") get_sympa_client().subscribe(self.email, f"probleme-{self.participation.problem}", False, f"Equipe {self.name}") @@ -76,7 +76,7 @@ class Team(models.Model): """ Drop the Sympa mailing list, if the team is empty or if the trigram changed. """ - if self.participation.valid: + if self.participation.valid: # pragma: no cover get_sympa_client().unsubscribe(self.email, "equipes", False) get_sympa_client().unsubscribe(self.email, f"probleme-{self.participation.problem}", False) else: @@ -292,10 +292,8 @@ class Phase(models.Model): qs = Phase.objects.filter(start__lte=timezone.now(), end__gte=timezone.now()) if qs.exists(): return qs.get() - qs = Phase.objects.order_by("phase_number").all() - if timezone.now() < qs.first().start: - return qs.first() - return qs.last() + qs = Phase.objects.filter(start__lte=timezone.now()).order_by("phase_number").all() + return qs.last() if qs.exists() else None def __str__(self): return _("Phase {phase_number:d} starts on {start:%Y-%m-%d %H:%M} and ends on {end:%Y-%m-%d %H:%M}")\ diff --git a/apps/participation/tests.py b/apps/participation/tests.py index 4a6d119..ee4fd75 100644 --- a/apps/participation/tests.py +++ b/apps/participation/tests.py @@ -575,7 +575,7 @@ class TestStudentParticipation(TestCase): for i in range(1, 5): Phase.objects.filter(phase_number=i).update(start=timezone.now() + timedelta(days=2 * i), end=timezone.now() + timedelta(days=2 * i + 1)) - self.assertEqual(Phase.current_phase().phase_number, 1) + self.assertEqual(Phase.current_phase(), None) # We are after the end for i in range(1, 5): diff --git a/apps/registration/forms.py b/apps/registration/forms.py index 18d76eb..140002f 100644 --- a/apps/registration/forms.py +++ b/apps/registration/forms.py @@ -4,6 +4,7 @@ from django.contrib.auth.models import User from django.core.exceptions import ValidationError from django.forms import FileInput from django.utils.translation import gettext_lazy as _ +from participation.models import Phase from .models import AdminRegistration, CoachRegistration, StudentRegistration @@ -28,6 +29,11 @@ class SignupForm(UserCreationForm): self.fields["last_name"].required = True self.fields["email"].required = True + def clean(self): + if Phase.current_phase() is None or Phase.current_phase().phase_number >= 2: + self.add_error(None, _("You can't register now.")) + return super().clean() + class Meta: model = User fields = ('first_name', 'last_name', 'email', 'password1', 'password2', 'role',) diff --git a/apps/registration/tests.py b/apps/registration/tests.py index 4c464c9..bc65bb7 100644 --- a/apps/registration/tests.py +++ b/apps/registration/tests.py @@ -1,3 +1,4 @@ +from datetime import timedelta import os from corres2math.tokens import email_validation_token @@ -7,8 +8,10 @@ from django.contrib.sites.models import Site from django.core.management import call_command from django.test import TestCase from django.urls import reverse +from django.utils import timezone from django.utils.encoding import force_bytes from django.utils.http import urlsafe_base64_encode +from participation.models import Phase from .models import AdminRegistration, CoachRegistration, StudentRegistration @@ -84,6 +87,23 @@ class TestRegistration(TestCase): response = self.client.get(reverse("registration:signup")) self.assertEqual(response.status_code, 200) + # After first phase + response = self.client.post(reverse("registration:signup"), data=dict( + last_name="Toto", + first_name="Toto", + email="toto@example.com", + password1="azertyuiopazertyuiop", + password2="azertyuiopazertyuiop", + role="participant", + student_class=12, + school="God", + give_contact_to_animath=False, + )) + self.assertEqual(response.status_code, 200) + + Phase.objects.filter(phase_number__gte=2).update(start=timezone.now() + timedelta(days=1), + end=timezone.now() + timedelta(days=2)) + # Incomplete form response = self.client.post(reverse("registration:signup"), data=dict( last_name="Toto", From 731f8711ff9f3b0fd1a856c4a9cdf772210279bb Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 15 Nov 2020 01:50:12 +0100 Subject: [PATCH 10/10] We can only register during the first phase --- apps/participation/templatetags/__init__.py | 0 apps/participation/templatetags/calendar.py | 12 ++ apps/registration/forms.py | 6 - apps/registration/tests.py | 20 +-- apps/registration/views.py | 10 ++ corres2math/templates/base.html | 10 +- locale/fr/LC_MESSAGES/django.po | 154 ++++++++++---------- 7 files changed, 112 insertions(+), 100 deletions(-) create mode 100644 apps/participation/templatetags/__init__.py create mode 100644 apps/participation/templatetags/calendar.py diff --git a/apps/participation/templatetags/__init__.py b/apps/participation/templatetags/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/apps/participation/templatetags/calendar.py b/apps/participation/templatetags/calendar.py new file mode 100644 index 0000000..62cc0aa --- /dev/null +++ b/apps/participation/templatetags/calendar.py @@ -0,0 +1,12 @@ +from django import template + +from ..models import Phase + + +def current_phase(nb): + phase = Phase.current_phase() + return phase is not None and phase.phase_number == nb + + +register = template.Library() +register.filter("current_phase", current_phase) diff --git a/apps/registration/forms.py b/apps/registration/forms.py index 140002f..18d76eb 100644 --- a/apps/registration/forms.py +++ b/apps/registration/forms.py @@ -4,7 +4,6 @@ from django.contrib.auth.models import User from django.core.exceptions import ValidationError from django.forms import FileInput from django.utils.translation import gettext_lazy as _ -from participation.models import Phase from .models import AdminRegistration, CoachRegistration, StudentRegistration @@ -29,11 +28,6 @@ class SignupForm(UserCreationForm): self.fields["last_name"].required = True self.fields["email"].required = True - def clean(self): - if Phase.current_phase() is None or Phase.current_phase().phase_number >= 2: - self.add_error(None, _("You can't register now.")) - return super().clean() - class Meta: model = User fields = ('first_name', 'last_name', 'email', 'password1', 'password2', 'role',) diff --git a/apps/registration/tests.py b/apps/registration/tests.py index bc65bb7..e43aabc 100644 --- a/apps/registration/tests.py +++ b/apps/registration/tests.py @@ -84,26 +84,16 @@ class TestRegistration(TestCase): """ Ensure that the signup form is working successfully. """ - response = self.client.get(reverse("registration:signup")) - self.assertEqual(response.status_code, 200) - # After first phase - response = self.client.post(reverse("registration:signup"), data=dict( - last_name="Toto", - first_name="Toto", - email="toto@example.com", - password1="azertyuiopazertyuiop", - password2="azertyuiopazertyuiop", - role="participant", - student_class=12, - school="God", - give_contact_to_animath=False, - )) - self.assertEqual(response.status_code, 200) + response = self.client.get(reverse("registration:signup")) + self.assertEqual(response.status_code, 403) Phase.objects.filter(phase_number__gte=2).update(start=timezone.now() + timedelta(days=1), end=timezone.now() + timedelta(days=2)) + response = self.client.get(reverse("registration:signup")) + self.assertEqual(response.status_code, 200) + # Incomplete form response = self.client.post(reverse("registration:signup"), data=dict( last_name="Toto", diff --git a/apps/registration/views.py b/apps/registration/views.py index 91d13b6..7fe6707 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -13,6 +13,7 @@ from django.utils.http import urlsafe_base64_decode from django.utils.translation import gettext_lazy as _ from django.views.generic import CreateView, DetailView, RedirectView, TemplateView, UpdateView, View from magic import Magic +from participation.models import Phase from .forms import CoachRegistrationForm, PhotoAuthorizationForm, SignupForm, StudentRegistrationForm, UserForm from .models import StudentRegistration @@ -27,6 +28,15 @@ class SignupView(CreateView): template_name = "registration/signup.html" extra_context = dict(title=_("Sign up")) + def dispatch(self, request, *args, **kwargs): + """ + The signup view is available only during the first phase. + """ + current_phase = Phase.current_phase() + if not current_phase or current_phase.phase_number >= 2: + raise PermissionDenied(_("You can't register now.")) + return super().dispatch(request, *args, **kwargs) + def get_context_data(self, **kwargs): context = super().get_context_data() diff --git a/corres2math/templates/base.html b/corres2math/templates/base.html index 8cd6fc7..b5ece84 100644 --- a/corres2math/templates/base.html +++ b/corres2math/templates/base.html @@ -1,4 +1,4 @@ -{% load static i18n static %} +{% load static i18n static calendar %} {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %} @@ -122,9 +122,11 @@ {% endif %} {% if not user.is_authenticated %} -
  • - {% trans "Register" %} -
    • + {% if 1|current_phase %} +
  • + {% trans "Register" %} +
    • + {% endif %}
  • {% trans "Log in" %} diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index a759138..3dc6ebf 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-11-03 17:32+0100\n" +"POT-Creation-Date: 2020-11-15 01:49+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Yohann D'ANELLO \n" "Language-Team: LANGUAGE \n" @@ -99,17 +99,17 @@ msgstr "changelogs" msgid "Changelog of type \"{action}\" for model {model} at {timestamp}" msgstr "Changelog de type \"{action}\" pour le modèle {model} le {timestamp}" -#: apps/participation/admin.py:16 apps/participation/models.py:122 +#: apps/participation/admin.py:16 apps/participation/models.py:132 #: apps/participation/tables.py:35 apps/participation/tables.py:62 msgid "problem number" msgstr "numéro de problème" -#: apps/participation/admin.py:21 apps/participation/models.py:128 -#: apps/participation/models.py:182 +#: apps/participation/admin.py:21 apps/participation/models.py:138 +#: apps/participation/models.py:192 msgid "valid" msgstr "valide" -#: apps/participation/forms.py:20 apps/participation/models.py:33 +#: apps/participation/forms.py:20 apps/participation/models.py:32 msgid "The trigram must be composed of three uppercase letters." msgstr "Le trigramme doit être composé de trois lettres majuscules." @@ -155,28 +155,28 @@ msgstr "Cette phase doit commencer après les phases précédentes." msgid "This phase must end after the next phases." msgstr "Cette phase doit finir avant les phases suivantes." -#: apps/participation/models.py:26 apps/participation/tables.py:30 +#: apps/participation/models.py:25 apps/participation/tables.py:30 #: apps/participation/tables.py:52 apps/participation/tables.py:78 msgid "name" msgstr "nom" -#: apps/participation/models.py:32 apps/participation/tables.py:57 +#: apps/participation/models.py:31 apps/participation/tables.py:57 msgid "trigram" msgstr "trigramme" -#: apps/participation/models.py:40 +#: apps/participation/models.py:39 msgid "access code" msgstr "code d'accès" -#: apps/participation/models.py:41 +#: apps/participation/models.py:40 msgid "The access code let other people to join the team." msgstr "Le code d'accès permet aux autres participants de rejoindre l'équipe." -#: apps/participation/models.py:45 +#: apps/participation/models.py:44 msgid "Grant Animath to publish my video" msgstr "Autoriser Animath à publier ma vidéo" -#: apps/participation/models.py:46 +#: apps/participation/models.py:45 msgid "" "Give the authorisation to publish the video on the main website to promote " "the action." @@ -184,96 +184,96 @@ msgstr "" "Donner l'autorisation de publier la vidéo sur le site principal pour " "promouvoir les Correspondances." -#: apps/participation/models.py:97 +#: apps/participation/models.py:107 #, python-brace-format msgid "Team {name} ({trigram})" msgstr "Équipe {name} ({trigram})" -#: apps/participation/models.py:100 apps/participation/models.py:115 +#: apps/participation/models.py:110 apps/participation/models.py:125 #: apps/registration/models.py:106 apps/registration/models.py:155 msgid "team" msgstr "équipe" -#: apps/participation/models.py:101 +#: apps/participation/models.py:111 msgid "teams" msgstr "équipes" -#: apps/participation/models.py:119 +#: apps/participation/models.py:129 #, python-brace-format msgid "Problem #{problem:d}" msgstr "Problème n°{problem:d}" -#: apps/participation/models.py:129 apps/participation/models.py:183 +#: apps/participation/models.py:139 apps/participation/models.py:193 msgid "The video got the validation of the administrators." msgstr "La vidéo a été validée par les administrateurs." -#: apps/participation/models.py:138 +#: apps/participation/models.py:148 msgid "solution video" msgstr "vidéo de solution" -#: apps/participation/models.py:147 +#: apps/participation/models.py:157 msgid "received participation" msgstr "participation reçue" -#: apps/participation/models.py:156 +#: apps/participation/models.py:166 msgid "synthesis video" msgstr "vidéo de synthèse" -#: apps/participation/models.py:163 +#: apps/participation/models.py:173 #, python-brace-format msgid "Participation of the team {name} ({trigram})" msgstr "Participation de l'équipe {name} ({trigram})" -#: apps/participation/models.py:166 apps/participation/models.py:240 +#: apps/participation/models.py:176 apps/participation/models.py:250 msgid "participation" msgstr "participation" -#: apps/participation/models.py:167 +#: apps/participation/models.py:177 msgid "participations" msgstr "participations" -#: apps/participation/models.py:175 +#: apps/participation/models.py:185 msgid "link" msgstr "lien" -#: apps/participation/models.py:176 +#: apps/participation/models.py:186 msgid "The full video link." msgstr "Le lien complet de la vidéo." -#: apps/participation/models.py:225 +#: apps/participation/models.py:235 #, python-brace-format msgid "Video of team {name} ({trigram})" msgstr "Vidéo de l'équipe {name} ({trigram})" -#: apps/participation/models.py:229 +#: apps/participation/models.py:239 msgid "video" msgstr "vidéo" -#: apps/participation/models.py:230 +#: apps/participation/models.py:240 msgid "videos" msgstr "vidéos" -#: apps/participation/models.py:245 +#: apps/participation/models.py:255 msgid "question" msgstr "question" -#: apps/participation/models.py:259 +#: apps/participation/models.py:269 msgid "phase number" msgstr "phase" -#: apps/participation/models.py:264 +#: apps/participation/models.py:274 msgid "phase description" msgstr "description" -#: apps/participation/models.py:268 +#: apps/participation/models.py:278 msgid "start date of the given phase" msgstr "début de la phase" -#: apps/participation/models.py:273 +#: apps/participation/models.py:283 msgid "end date of the given phase" msgstr "fin de la phase" -#: apps/participation/models.py:291 +#: apps/participation/models.py:299 msgid "" "Phase {phase_number:d} starts on {start:%Y-%m-%d %H:%M} and ends on {end:%Y-" "%m-%d %H:%M}" @@ -281,21 +281,21 @@ msgstr "" "Phase {phase_number:d} démarrant le {start:%d/%m/%Y %H:%M} et finissant le " "{end:%d/%m/%Y %H:%M}" -#: apps/participation/models.py:295 +#: apps/participation/models.py:303 msgid "phase" msgstr "phase" -#: apps/participation/models.py:296 +#: apps/participation/models.py:304 msgid "phases" msgstr "phases" #: apps/participation/templates/participation/create_team.html:11 -#: corres2math/templates/base.html:231 +#: corres2math/templates/base.html:233 msgid "Create" msgstr "Créer" #: apps/participation/templates/participation/join_team.html:11 -#: corres2math/templates/base.html:227 +#: corres2math/templates/base.html:229 msgid "Join" msgstr "Rejoindre" @@ -469,7 +469,7 @@ msgstr "Définir l'équipe qui recevra votre vidéo" #: apps/participation/templates/participation/participation_detail.html:181 #: apps/participation/templates/participation/participation_detail.html:233 -#: apps/participation/views.py:482 +#: apps/participation/views.py:490 msgid "Upload video" msgstr "Envoyer la vidéo" @@ -504,7 +504,7 @@ msgid "Update question" msgstr "Modifier la question" #: apps/participation/templates/participation/participation_detail.html:217 -#: apps/participation/views.py:459 +#: apps/participation/views.py:466 msgid "Delete question" msgstr "Supprimer la question" @@ -514,8 +514,8 @@ msgid "Display synthesis" msgstr "Afficher la synthèse" #: apps/participation/templates/participation/phase_list.html:10 -#: apps/participation/views.py:501 corres2math/templates/base.html:68 -#: corres2math/templates/base.html:70 corres2math/templates/base.html:217 +#: apps/participation/views.py:509 corres2math/templates/base.html:68 +#: corres2math/templates/base.html:70 corres2math/templates/base.html:219 msgid "Calendar" msgstr "Calendrier" @@ -627,7 +627,7 @@ msgid "Update team" msgstr "Modifier l'équipe" #: apps/participation/templates/participation/team_detail.html:127 -#: apps/participation/views.py:314 +#: apps/participation/views.py:319 msgid "Leave team" msgstr "Quitter l'équipe" @@ -636,7 +636,7 @@ msgid "Are you sure that you want to leave this team?" msgstr "Êtes-vous sûr·e de vouloir quitter cette équipe ?" #: apps/participation/views.py:36 corres2math/templates/base.html:77 -#: corres2math/templates/base.html:230 +#: corres2math/templates/base.html:232 msgid "Create team" msgstr "Créer une équipe" @@ -649,16 +649,16 @@ msgid "You are already in a team." msgstr "Vous êtes déjà dans une équipe." #: apps/participation/views.py:82 corres2math/templates/base.html:82 -#: corres2math/templates/base.html:226 +#: corres2math/templates/base.html:228 msgid "Join team" msgstr "Rejoindre une équipe" -#: apps/participation/views.py:133 apps/participation/views.py:320 -#: apps/participation/views.py:353 +#: apps/participation/views.py:133 apps/participation/views.py:325 +#: apps/participation/views.py:358 msgid "You are not in a team." msgstr "Vous n'êtes pas dans une équipe." -#: apps/participation/views.py:134 apps/participation/views.py:354 +#: apps/participation/views.py:134 apps/participation/views.py:359 msgid "You don't participate, so you don't have any team." msgstr "Vous ne participez pas, vous n'avez donc pas d'équipe." @@ -694,43 +694,43 @@ msgstr "Vous n'êtes pas administrateur." msgid "This team has no pending validation." msgstr "L'équipe n'a pas de validation en attente." -#: apps/participation/views.py:235 +#: apps/participation/views.py:240 msgid "You must specify if you validate the registration or not." msgstr "Vous devez spécifier si vous validez l'inscription ou non." -#: apps/participation/views.py:263 +#: apps/participation/views.py:268 #, python-brace-format msgid "Update team {trigram}" msgstr "Mise à jour de l'équipe {trigram}" -#: apps/participation/views.py:300 apps/registration/views.py:243 +#: apps/participation/views.py:305 apps/registration/views.py:253 #, python-brace-format msgid "Photo authorization of {student}.{ext}" msgstr "Autorisation de droit à l'image de {student}.{ext}" -#: apps/participation/views.py:304 +#: apps/participation/views.py:309 #, python-brace-format msgid "Photo authorizations of team {trigram}.zip" msgstr "Autorisations de droit à l'image de l'équipe {trigram}.zip" -#: apps/participation/views.py:322 +#: apps/participation/views.py:327 msgid "The team is already validated or the validation is pending." msgstr "La validation de l'équipe est déjà faite ou en cours." -#: apps/participation/views.py:366 +#: apps/participation/views.py:371 msgid "The team is not validated yet." msgstr "L'équipe n'est pas encore validée." -#: apps/participation/views.py:376 +#: apps/participation/views.py:381 #, python-brace-format msgid "Participation of team {trigram}" msgstr "Participation de l'équipe {trigram}" -#: apps/participation/views.py:413 +#: apps/participation/views.py:418 msgid "Create question" msgstr "Créer une question" -#: apps/participation/views.py:510 +#: apps/participation/views.py:518 msgid "Calendar update" msgstr "Mise à jour du calendrier" @@ -923,8 +923,8 @@ msgid "Your password has been set. You may go ahead and log in now." msgstr "Votre mot de passe a été changé. Vous pouvez désormais vous connecter." #: apps/registration/templates/registration/password_reset_complete.html:10 -#: corres2math/templates/base.html:130 corres2math/templates/base.html:221 -#: corres2math/templates/base.html:222 +#: corres2math/templates/base.html:132 corres2math/templates/base.html:223 +#: corres2math/templates/base.html:224 #: corres2math/templates/registration/login.html:7 #: corres2math/templates/registration/login.html:8 #: corres2math/templates/registration/login.html:25 @@ -981,7 +981,7 @@ msgstr "Réinitialiser mon mot de passe" #: apps/registration/templates/registration/signup.html:5 #: apps/registration/templates/registration/signup.html:8 #: apps/registration/templates/registration/signup.html:20 -#: apps/registration/views.py:28 +#: apps/registration/views.py:29 msgid "Sign up" msgstr "Inscription" @@ -1058,45 +1058,49 @@ msgid "Update user" msgstr "Modifier l'utilisateur" #: apps/registration/templates/registration/user_detail.html:77 -#: apps/registration/views.py:206 +#: apps/registration/views.py:216 msgid "Upload photo authorization" msgstr "Téléverser l'autorisation de droit à l'image" -#: apps/registration/views.py:64 +#: apps/registration/views.py:37 +msgid "You can't register now." +msgstr "Vous ne pouvez pas vous inscrire maintenant." + +#: apps/registration/views.py:74 msgid "Email validation" msgstr "Validation de l'adresse mail" -#: apps/registration/views.py:66 +#: apps/registration/views.py:76 msgid "Validate email" msgstr "Valider l'adresse mail" -#: apps/registration/views.py:105 +#: apps/registration/views.py:115 msgid "Email validation unsuccessful" msgstr "Échec de la validation de l'adresse mail" -#: apps/registration/views.py:116 +#: apps/registration/views.py:126 msgid "Email validation email sent" msgstr "Mail de confirmation de l'adresse mail envoyé" -#: apps/registration/views.py:124 +#: apps/registration/views.py:134 msgid "Resend email validation link" msgstr "Renvoyé le lien de validation de l'adresse mail" -#: apps/registration/views.py:158 +#: apps/registration/views.py:168 #, python-brace-format msgid "Detail of user {user}" msgstr "Détails de l'utilisateur {user}" -#: apps/registration/views.py:179 +#: apps/registration/views.py:189 #, python-brace-format msgid "Update user {user}" msgstr "Mise à jour de l'utilisateur {user}" -#: corres2math/settings.py:154 +#: corres2math/settings.py:157 msgid "English" msgstr "Anglais" -#: corres2math/settings.py:155 +#: corres2math/settings.py:158 msgid "French" msgstr "Français" @@ -1181,19 +1185,19 @@ msgstr "Chercher ..." msgid "Return to admin view" msgstr "Retourner à l'interface administrateur" -#: corres2math/templates/base.html:126 +#: corres2math/templates/base.html:127 msgid "Register" msgstr "S'inscrire" -#: corres2math/templates/base.html:142 +#: corres2math/templates/base.html:144 msgid "My account" msgstr "Mon compte" -#: corres2math/templates/base.html:145 +#: corres2math/templates/base.html:147 msgid "Log out" msgstr "Déconnexion" -#: corres2math/templates/base.html:162 +#: corres2math/templates/base.html:164 #, python-format msgid "" "Your email address is not validated. Please click on the link you received " @@ -1204,11 +1208,11 @@ msgstr "" "avez reçu par mail. Vous pouvez renvoyer un mail en cliquant sur ce lien." -#: corres2math/templates/base.html:186 +#: corres2math/templates/base.html:188 msgid "Contact us" msgstr "Nous contacter" -#: corres2math/templates/base.html:219 +#: corres2math/templates/base.html:221 msgid "Search results" msgstr "Résultats de la recherche"