Skip to content

Commit

Permalink
[DONE] fix recuring date in edit meeting (EsupPortail#946)
Browse files Browse the repository at this point in the history 
* change position of calendar when it's opened in modal

* dev get date start value

* fix weekly recurring

* fix bug with recurring weekly meeting on monday

* add translation

* add pydoc

* fix recurring options and computing

* add aria-hidden in icon tags

* add pydoc on meeting model function

* fix recurrence and test

* fix translation, add optgroup for frequency, add unit test for weekly frequency on monday

* improve display of frequencies choices
  • Loading branch information
@ptitloup @vsabatie
ptitloup authored and vsabatie committed Nov 23, 2023
1 parent efc72eb commit 0ad76c1
Show file tree
Hide file tree
Showing 4 changed files with 239 additions and 111 deletions.
104 changes: 88 additions & 16 deletions pod/locale/fr/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"POT-Creation-Date: 2023-08-30 12:33+0200\n"
=======
"POT-Creation-Date: 2023-07-05 15:50+0200\n"
Expand Down Expand Up @@ -261,6 +262,8 @@ msgstr ""
>>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914))
=======
>>>>>>> 225adb2a ([DONE] RGAA 10.07 (Fix focus visibility) (#940))
=======
>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946))
"POT-Creation-Date: 2023-10-31 11:26+0000\n"
=======
"POT-Creation-Date: 2023-07-13 16:48+0200\n"
Expand Down Expand Up @@ -350,6 +353,8 @@ msgstr ""
>>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914))
=======
>>>>>>> f45acaee ([DONE] RGAA 10.07 (Fix focus visibility) (#940))
=======
>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946))
"POT-Creation-Date: 2023-08-30 12:33+0200\n"
=======
"POT-Creation-Date: 2023-07-05 15:50+0200\n"
Expand Down Expand Up @@ -453,12 +458,14 @@ msgstr ""
=======
"POT-Creation-Date: 2023-09-12 15:15+0000\n"
>>>>>>> b04f50a6 ([DONE] RGAA 10.07 (Fix focus visibility) (#940))
<<<<<<< HEAD
>>>>>>> f45acaee ([DONE] RGAA 10.07 (Fix focus visibility) (#940))
>>>>>>> 225adb2a ([DONE] RGAA 10.07 (Fix focus visibility) (#940))
"PO-Revision-Date: \n"
"Last-Translator: obado <[email protected]>\n"
"Language-Team: Pod Team [email protected]\n"
=======
<<<<<<< HEAD
"POT-Creation-Date: 2023-09-19 12:22+0000\n"
=======
"POT-Creation-Date: 2023-09-21 12:16+0000\n"
Expand Down Expand Up @@ -491,6 +498,15 @@ msgstr ""
"Last-Translator: obado <[email protected]>\n"
"Language-Team: Pod Team [email protected]\n"
>>>>>>> c35f7ee1 ([DONE] Bugfix of 3.4.0 (#983))
=======
=======
"POT-Creation-Date: 2023-09-19 12:22+0000\n"
>>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946))
"PO-Revision-Date: \n"
"Last-Translator: ptitloup <[email protected]>\n"
"Language-Team: Pod Team [email protected]\n"
>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946))
>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946))
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -3220,6 +3236,7 @@ msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"le temps depuis le lecteur\" pour renseigner automatiquement le champ "
"\"Début\". Vous pouvez le faire également pour remplir le champ \"Fin\"."
>>>>>>> 8eeb87fe (ajout)
Expand Down Expand Up @@ -3251,7 +3268,14 @@ msgstr ""
"le temps depuis le lecteur\" pour renseigner automatiquement le champ "
"\"Début\". Vous pouvez le faire également pour remplir le champ \"Fin\"."
>>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914))
<<<<<<< HEAD
>>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914))
=======
=======
"le temps depuis le lecteur\" pour renseigner automatiquement le champ \"Début"
"\". Vous pouvez le faire également pour remplir le champ \"Fin\"."
>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946))
>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946))

#: pod/enrichment/templates/enrichment/edit_enrichment.html
msgid "You cannot overlap enrichments."
Expand Down Expand Up @@ -3831,6 +3855,7 @@ msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"Cette vidéo a été téléversée sur Pod ; son origine est %(type)s : <a "
=======
"Cette vidéo a été téléversée sur Pod; son origine est %(type)s : <a "
Expand Down Expand Up @@ -3932,6 +3957,8 @@ msgstr ""
>>>>>>> 1a6e4c6c ([DONE]Feature import_video add MAX_UPLOAD_SIZE_ON_IMPORT parameter (#911))
=======
>>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914))
=======
>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946))
"Cette vidéo a été téléversée sur Pod ; son origine est %(type)s : <a href="
"\"%(url)s\" target=\"_blank\">%(url)s</a>"
=======
Expand Down Expand Up @@ -3960,6 +3987,8 @@ msgstr ""
>>>>>>> 8627d601 ([DONE]Feature import_video add MAX_UPLOAD_SIZE_ON_IMPORT parameter (#911))
=======
>>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914))
=======
>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946))
"Cette vidéo a été téléversée sur Pod ; son origine est %(type)s : <a "
=======
"Cette vidéo a été téléversée sur Pod; son origine est %(type)s : <a "
Expand Down Expand Up @@ -3988,8 +4017,18 @@ msgstr ""
"Cette vidéo a été téléversée sur Pod ; son origine est %(type)s : <a "
"href=\"%(url)s\" target=\"_blank\">%(url)s</a>"
>>>>>>> 83c6f9de ([DONE] A11y for 3.4.0 (#914))
<<<<<<< HEAD
>>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914))
<<<<<<< HEAD
>>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914))
=======
=======
=======
"Cette vidéo a été téléversée sur Pod ; son origine est %(type)s : <a href="
"\"%(url)s\" target=\"_blank\">%(url)s</a>"
>>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946))
>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946))
>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946))

#: pod/import_video/views.py pod/meeting/views.py
msgid "Try changing the record type or address for this recording."
Expand All @@ -4005,6 +4044,7 @@ msgid ""
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"This video '%(name)s' was uploaded to Pod; its origin is Youtube: <a href="
"\"%(url)s\" target=\"_blank\">%(url)s</a>"
=======
Expand All @@ -4027,6 +4067,10 @@ msgid ""
"This video '%(name)s' was uploaded to Pod; its origin is Youtube : <a "
"href=\"%(url)s\" target=\"_blank\">%(url)s</a>"
>>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914))
=======
"This video '%(name)s' was uploaded to Pod; its origin is Youtube : <a href="
"\"%(url)s\" target=\"_blank\">%(url)s</a>"
>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946))
msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
Expand Down Expand Up @@ -7071,6 +7115,7 @@ msgstr "Options de récurrence"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a94d8e5 ([DONE] Update : Playlist (corrections) (#923))
=======
=======
Expand All @@ -7080,6 +7125,8 @@ msgstr "Options de récurrence"
=======
>>>>>>> 8b3d52bd ([DONE] Update : Playlist (corrections) (#923))
=======
>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946))
=======
>>>>>>> ee58a741 ([DONE] Update : Playlist (#857))
=======
#: pod/meeting/forms.py pod/video/forms.py
Expand All @@ -7089,21 +7136,40 @@ msgstr "Options de récurrence"
=======
=======
>>>>>>> 43dd9c9b ([DONE] Update : Playlist (corrections) (#923))
<<<<<<< HEAD
>>>>>>> 8b3d52bd ([DONE] Update : Playlist (corrections) (#923))
=======
=======
#: pod/meeting/forms.py pod/meeting/models.py
msgid "Start date must be less than recurring until date"
msgstr "La date de début doit être antérieure à la date de fin récurrente"

#: pod/meeting/forms.py pod/meeting/templates/meeting/add_or_edit.html
msgid ""
"In case of weekly recurring, the day of the start date must be selected."
msgstr ""
"En cas de récurrence hebdomadaire, le jour de la date de début doit être "
"sélectionné."

>>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946))
>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946))
#: pod/meeting/forms.py pod/playlist/forms.py pod/video/forms.py
msgid "Owner of the video cannot be an additional owner too"
msgstr ""
"Le propriétaire de la video ne peut pas être propriétaire additionnel en "
"même temps"
>>>>>>> db188f15 ([DONE] Update : Playlist (#857))

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: pod/meeting/forms.py pod/video/forms.py
>>>>>>> 776d6e3f ([DONE] Fix : accessibility issues (#913))
=======
>>>>>>> 43dd9c9b ([DONE] Update : Playlist (corrections) (#923))
=======
=======
>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946))
#: pod/meeting/forms.py pod/meeting/models.py
msgid "Start date must be less than recurring until date"
msgstr "La date de début doit être antérieure à la date de fin récurrente"
Expand Down Expand Up @@ -7170,7 +7236,11 @@ msgstr ""
"même temps"

=======
<<<<<<< HEAD
>>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946))
=======
>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946))
>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946))
#: pod/meeting/forms.py
msgid "Voice bridge must be a 5-digit number in the range 10000 to 99999"
msgstr ""
Expand Down Expand Up @@ -7728,10 +7798,6 @@ msgstr "Impossible de trouver des informations sur la réunion"
msgid "End the meeting"
msgstr "Terminer la réunion"

#: pod/meeting/templates/meeting/recurring_options_modal_form.html
msgid "Frequency"
msgstr "Fréquence"

#: pod/meeting/templates/meeting/recurring_options_modal_form.html
msgid "Repeat every"
msgstr "Répéter tou(te)s les"
Expand Down Expand Up @@ -7867,16 +7933,16 @@ msgid ""
msgstr ""
"\n"
" <p>Bonjour,\n"
" <p>%(owner)s vous invite à une réunion récurrente "
"<b>%(meeting_title)s</b>.</p>\n"
" <p>%(owner)s vous invite à une réunion récurrente <b>"
"%(meeting_title)s</b>.</p>\n"
" <p>Date de début : %(start_date_time)s </p>\n"
" <p>Récurrent jusqu’à la date : %(end_date)s </p>\n"
" <p>La réunion se tiendra tou(te)s les %(frequency)s %(recurrence)s </"
"p>\n"
" <p>Voici le lien pour rejoindre la réunion :\n"
" <a href=\"%(join_link)s\">%(join_link)s</a></p>\n"
" <p>Vous avez besoin de ce mot de passe pour entrer : "
"<b>%(password)s</b> </p>\n"
" <p>Vous avez besoin de ce mot de passe pour entrer : <b>"
"%(password)s</b> </p>\n"
" <p>Cordialement</p>\n"
" "

Expand All @@ -7902,8 +7968,8 @@ msgstr ""
" <p>Date de fin : %(end_date)s </p>\n"
" <p>Voici le lien pour rejoindre la réunion :\n"
" <a href=\"%(join_link)s\">%(join_link)s</a></p>\n"
" <p>Vous avez besoin de ce mot de passe pour entrer : "
"<b>%(password)s</b> </p>\n"
" <p>Vous avez besoin de ce mot de passe pour entrer : <b>"
"%(password)s</b> </p>\n"
" <p>Cordialement</p>\n"
" "

Expand Down Expand Up @@ -11081,8 +11147,8 @@ msgstr "Prévisualisation d’enregistrement"
#: pod/video/templates/videos/video-element.html
msgid ""
"To view this video please enable JavaScript, and consider upgrading to a web "
"browser that <a href=\"https://videojs.com/html5-video-support/\" "
"target=\"_blank\">supports HTML5 video</a>"
"browser that <a href=\"https://videojs.com/html5-video-support/\" target="
"\"_blank\">supports HTML5 video</a>"
msgstr ""
"Pour visionner cette vidéo, veuillez activer JavaScript et envisager de "
"passer à un navigateur Web qui <a href=\"https://videojs.com/html5-video-"
Expand Down Expand Up @@ -11172,6 +11238,7 @@ msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 856119ca (ajout)
=======
Expand All @@ -11197,6 +11264,11 @@ msgstr ""
>>>>>>> 3a4a3085 ([DONE] Update : Displaying channels via AJAX (#910))
=======
>>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914))
=======
"l’ajouter, cliquez sur le lien ci dessous.</p><a href=\"%(link_url)s\">"
"%(link_url)s</a><br><i>Si le lien n’est pas actif, il faut le copier-coller "
"dans la barre d’adresse de votre navigateur.</i><p><p>Cordialement</p>"
>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946))

#: pod/recorder/views.py
msgid "New recording added."
Expand Down Expand Up @@ -11544,8 +11616,8 @@ msgid ""
"%(url)s</a></p>\n"
msgstr ""
"vous pouvez changer la date de suppression en éditant votre vidéo :</p>\n"
"<p><a href=\"%(scheme)s:%(url)s\" rel=\"noopener\" "
"target=\"_blank\">%(scheme)s:%(url)s</a></p>\n"
"<p><a href=\"%(scheme)s:%(url)s\" rel=\"noopener\" target=\"_blank\">"
"%(scheme)s:%(url)s</a></p>\n"
"\n"

#: pod/video/management/commands/check_obsolete_videos.py
Expand Down Expand Up @@ -12445,8 +12517,8 @@ msgid ""
"This video is chaptered. Click the chapter button <span class=\"vjs-icon-"
"chapters\"></span> on the video player to view them."
msgstr ""
"Cette vidéo est chapitrée. Cliquez sur le bouton de chapitre <span "
"class=\"vjs-icon-chapters\"></span> sur le lecteur vidéo pour les voir."
"Cette vidéo est chapitrée. Cliquez sur le bouton de chapitre <span class="
"\"vjs-icon-chapters\"></span> sur le lecteur vidéo pour les voir."

#: pod/video/templates/videos/video-all-info.html
msgid "Other versions"
Expand Down
Loading

0 comments on commit 0ad76c1

Please sign in to comment.