diff --git a/pod/locale/fr/LC_MESSAGES/django.po b/pod/locale/fr/LC_MESSAGES/django.po index b564a618b7..fb556ba9fb 100644 --- a/pod/locale/fr/LC_MESSAGES/django.po +++ b/pod/locale/fr/LC_MESSAGES/django.po @@ -45,6 +45,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" @@ -214,6 +215,9 @@ msgstr "" ======= "POT-Creation-Date: 2023-09-22 16:41+0200\n" >>>>>>> 21497cba ([DONE] Features for meeting: manage recording with token and send email when BBB recording available (#958)) +======= +"POT-Creation-Date: 2023-09-27 12:16+0000\n" +>>>>>>> afb1f348 ([DONE] Yaal Coop/Add PWA functionality to app and notifications capabilities (#937)) "PO-Revision-Date: \n" "Last-Translator: obado \n" "Language-Team: Pod Team pod@esup-portail.org\n" @@ -320,7 +324,11 @@ msgstr "Accepter les notifications" #: pod/authentication/models.py msgid "Receive push notifications on your devices." +<<<<<<< HEAD msgstr "Recevez des notifications push sur vos appareils." +======= +msgstr "Recevez des notifications push sur vos appareils" +>>>>>>> afb1f348 ([DONE] Yaal Coop/Add PWA functionality to app and notifications capabilities (#937)) #: pod/authentication/models.py pod/live/models.py pod/meeting/models.py #: pod/podfile/models.py pod/video/admin.py pod/video/models.py @@ -1086,6 +1094,7 @@ msgstr "Le fichier doit être au format VTT." #: pod/chapter/models.py pod/completion/models.py pod/enrichment/models.py #: pod/playlist/templates/playlist/playlist_card.html pod/video/models.py +#: pod/video_encode_transcript/utils.py msgid "video" msgstr "vidéo" @@ -2650,8 +2659,8 @@ msgid "" msgstr "" "Les champs \"Début\" et \"Fin\" doivent contenir des valeurs en secondes. " "Lancez la lecture de la vidéo, mettez sur pause et cliquez sur \"Récupérer " -"le temps depuis le lecteur\" pour renseigner automatiquement le champ \"Début" -"\". Vous pouvez le faire également pour remplir le champ \"Fin\"." +"le temps depuis le lecteur\" pour renseigner automatiquement le champ " +"\"Début\". Vous pouvez le faire également pour remplir le champ \"Fin\"." #: pod/enrichment/templates/enrichment/edit_enrichment.html msgid "You cannot overlap enrichments." @@ -3198,6 +3207,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "Cette vidéo a été téléversée sur Pod ; son origine est %(type)s : %(url)s" >>>>>>> 21497cba ([DONE] Features for meeting: manage recording with token and send email when BBB recording available (#958)) +======= +"Cette vidéo a été téléversée sur Pod ; son origine est %(type)s : %(url)s" +>>>>>>> afb1f348 ([DONE] Yaal Coop/Add PWA functionality to app and notifications capabilities (#937)) #: pod/import_video/views.py pod/meeting/views.py msgid "Try changing the record type or address for this recording." @@ -3286,8 +3300,8 @@ msgstr "" #: pod/import_video/views.py #, python-format msgid "" -"This video '%(name)s' was uploaded to Pod; its origin is Youtube: %(url)s" +"This video '%(name)s' was uploaded to Pod; its origin is Youtube: %(url)s" msgstr "" <<<<<<< HEAD <<<<<<< HEAD @@ -6656,16 +6670,16 @@ msgid "" msgstr "" "\n" "

Bonjour,\n" -"

%(owner)s vous invite à une réunion récurrente " -"%(meeting_title)s.

\n" +"

%(owner)s vous invite à une réunion récurrente " +"%(meeting_title)s.

\n" "

Date de début : %(start_date_time)s

\n" "

Récurrent jusqu’à la date : %(end_date)s

\n" "

La réunion se tiendra tou(te)s les %(frequency)s %(recurrence)s \n" "

Voici le lien pour rejoindre la réunion :\n" " %(join_link)s

\n" -"

Vous avez besoin de ce mot de passe pour entrer : " -"%(password)s

\n" +"

Vous avez besoin de ce mot de passe pour entrer : " +"%(password)s

\n" "

Cordialement

\n" " " @@ -6691,8 +6705,8 @@ msgstr "" "

Date de fin : %(end_date)s

\n" "

Voici le lien pour rejoindre la réunion :\n" " %(join_link)s

\n" -"

Vous avez besoin de ce mot de passe pour entrer : " -"%(password)s

\n" +"

Vous avez besoin de ce mot de passe pour entrer : " +"%(password)s

\n" "

Cordialement

\n" " " @@ -8425,11 +8439,15 @@ msgstr "Vous ne pouvez pas éditer ce fichier." #: pod/progressive_web_app/templates/notification_toast.html msgid "Get application notifications" +<<<<<<< HEAD msgstr "Recevez les notifications de l’application" #: pod/progressive_web_app/templates/notification_toast.html msgid "Close notification panel" msgstr "Fermer le panneau de notification" +======= +msgstr "Recevez les notifications de l'application" +>>>>>>> afb1f348 ([DONE] Yaal Coop/Add PWA functionality to app and notifications capabilities (#937)) #: pod/progressive_web_app/templates/notification_toast.html msgid "" @@ -8437,7 +8455,11 @@ msgid "" "completed)." msgstr "" "Recevez des notifications pour des événements spécifiques (lorsque " +<<<<<<< HEAD "l’encodage d’une de vos vidéos est terminé)." +======= +"l'encodage d'une de vos vidéos est terminé)" +>>>>>>> afb1f348 ([DONE] Yaal Coop/Add PWA functionality to app and notifications capabilities (#937)) #: pod/progressive_web_app/templates/notification_toast.html msgid "Allow" @@ -8739,8 +8761,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 supports HTML5 video" +"browser that supports HTML5 video" msgstr "" "Pour visionner cette vidéo, veuillez activer JavaScript et envisager de " "passer à un navigateur Web qui un nouvel enregistrement a été ajouté sur la plateforme " "%(title_site)s à partir de l’enregistreur \"%(recorder)s\".
Pour " -"l’ajouter, cliquez sur le lien ci dessous.

" -"%(link_url)s
Si le lien n’est pas actif, il faut le copier-coller " -"dans la barre d’adresse de votre navigateur.

Cordialement

" +"l’ajouter, cliquez sur le lien ci dessous.

%(link_url)s
Si le lien n’est pas actif, il " +"faut le copier-coller dans la barre d’adresse de votre navigateur.

Cordialement

" #: pod/recorder/views.py msgid "New recording added." @@ -8835,6 +8858,17 @@ msgstr "L’enregistrement a été supprimé." msgid "Recorder for Studio not found." msgstr "Enregistreur studio non trouvé." +#: pod/settings.py +msgid "" +"Pod is aimed at users of our institutions, by allowing the publication of " +"videos in the fields of research (promotion of platforms, etc.), training " +"(tutorials, distance training, student reports, etc.), institutional life " +"(video of events), offering several days of content." +msgstr "" +"Pod a pour but de faciliter la mise à disposition de vidéo et de ce " +"fait, d’encourager l’utilisation de celles-ci dans le cadre de " +"l’enseignement et la recherche." + #: pod/urls.py msgid "Pod Administration" msgstr "Administration de Pod" @@ -9169,8 +9203,8 @@ msgid "" "%(url)s

\n" msgstr "" "vous pouvez changer la date de suppression en éditant votre vidéo :

\n" -"

" -"%(scheme)s:%(url)s

\n" +"

%(scheme)s:%(url)s

\n" "\n" #: pod/video/management/commands/check_obsolete_videos.py @@ -9379,10 +9413,6 @@ msgstr "" msgid "Date of event" msgstr "Date de l’évènement" -#: pod/video/models.py -msgid "The password is / will be encrypted." -msgstr "Le mot de passe est / sera encrypté." - #: pod/video/models.py msgid "Overview" msgstr "Vue d’ensemble" @@ -9997,8 +10027,8 @@ msgid "" "This video is chaptered. Click the chapter button on the video player to view them." msgstr "" -"Cette vidéo est chapitrée. Cliquez sur le bouton de chapitre sur le lecteur vidéo pour les voir." +"Cette vidéo est chapitrée. Cliquez sur le bouton de chapitre sur le lecteur vidéo pour les voir." #: pod/video/templates/videos/video-all-info.html msgid "Other versions" @@ -10917,6 +10947,24 @@ msgstr "le :" msgstr "le :" >>>>>>> 84406de6 ([DONE] RGAA 03.02 (#951)) +#: pod/video_encode_transcript/utils.py +#, fuzzy +#| msgid "Content" +msgid "content" +msgstr "Contenu" + +#: pod/video_encode_transcript/utils.py +#, fuzzy +#| msgid "Transcript" +msgid "Transcripting" +msgstr "Transcrire" + +#: pod/video_encode_transcript/utils.py +#, fuzzy +#| msgid "automatically transcripted" +msgid "automatically transcript" +msgstr "automatiquement transcrit" + #: pod/video_search/apps.py msgid "Video search" msgstr "Recherche de vidéo" @@ -10947,6 +10995,7 @@ msgstr "xAPI Esup-Pod" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -11123,3 +11172,11 @@ msgstr "xAPI Esup-Pod" >>>>>>> afb1f348 ([DONE] Yaal Coop/Add PWA functionality to app and notifications capabilities (#937)) ======= >>>>>>> 84406de6 ([DONE] RGAA 03.02 (#951)) +======= + +#~ msgid "Deny on all devices" +#~ msgstr "Refuser sur tous les appareils" + +#~ msgid "The password is / will be encrypted." +#~ msgstr "Le mot de passe est / sera encrypté." +>>>>>>> afb1f348 ([DONE] Yaal Coop/Add PWA functionality to app and notifications capabilities (#937)) diff --git a/pod/locale/fr/LC_MESSAGES/djangojs.po b/pod/locale/fr/LC_MESSAGES/djangojs.po index cde80b27d0..bfeca727c4 100644 --- a/pod/locale/fr/LC_MESSAGES/djangojs.po +++ b/pod/locale/fr/LC_MESSAGES/djangojs.po @@ -48,6 +48,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2023-08-30 12:33+0200\n" ======= ======= @@ -196,6 +197,9 @@ msgstr "" ======= "POT-Creation-Date: 2023-09-22 16:41+0200\n" >>>>>>> 21497cba ([DONE] Features for meeting: manage recording with token and send email when BBB recording available (#958)) +======= +"POT-Creation-Date: 2023-09-27 12:16+0000\n" +>>>>>>> afb1f348 ([DONE] Yaal Coop/Add PWA functionality to app and notifications capabilities (#937)) "PO-Revision-Date: \n" "Last-Translator: obado \n" "Language-Team: \n" @@ -1007,18 +1011,28 @@ msgstr "Voir plus" msgid "This folder is empty" msgstr "Ce dossier est vide" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: pod/progressive_web_app/static/js/notification-toast.js msgid "An error happened during notification subscription" msgstr "Une erreur s’est produite lors de l’abonnement aux notifications" +======= +#: pod/progressive_web_app/static/js/notification-toast.js +msgid "An error happened during notification subscription" +msgstr "Erreur durant la désinscription..." +>>>>>>> afb1f348 ([DONE] Yaal Coop/Add PWA functionality to app and notifications capabilities (#937)) #: pod/progressive_web_app/static/js/notification-toast.js msgid "" "Don't forget to allow notifications from this website in your browser's " "settings!" msgstr "" +<<<<<<< HEAD "N’oubliez pas d’autoriser les notifications provenant de ce site web dans " +======= +"N'oubliez pas d'autoriser les notifications provenant de ce site web dans " +>>>>>>> afb1f348 ([DONE] Yaal Coop/Add PWA functionality to app and notifications capabilities (#937)) "votre navigateur !" #: pod/progressive_web_app/static/js/notification-toast.js @@ -1040,7 +1054,11 @@ msgstr "Les notifications sont actuellement désactivées." #: pod/progressive_web_app/static/js/notification-toast.js msgid "Notifications are currently enabled." +<<<<<<< HEAD msgstr "Les notifications sont actuellement activées." +======= +msgstr "Les notifications sont actuellement activées" +>>>>>>> afb1f348 ([DONE] Yaal Coop/Add PWA functionality to app and notifications capabilities (#937)) #: pod/progressive_web_app/static/js/notification-toast.js msgid "Disable notifications" @@ -1058,6 +1076,7 @@ msgstr "Souscription aux notifications réussie." msgid "Error while subscribing to push notifications." msgstr "Une erreur est survenue lors de la souscription aux notifications." +<<<<<<< HEAD #: pod/video/static/js/ajax-display-channels.js <<<<<<< HEAD <<<<<<< HEAD @@ -1101,6 +1120,8 @@ msgstr "Chaînes" ======= >>>>>>> 96067166 ([DONE] Update : Displaying channels via AJAX (#910)) +======= +>>>>>>> afb1f348 ([DONE] Yaal Coop/Add PWA functionality to app and notifications capabilities (#937)) #: pod/video/static/js/ajax-display-channels.js msgid "%(count)s channel" msgid_plural "%(count)s channels" @@ -1511,7 +1532,11 @@ msgstr "Sélectionnez le type général de vidéo." #: pod/video/static/js/video_edit.js msgid "Get notified when the video encoding is finished." +<<<<<<< HEAD msgstr "Recevez une notification lorsque l’encodage de la vidéo est terminé." +======= +msgstr "Recevez une notification lorsque l'encodage de la vidéo est terminé." +>>>>>>> afb1f348 ([DONE] Yaal Coop/Add PWA functionality to app and notifications capabilities (#937)) #: pod/video/static/js/video_stats_view.js msgid "Title" @@ -1571,6 +1596,9 @@ msgstr "Titre court" <<<<<<< HEAD ======= +#~ msgid "Error" +#~ msgstr "Erreur" + #~ msgid "video" #~ msgid_plural "videos" #~ msgstr[0] "vidéo" diff --git a/pod/locale/nl/LC_MESSAGES/django.po b/pod/locale/nl/LC_MESSAGES/django.po index 0464b607d9..a29341cad6 100644 --- a/pod/locale/nl/LC_MESSAGES/django.po +++ b/pod/locale/nl/LC_MESSAGES/django.po @@ -50,6 +50,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2023-08-30 12:33+0200\n" ======= ======= @@ -204,6 +205,9 @@ msgstr "" ======= "POT-Creation-Date: 2023-09-22 16:41+0200\n" >>>>>>> 21497cba ([DONE] Features for meeting: manage recording with token and send email when BBB recording available (#958)) +======= +"POT-Creation-Date: 2023-09-27 12:16+0000\n" +>>>>>>> afb1f348 ([DONE] Yaal Coop/Add PWA functionality to app and notifications capabilities (#937)) "PO-Revision-Date: 2023-06-08 14:37+0200\n" "Last-Translator: obado \n" "Language-Team: \n" @@ -1021,6 +1025,7 @@ msgstr "" #: pod/chapter/models.py pod/completion/models.py pod/enrichment/models.py #: pod/playlist/templates/playlist/playlist_card.html pod/video/models.py +#: pod/video_encode_transcript/utils.py msgid "video" msgstr "" @@ -3019,8 +3024,8 @@ msgstr "" #: pod/import_video/views.py #, python-format msgid "" -"This video '%(name)s' was uploaded to Pod; its origin is Youtube: %(url)s" +"This video '%(name)s' was uploaded to Pod; its origin is Youtube: %(url)s" msgstr "" #: pod/import_video/views.py @@ -7476,10 +7481,13 @@ msgid "Get application notifications" msgstr "" #: pod/progressive_web_app/templates/notification_toast.html +<<<<<<< HEAD msgid "Close notification panel" msgstr "" #: pod/progressive_web_app/templates/notification_toast.html +======= +>>>>>>> afb1f348 ([DONE] Yaal Coop/Add PWA functionality to app and notifications capabilities (#937)) msgid "" "Get notified for specific events (when one of your video encoding is " "completed)." @@ -7750,8 +7758,8 @@ msgstr "" #: pod/video/templates/videos/video-element.html msgid "" "To view this video please enable JavaScript, and consider upgrading to a web " -"browser that supports HTML5 video" +"browser that supports HTML5 video" msgstr "" #: pod/recorder/templates/recorder/link_record.html @@ -7836,6 +7844,14 @@ msgstr "" msgid "Recorder for Studio not found." msgstr "" +#: pod/settings.py +msgid "" +"Pod is aimed at users of our institutions, by allowing the publication of " +"videos in the fields of research (promotion of platforms, etc.), training " +"(tutorials, distance training, student reports, etc.), institutional life " +"(video of events), offering several days of content." +msgstr "" + #: pod/urls.py msgid "Pod Administration" msgstr "" @@ -8322,10 +8338,6 @@ msgstr "" msgid "Date of event" msgstr "" -#: pod/video/models.py -msgid "The password is / will be encrypted." -msgstr "" - #: pod/video/models.py msgid "Overview" msgstr "" @@ -9703,6 +9715,18 @@ msgid "Transcripting" >>>>>>> 21497cba ([DONE] Features for meeting: manage recording with token and send email when BBB recording available (#958)) msgstr "" +#: pod/video_encode_transcript/utils.py +msgid "content" +msgstr "" + +#: pod/video_encode_transcript/utils.py +msgid "Transcripting" +msgstr "" + +#: pod/video_encode_transcript/utils.py +msgid "automatically transcript" +msgstr "" + #: pod/video_search/apps.py msgid "Video search" msgstr "" diff --git a/pod/locale/nl/LC_MESSAGES/djangojs.po b/pod/locale/nl/LC_MESSAGES/djangojs.po index c7a0ce04e8..f75b4f69b8 100644 --- a/pod/locale/nl/LC_MESSAGES/djangojs.po +++ b/pod/locale/nl/LC_MESSAGES/djangojs.po @@ -44,6 +44,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" @@ -201,6 +202,9 @@ msgstr "" ======= "POT-Creation-Date: 2023-09-22 16:41+0200\n" >>>>>>> 21497cba ([DONE] Features for meeting: manage recording with token and send email when BBB recording available (#958)) +======= +"POT-Creation-Date: 2023-09-27 12:16+0000\n" +>>>>>>> afb1f348 ([DONE] Yaal Coop/Add PWA functionality to app and notifications capabilities (#937)) "PO-Revision-Date: 2023-02-08 15:22+0100\n" "Last-Translator: obado \n" "Language-Team: \n" @@ -912,6 +916,50 @@ msgstr "" msgid "This folder is empty" msgstr "" +#: pod/progressive_web_app/static/js/notification-toast.js +msgid "An error happened during notification subscription" +msgstr "" + +#: pod/progressive_web_app/static/js/notification-toast.js +msgid "" +"Don't forget to allow notifications from this website in your browser's " +"settings!" +msgstr "" + +#: pod/progressive_web_app/static/js/notification-toast.js +msgid "" +"You have denied notifications in your browser, to enable them back you must " +"do it in your browser configuration menu." +msgstr "" + +#: pod/progressive_web_app/static/js/notification-toast.js +msgid "Enable notifications" +msgstr "" + +#: pod/progressive_web_app/static/js/notification-toast.js +msgid "Notifications are currently disabled." +msgstr "" + +#: pod/progressive_web_app/static/js/notification-toast.js +msgid "Notifications are currently enabled." +msgstr "" + +#: pod/progressive_web_app/static/js/notification-toast.js +msgid "Disable notifications" +msgstr "" + +#: pod/progressive_web_app/static/js/notification-toast.js +msgid "Unsubscribe from Push Messaging" +msgstr "" + +#: pod/progressive_web_app/static/js/notification-toast.js +msgid "Successfully subscribed to push notifications." +msgstr "" + +#: pod/progressive_web_app/static/js/notification-toast.js +msgid "Error while subscribing to push notifications." +msgstr "" + #: pod/video/static/js/ajax-display-channels.js <<<<<<< HEAD <<<<<<< HEAD diff --git a/pod/main/configuration.json b/pod/main/configuration.json index cf6836ac0e..c000e1b5c0 100644 --- a/pod/main/configuration.json +++ b/pod/main/configuration.json @@ -5084,4 +5084,4 @@ } } } -] \ No newline at end of file +] diff --git a/pod/settings.py b/pod/settings.py index b615ff958d..aefccfeffb 100644 --- a/pod/settings.py +++ b/pod/settings.py @@ -72,6 +72,9 @@ "pod.progressive_web_app", "pod.dressing", "pod.custom", + "pwa", + "pod.progressive_web_app", + "webpush", ] ## diff --git a/pod/video/static/js/video_edit.js b/pod/video/static/js/video_edit.js index 71c322292a..895e4807c5 100644 --- a/pod/video/static/js/video_edit.js +++ b/pod/video/static/js/video_edit.js @@ -137,3 +137,7 @@ if (document.getElementById("video_form")) { } } /** end channel **/ + +// Change notification setting text to stick with a video upload context +const notificationMessage = document.querySelector("#notification-toast>.toast-body>p") +notificationMessage.textContent = gettext("Get notified when the video encoding is finished.")