From 3741557200fa755d463303abe11596397bc22108 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 22 Sep 2020 18:24:51 +0200 Subject: [PATCH] Ask teams if they accept to publish their videos --- .../0002_team_grant_animath_access_videos.py | 18 +++ apps/participation/models.py | 6 + locale/fr/LC_MESSAGES/django.po | 111 ++++++++++-------- 3 files changed, 86 insertions(+), 49 deletions(-) create mode 100644 apps/participation/migrations/0002_team_grant_animath_access_videos.py diff --git a/apps/participation/migrations/0002_team_grant_animath_access_videos.py b/apps/participation/migrations/0002_team_grant_animath_access_videos.py new file mode 100644 index 0000000..7832ade --- /dev/null +++ b/apps/participation/migrations/0002_team_grant_animath_access_videos.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.1 on 2020-09-22 16:21 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('participation', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='team', + name='grant_animath_access_videos', + field=models.BooleanField(default=False, help_text='Give the authorisation to publish the video on the main website to promote the action.', verbose_name='Grant Animath to publish my video'), + ), + ] diff --git a/apps/participation/models.py b/apps/participation/models.py index 8074f65..6584c9b 100644 --- a/apps/participation/models.py +++ b/apps/participation/models.py @@ -25,6 +25,12 @@ class Team(models.Model): help_text=_("The access code let other people to join the team."), ) + grant_animath_access_videos = models.BooleanField( + verbose_name=_("Grant Animath to publish my video"), + help_text=_("Give the authorisation to publish the video on the main website to promote the action."), + default=False, + ) + def __str__(self): return _("Team {name} ({trigram})").format(name=self.name, trigram=self.trigram) diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 4579841..1c9b256 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-09-21 18:11+0200\n" +"POT-Creation-Date: 2020-09-22 18:21+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Yohann D'ANELLO \n" "Language-Team: LANGUAGE \n" @@ -107,171 +107,180 @@ 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:29 +msgid "Grant Animath to publish my video" +msgstr "Autoriser Animath à publier ma vidéo" + +#: apps/participation/models.py:30 +msgid "" +"Give the authorisation to publish the video on the main website to promote " +"the action." +msgstr "" +"Donner l'autorisation de publier la vidéo sur le site principal pour promouvoir les Correspondances." + +#: apps/participation/models.py:35 #, python-brace-format msgid "Team {name} ({trigram})" msgstr "Équipe {name} ({trigram})" -#: apps/participation/models.py:32 apps/participation/models.py:43 -#: apps/registration/models.py:18 +#: apps/participation/models.py:38 apps/participation/models.py:49 +#: apps/registration/models.py:38 apps/registration/models.py:71 msgid "team" msgstr "équipe" -#: apps/participation/models.py:33 +#: apps/participation/models.py:39 msgid "teams" msgstr "équipes" -#: apps/participation/models.py:47 +#: apps/participation/models.py:53 #, python-brace-format msgid "Problem #{problem:d}" msgstr "Problème n°{problem:d}" -#: apps/participation/models.py:50 +#: apps/participation/models.py:56 msgid "problem number" msgstr "numéro de problème" -#: apps/participation/models.py:59 +#: apps/participation/models.py:65 msgid "solution video" msgstr "vidéo de solution" -#: apps/participation/models.py:68 +#: apps/participation/models.py:74 msgid "received participation" msgstr "participation reçue" -#: apps/participation/models.py:77 +#: apps/participation/models.py:83 msgid "synthesis video" msgstr "vidéo de synthèse" -#: apps/participation/models.py:81 +#: apps/participation/models.py:87 #, python-brace-format msgid "Participation of the team {name} ({trigram})" msgstr "Participation de l'équipe {name} ({trigram})" -#: apps/participation/models.py:84 apps/participation/models.py:92 +#: apps/participation/models.py:90 apps/participation/models.py:98 msgid "participation" msgstr "participation" -#: apps/participation/models.py:85 +#: apps/participation/models.py:91 msgid "participations" msgstr "participations" -#: apps/participation/models.py:96 +#: apps/participation/models.py:102 msgid "link" msgstr "lien" -#: apps/participation/models.py:97 +#: apps/participation/models.py:103 msgid "The full video link." msgstr "Le lien complet de la vidéo." -#: apps/participation/models.py:103 +#: apps/participation/models.py:109 msgid "valid" msgstr "valide" -#: apps/participation/models.py:104 +#: apps/participation/models.py:110 msgid "The video got the validation of the administrators." msgstr "La vidéo a été validée par les administrateurs." -#: apps/participation/models.py:108 +#: apps/participation/models.py:114 #, python-brace-format msgid "Video of team {name} ({trigram})" msgstr "Vidéo de l'équipe {name} ({trigram})" -#: apps/participation/models.py:112 +#: apps/participation/models.py:118 msgid "video" msgstr "vidéo" -#: apps/participation/models.py:113 +#: apps/participation/models.py:119 msgid "videos" msgstr "vidéos" -#: apps/registration/forms.py:9 +#: apps/registration/forms.py:11 msgid "role" msgstr "rôle" -#: apps/registration/forms.py:11 -#, fuzzy -#| msgid "participation" +#: apps/registration/forms.py:13 msgid "participant" -msgstr "participation" +msgstr "participant" -#: apps/registration/forms.py:12 apps/registration/models.py:70 +#: apps/registration/forms.py:14 apps/registration/models.py:80 msgid "coach" msgstr "encadrant" -#: apps/registration/models.py:23 +#: apps/registration/models.py:15 msgid "Grant Animath to contact me in the future about other actions" msgstr "" "Autoriser Animath à me recontacter à l'avenir à propos d'autres actions" -#: apps/registration/models.py:31 +#: apps/registration/models.py:23 #, python-brace-format msgid "registration of {first_name} {last_name}" msgstr "inscription de {first_name} {last_name}" -#: apps/registration/models.py:35 +#: apps/registration/models.py:27 msgid "registration" msgstr "inscription" -#: apps/registration/models.py:36 +#: apps/registration/models.py:28 msgid "registrations" msgstr "inscriptions" -#: apps/registration/models.py:42 +#: apps/registration/models.py:43 msgid "12th grade" msgstr "Terminale" -#: apps/registration/models.py:43 +#: apps/registration/models.py:44 msgid "11th grade" msgstr "Première" -#: apps/registration/models.py:44 +#: apps/registration/models.py:45 msgid "10th grade or lower" msgstr "Seconde ou inférieur" -#: apps/registration/models.py:46 +#: apps/registration/models.py:47 msgid "student class" msgstr "classe" -#: apps/registration/models.py:51 +#: apps/registration/models.py:52 msgid "school" msgstr "école" -#: apps/registration/models.py:56 +#: apps/registration/models.py:57 msgid "student" msgstr "étudiant" -#: apps/registration/models.py:59 +#: apps/registration/models.py:60 msgid "student registration" msgstr "inscription d'élève" -#: apps/registration/models.py:60 +#: apps/registration/models.py:61 msgid "student registrations" msgstr "inscriptions d'élève" -#: apps/registration/models.py:65 +#: apps/registration/models.py:75 msgid "professional activity" msgstr "activité professionnelle" -#: apps/registration/models.py:73 +#: apps/registration/models.py:83 msgid "coach registration" msgstr "inscription d'encadrant" -#: apps/registration/models.py:74 +#: apps/registration/models.py:84 msgid "coach registrations" msgstr "inscriptions d'encadrants" -#: apps/registration/models.py:79 +#: apps/registration/models.py:89 msgid "role of the administrator" msgstr "rôle de l'administrateur" -#: apps/registration/models.py:84 +#: apps/registration/models.py:94 msgid "admin" msgstr "admin" -#: apps/registration/models.py:87 +#: apps/registration/models.py:97 msgid "admin registration" msgstr "inscription d'administrateur" -#: apps/registration/models.py:88 +#: apps/registration/models.py:98 msgid "admin registrations" msgstr "inscriptions d'administrateur" @@ -352,21 +361,25 @@ msgstr "Administration" msgid "Return to admin view" msgstr "Retourner à l'interface administrateur" -#: templates/base.html:90 templates/registration/login.html:7 +#: templates/base.html:90 +msgid "Register" +msgstr "S'inscrire" + +#: templates/base.html:93 templates/registration/login.html:7 #: templates/registration/login.html:8 templates/registration/login.html:22 #: templates/registration/password_reset_complete.html:10 msgid "Log in" msgstr "Connexion" -#: templates/base.html:94 +#: templates/base.html:97 msgid "Log out" msgstr "Déconnexion" -#: templates/base.html:118 +#: templates/base.html:121 msgid "Contact us" msgstr "Nous contacter" -#: templates/base.html:141 +#: templates/base.html:144 msgid "Back to top" msgstr "Retour en haut" @@ -518,6 +531,6 @@ msgid "Reset my password" msgstr "Réinitialiser mon mot de passe" #: templates/registration/signup.html:5 templates/registration/signup.html:8 -#: templates/registration/signup.html:14 +#: templates/registration/signup.html:20 msgid "Sign up" msgstr "Inscription"