diff --git a/pod/chapter/static/js/chapters.js b/pod/chapter/static/js/chapters.js index b82d4828c7..1b3bcace05 100644 --- a/pod/chapter/static/js/chapters.js +++ b/pod/chapter/static/js/chapters.js @@ -21,7 +21,7 @@ function show_form(data) { if (inputStart) { inputStart.insertAdjacentHTML( "beforebegin", - " " + + " " + gettext("Get time from the player") + " ", ); diff --git a/pod/chapter/templates/video_chapter.html b/pod/chapter/templates/video_chapter.html index 749a16aabe..eb42dbdad8 100644 --- a/pod/chapter/templates/video_chapter.html +++ b/pod/chapter/templates/video_chapter.html @@ -63,12 +63,12 @@

{% endif %}

{% trans "Help"%}

-
-

{% trans '"Add a new chapter" allows you to add a new chapter, "modify" allows you to modify it and "delete" allows you to remove the chapter.' %}

-

{% trans 'Start playback of the video, pause the video and click on "Get time from the player" to fill in the field untitled "Start time".' %}

+

{% trans '“Add a new chapter” allows you to add a chapter to the video, “modify” allows you to edit it and “delete” allows you to remove the chapter.' %}

+

{% trans 'Start playback of the video, pause the video and click on “Get time from the player” to fill in the field untitled “Start time”.' %}

{% trans 'The chapters cannot start at the same time.' %}

{% trans 'You must save your chapters to view the result.' %}

diff --git a/pod/completion/static/css/completion.css b/pod/completion/static/css/completion.css index 83ab5c47bc..d50aee21a8 100644 --- a/pod/completion/static/css/completion.css +++ b/pod/completion/static/css/completion.css @@ -120,13 +120,6 @@ table#table_list_contributors thead th.contributor_name { .grid-list-track .track_kind.options > form, .grid-list-track .track_kind.options > #modifCapSubFile{ display: none;} } -/** Forms **/ - - -/** Aside **/ -.info-card { - display: none; -} /** Filepicker override **/ div.file-picker-overlay, @@ -142,4 +135,3 @@ textarea#id_description { .card-title { margin: .45rem; } - diff --git a/pod/completion/static/js/completion.js b/pod/completion/static/js/completion.js index dab64f045c..afb492e01c 100644 --- a/pod/completion/static/js/completion.js +++ b/pod/completion/static/js/completion.js @@ -131,10 +131,13 @@ var sendandgetform = async function (elt, action, name, form, list) { if (action == "new" || action == "form_save_new") { document.getElementById(form).innerHTML = '
'; - document.querySelectorAll(".info-card").forEach(function (element) { - element.style.display = "none"; + + document.querySelectorAll(`#card-completion-tips div:not(#${name}-info) .collapse`).forEach((collapsable) => { + bootstrap.Collapse.getOrCreateInstance(collapsable, { toggle: false }).hide(); }); - document.getElementById(name + "-info").style.display = "block"; + /* Display associated help in side menu */ + var compInfo = document.querySelector(`#${name}-info>.collapse`); + bootstrap.Collapse.getOrCreateInstance(compInfo).show(); let url = window.location.origin + href; let token = elt.csrfmiddlewaretoken.value; diff --git a/pod/completion/templates/video_completion.html b/pod/completion/templates/video_completion.html index b55cbaab9d..fde4597ba2 100644 --- a/pod/completion/templates/video_completion.html +++ b/pod/completion/templates/video_completion.html @@ -134,53 +134,57 @@

{% endif %} -
+

{% trans "Help"%}

- -
-

{% trans 'List of people related to this video.' %}

-

{% trans 'A contributor must at least have a name and a role. You can also join the email of this contributor as well as a link (professional website for example).' %}

-
-
-
- -
-

{% trans 'Subtitle(s) and/or captions(s) related to this video.' %}

- -

{% trans 'You can add several subtitle or caption files to a single video (for example, in order to subtitle or caption this video in several languages' %}

-

{% trans 'Subtitle and/or caption file(s) must be in “.vtt” format.' %}

-

{% trans 'You can use' %} {% trans 'Video Caption Maker' %} {% trans 'to create your subtitle(s) and/or caption(s) file(s).' %}

-

{% trans 'You will need the URL of this video to make subtitles and/or captions. This URL is a direct access to this video. Please do not communicate it outside of this site to avoid any misuse.' %}

-
    - {% for vid in video.get_video_mp4 %} -
  • {{vid.name}}:
    • - {% endfor %} - {% if video.is_video == False and video.get_video_mp3 %} -
  • {{video.get_video_mp3.name}}:
    • - {% endif %} -
-
-
-
- -
-

{% trans 'Document(s) related to this video. These documents will be downloadable by users.' %}

-

{% trans 'Be careful, not to be confused with enrichment. These documents are attached to the video, not integrated.' %}

-
-
-
- -
-

{% trans 'Overlay allows you to display text (with ou without html tag) over the video at specific times and positions.' %}

-

{% trans 'You can add a solid background or a transparent background to the text you want to display with the option "Show background"' %}

+
+
+ +
+

{% trans 'List of people related to this video.' %}

+

{% trans 'A contributor must at least have a name and a role. You can also join the email of this contributor as well as a link (professional website for example).' %}

+
+
+
+ +
+

{% trans 'Subtitle(s) and/or captions(s) related to this video.' %}

+ +

{% trans 'You can add several subtitle or caption files to a single video (for example, in order to subtitle or caption this video in several languages' %}

+

{% trans 'Subtitle and/or caption file(s) must be in “.vtt” format.' %}

+

{% trans 'You can use' %} {% trans 'Video Caption Maker' %} {% trans 'to create your subtitle(s) and/or caption(s) file(s).' %}

+

{% trans 'You will need the URL of this video to make subtitles and/or captions. This URL is a direct access to this video. Please do not communicate it outside of this site to avoid any misuse.' %}

+
    + {% for vid in video.get_video_mp4 %} +
  • {{vid.name}}:
    • + {% endfor %} + {% if video.is_video == False and video.get_video_mp3 %} +
  • {{video.get_video_mp3.name}}:
    • + {% endif %} +
+
+
+
+ +
+

{% trans 'Document(s) related to this video. These documents will be downloadable by users.' %}

+

{% trans 'Be careful, not to be confused with enrichment. These documents are attached to the video, not integrated.' %}

+
+
+
+ +
+

{% trans 'Overlay allows you to display text (with ou without html tag) over the video at specific times and positions.' %}

+

{% trans 'You can add a solid background or a transparent background to the text you want to display with the option "Show background"' %}

+
+
{% endblock page_aside %} diff --git a/pod/cut/templates/video_cut.html b/pod/cut/templates/video_cut.html index 8f2c9fb079..f4e40ce98f 100644 --- a/pod/cut/templates/video_cut.html +++ b/pod/cut/templates/video_cut.html @@ -121,7 +121,7 @@

{% endif %}

{% trans "Help"%}

-
diff --git a/pod/import_video/views.py b/pod/import_video/views.py index 3f744f9509..68a3afa410 100644 --- a/pod/import_video/views.py +++ b/pod/import_video/views.py @@ -426,7 +426,7 @@ def upload_bbb_recording_to_pod(request, record_id): recording = ExternalRecording.objects.get(id=record_id) source_url = request.POST.get("source_url") - # Step 1 : Download and parse the remote HTML file if necessary + # Step 1: Download and parse the remote HTML file if necessary # Check if extension is a video extension extension = source_url.split(".")[-1].lower() if extension in VIDEO_ALLOWED_EXTENSIONS: @@ -440,7 +440,7 @@ def upload_bbb_recording_to_pod(request, record_id): # Verify that video exists and not oversised verify_video_exists_and_size(source_video_url) - # Step 2 : Define destination source file + # Step 2: Define destination source file extension = source_video_url.split(".")[-1].lower() discrim = datetime.now().strftime("%Y%m%d%H%M%S") dest_file = os.path.join( @@ -452,16 +452,16 @@ def upload_bbb_recording_to_pod(request, record_id): os.makedirs(os.path.dirname(dest_file), exist_ok=True) - # Step 3 : Download the video file + # Step 3: Download the video file download_video_file(source_video_url, dest_file) - # Step 4 : Save informations about the recording + # Step 4: Save informations about the recording recording_title = request.POST.get("recording_name") save_external_recording(request, record_id) - # Step 5 : Save and encode Pod video + # Step 5: Save and encode Pod video description = _( - "This video was uploaded to Pod; its origin is %(type)s : " + "This video was uploaded to Pod; its origin is %(type)s: " '%(url)s' ) % {"type": recording.get_type_display(), "url": source_video_url} @@ -489,7 +489,7 @@ def upload_youtube_recording_to_pod(request, record_id): """Upload Youtube recording to Pod. Use PyTube with its API - More information : https://pytube.io/en/latest/api.html + More information: https://pytube.io/en/latest/api.html Args: request (Request): HTTP request record_id (Integer): id record in the database @@ -511,8 +511,8 @@ def upload_youtube_recording_to_pod(request, record_id): # use_oauth=True, # allow_oauth_cache=True ) - # Publish date (format : 2023-05-13 00:00:00) - # Event date (format : 2023-05-13) + # Publish date (format: 2023-05-13 00:00:00) + # Event date (format: 2023-05-13) date_evt = str(yt_video.publish_date)[0:10] # Setting video resolution @@ -540,13 +540,13 @@ def upload_youtube_recording_to_pod(request, record_id): # Download video yt_stream.download(dest_dir, filename=filename) - # Step 4 : Save informations about the recording + # Step 4: Save informations about the recording save_external_recording(request, record_id) - # Step 5 : Save and encode Pod video + # Step 5: Save and encode Pod video description = _( "This video '%(name)s' was uploaded to Pod; " - 'its origin is Youtube : %(url)s' + 'its origin is Youtube: %(url)s' ) % {"name": yt_video.title, "url": source_url} recording_title = request.POST.get("recording_name") save_video(request, dest_file, recording_title, description, date_evt) @@ -592,7 +592,7 @@ def upload_youtube_recording_to_pod(request, record_id): def upload_peertube_recording_to_pod(request, record_id): # noqa: C901 """Upload Peertube recording to Pod. - More information : https://docs.joinpeertube.org/api/rest-getting-started + More information: https://docs.joinpeertube.org/api/rest-getting-started Args: request (Request): HTTP request record_id (Integer): id record in the database @@ -610,11 +610,11 @@ def upload_peertube_recording_to_pod(request, record_id): # noqa: C901 # Check if extension is a video extension extension = source_url.split(".")[-1].lower() if extension in VIDEO_ALLOWED_EXTENSIONS: - # URL corresponds to a video file. Format example : + # URL corresponds to a video file. Format example: # - https://xxxx.fr/download/videos/id-quality.mp4 - # with : id = id/uuid/shortUUID, quality=480/720/1080 + # with: id = id/uuid/shortUUID, quality=480/720/1080 source_video_url = source_url - # PeerTube API for this video : + # PeerTube API for this video: # https://xxxx.fr/api/v1/videos/id pos_pt = source_url.rfind("-") if pos_pt != -1: @@ -630,11 +630,11 @@ def upload_peertube_recording_to_pod(request, record_id): # noqa: C901 msg["proposition"] = _("Try changing the address of the recording.") raise ValueError(msg) else: - # URL corresponds to a PeerTube URL. Format example : + # URL corresponds to a PeerTube URL. Format example: # - https://xxx.fr/w/id # - https://xxx.fr/videos/watch/id - # with : id = id/uuid/shortUUID - # PeerTube API for this video : + # with: id = id/uuid/shortUUID + # PeerTube API for this video: # https://xxxx.fr/api/v1/videos/id url_api_video = source_url.replace("/w/", "/api/v1/videos/") url_api_video = url_api_video.replace("/videos/watch/", "/api/v1/videos/") @@ -663,9 +663,9 @@ def upload_peertube_recording_to_pod(request, record_id): # noqa: C901 pt_video_description = "" else: pt_video_description = pt_video_description.replace("\r\n", "
") - # Creation date (format : 2023-05-23T08:16:34.690Z) + # Creation date (format: 2023-05-23T08:16:34.690Z) pt_video_created_at = pt_video_json["createdAt"] - # Evant date (format : 2023-05-23) + # Evant date (format: 2023-05-23) date_evt = pt_video_created_at[0:10] # Source video file source_video_url = pt_video_json["files"][0]["fileDownloadUrl"] @@ -673,7 +673,7 @@ def upload_peertube_recording_to_pod(request, record_id): # noqa: C901 # Verify that video exists and not oversized verify_video_exists_and_size(source_video_url) - # Step 2 : Define destination source file + # Step 2: Define destination source file discrim = datetime.now().strftime("%Y%m%d%H%M%S") extension = source_video_url.split(".")[-1].lower() dest_file = os.path.join( @@ -684,16 +684,16 @@ def upload_peertube_recording_to_pod(request, record_id): # noqa: C901 ) os.makedirs(os.path.dirname(dest_file), exist_ok=True) - # Step 3 : Download the video file + # Step 3: Download the video file download_video_file(source_video_url, dest_file) - # Step 4 : Save informations about the recording + # Step 4: Save informations about the recording recording_title = request.POST.get("recording_name") save_external_recording(request, record_id) - # Step 5 : Save and encode Pod video + # Step 5: Save and encode Pod video description = _( - "This video '%(name)s' was uploaded to Pod; its origin is PeerTube : " + "This video '%(name)s' was uploaded to Pod; its origin is PeerTube: " "%(url)s." ) % {"name": pt_video_name, "url": pt_video_url} description = ("%s
%s") % (description, pt_video_description) diff --git a/pod/locale/fr/LC_MESSAGES/django.mo b/pod/locale/fr/LC_MESSAGES/django.mo index e567abbeb2..339183b744 100644 Binary files a/pod/locale/fr/LC_MESSAGES/django.mo and b/pod/locale/fr/LC_MESSAGES/django.mo differ diff --git a/pod/locale/fr/LC_MESSAGES/django.po b/pod/locale/fr/LC_MESSAGES/django.po index f04093b56f..1aceb5e0c2 100644 --- a/pod/locale/fr/LC_MESSAGES/django.po +++ b/pod/locale/fr/LC_MESSAGES/django.po @@ -5,9 +5,9 @@ msgid "" msgstr "" "Project-Id-Version: Pod\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-21 12:16+0000\n" +"POT-Creation-Date: 2023-09-21 14:05+0000\n" "PO-Revision-Date: \n" -"Last-Translator: AymericJak \n" +"Last-Translator: obado \n" "Language-Team: Pod Team pod@esup-portail.org\n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -1036,21 +1036,21 @@ msgstr "Aide" #: pod/chapter/templates/video_chapter.html msgid "" -"\"Add a new chapter\" allows you to add a new chapter, \"modify\" allows you " -"to modify it and \"delete\" allows you to remove the chapter." +"“Add a new chapter” allows you to add a chapter to the video, “modify” " +"allows you to edit it and “delete” allows you to remove the chapter." msgstr "" -"\"Ajouter un nouveau chapitre\" permet d’ajouter un nouveau chapitre, " -"\"modifier\" permet de le modifier et \"supprimer\" permet de supprimer ce " +"« Ajouter un nouveau chapitre » permet d’ajouter un chapitre à la vidéo, " +"« modifier » permet de l’éditer et « supprimer » permet de retirer ce " "chapitre." #: pod/chapter/templates/video_chapter.html msgid "" -"Start playback of the video, pause the video and click on \"Get time from " -"the player\" to fill in the field untitled \"Start time\"." +"Start playback of the video, pause the video and click on “Get time from the " +"player” to fill in the field untitled “Start time”." msgstr "" -"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 du chapitre\"." +"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 du chapitre »." #: pod/chapter/templates/video_chapter.html msgid "The chapters cannot start at the same time." @@ -2118,8 +2118,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." @@ -2459,7 +2459,7 @@ msgstr "" #: pod/import_video/templates/import_video/list.html msgid "You need to create an external video before you can import it." -msgstr "Vous devez créer une vidéo externe avant de pouvoir l'importer." +msgstr "Vous devez créer une vidéo externe avant de pouvoir l’importer." #: pod/import_video/templates/import_video/list.html #: pod/meeting/templates/meeting/internal_recordings.html @@ -2620,11 +2620,11 @@ msgstr "Impossible de créer l’enregistrement externe" #: pod/import_video/views.py pod/meeting/views.py #, python-format msgid "" -"This video was uploaded to Pod; its origin is %(type)s : %(url)s" msgstr "" -"Cette vidéo a été téléversée sur Pod ; son origine est %(type)s : %(url)s" +"Cette vidéo a été téléversée sur Pod ; son origine est %(type)s : %(url)s" #: pod/import_video/views.py pod/meeting/views.py msgid "Try changing the record type or address for this recording." @@ -2635,11 +2635,11 @@ 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 "" "Cette vidéo « %(name)s » a été téléversée sur Pod ; son origine est " -"Youtube : %(url)s" +"Youtube : %(url)s" #: pod/import_video/views.py msgid "YouTube error" @@ -2692,7 +2692,7 @@ msgid "" "The address entered does not appear to be a valid PeerTube address or the " "PeerTube server is not responding as expected." msgstr "" -"L'adresse saisie ne semble pas être une adresse PeerTube valide ou le le " +"L’adresse saisie ne semble pas être une adresse PeerTube valide ou le le " "serveur PeerTube ne répond pas comme prévu." #: pod/import_video/views.py @@ -2703,7 +2703,7 @@ msgstr "" #: pod/import_video/views.py #, python-format msgid "" -"This video '%(name)s' was uploaded to Pod; its origin is PeerTube : %(url)s." msgstr "" "Cette vidéo « %(name)s » a été téléversée sur Pod ; son origine est " @@ -3272,7 +3272,7 @@ msgstr "L’évènement s’est terminé à :" #: pod/live/templates/live/event-iframe.html pod/live/templates/live/event.html msgid "The event is scheduled from:" -msgstr "L’événement est programmé du :" +msgstr "L’événement est programmé du :" #: pod/live/templates/live/event-iframe.html pod/live/templates/live/event.html msgid "to" @@ -3374,11 +3374,11 @@ msgstr "Attention, utilise une API Google" #: pod/live/templates/live/event-script.html msgid "Recording not done: " -msgstr "Impossible de commencer l'enregistrement : " +msgstr "Impossible de commencer l’enregistrement : " #: pod/live/templates/live/event-script.html msgid "Error calling" -msgstr "Erreur à l'appel de" +msgstr "Erreur à l’appel de" #: pod/live/templates/live/event-script.html msgid "Recording stopped" @@ -3386,15 +3386,15 @@ msgstr "Enregistrement arrêté" #: pod/live/templates/live/event-script.html msgid "Recording not stopped: " -msgstr "Impossible d'arrêter l'enregistrement : " +msgstr "Impossible d’arrêter l’enregistrement : " #: pod/live/templates/live/event-script.html msgid "Recording split done" -msgstr "Découpe de l'enregistrement effectué" +msgstr "Découpe de l’enregistrement effectué" #: pod/live/templates/live/event-script.html msgid "Recording not split: " -msgstr "Impossible de découper l'enregistrement : " +msgstr "Impossible de découper l’enregistrement : " #: pod/live/templates/live/event-script.html msgid "Video stream started (please wait a moment)" @@ -3402,7 +3402,7 @@ msgstr "Flux vidéo ouvert (patienter pour le rafraichissement)" #: pod/live/templates/live/event-script.html msgid "Video stream can not be started" -msgstr "Impossible d'ouvrir le flux vidéo" +msgstr "Impossible d’ouvrir le flux vidéo" #: pod/live/templates/live/event-script.html msgid "Video stream stopped (please wait a moment)" @@ -3426,7 +3426,7 @@ msgstr "Mes évènements" #: pod/live/templates/live/event.html msgid "Report the event" -msgstr "Signaler l'évènement" +msgstr "Signaler l’évènement" #: pod/live/templates/live/event.html msgid "Start stream" @@ -4629,7 +4629,7 @@ msgstr "Rechercher un média" #: pod/main/templates/navbar.html msgid "Start media search on" -msgstr "Lancer la recherche d'un média sur" +msgstr "Lancer la recherche d’un média sur" #: pod/main/templates/navbar.html msgid "Some features are unavailable" @@ -4740,16 +4740,20 @@ msgstr "Vos statistiques" #: pod/main/templates/navbar.html msgid "Number of videos:" -msgstr "Nombre de vidéos :" +msgstr "Nombre de vidéos :" #: pod/main/templates/navbar.html msgid "Number of playlists:" -msgstr "Nombre de listes de lecture :" +msgstr "Nombre de listes de lecture :" #: pod/main/templates/navbar.html msgid "Open login page" msgstr "Ouvrir la page de connexion" +#: pod/main/templates/navbar_collapse.html +msgid "Channel list" +msgstr "Liste des chaînes" + #: pod/main/templates/navbar_collapse.html msgid "Types of videos" msgstr "Types de vidéos" @@ -4951,7 +4955,7 @@ msgstr "Récurrence personnalisée" #: pod/meeting/models.py msgid "Specify the recurrence of the meeting: daily, weekly, monthly or yearly" msgstr "" -"Précisez la récurrence de la réunion : quotidienne, hebdomadaire, mensuelle " +"Précisez la récurrence de la réunion : quotidienne, hebdomadaire, mensuelle " "ou annuelle" #: pod/meeting/models.py @@ -5481,16 +5485,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" +"

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" " " @@ -5516,8 +5520,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" " " @@ -5572,7 +5576,7 @@ msgstr "Veuillez choisir une description. Celle-ci est vide par défaut." #: pod/playlist/forms.py pod/playlist/models.py #: pod/playlist/templates/playlist/filter_aside.html msgid "Right of access" -msgstr "Droit d'accès" +msgstr "Droit d’accès" #: pod/playlist/forms.py pod/playlist/models.py msgid "" @@ -5582,7 +5586,7 @@ msgid "" " " msgstr "" "\n" -" Veuillez choisir un droit d'accès entre 'public', 'protégée par " +" Veuillez choisir un droit d’accès entre 'public', 'protégée par " "un mot de passe', 'privée'.\n" " " @@ -5798,11 +5802,11 @@ msgstr "à" #: pod/playlist/templates/playlist/playlist-informations-card.html msgid "Right of access:" -msgstr "Droit d'accès :" +msgstr "Droit d’accès :" #: pod/playlist/templates/playlist/playlist-informations-card.html msgid "Playlist owner:" -msgstr "Propriétaire de la liste de lecture :" +msgstr "Propriétaire de la liste de lecture :" #: pod/playlist/templates/playlist/playlist-informations-card.html msgid "Access to playlist owner profile" @@ -5896,7 +5900,7 @@ msgstr "Supprimer la liste de lecture" #: pod/playlist/templates/playlist/playlist_player.html msgid "Playlist:" -msgstr "Liste de lecture :" +msgstr "Liste de lecture :" #: pod/playlist/templates/playlist/playlist_player.html msgid "View the playlist" @@ -5997,7 +6001,7 @@ msgstr "JSON au mauvais format" #: pod/playlist/views.py msgid "This video isn't present in this playlist." -msgstr "Cette vidéo n'est pas présente dans cette playlist." +msgstr "Cette vidéo n’est pas présente dans cette playlist." #: pod/podfile/apps.py msgid "Pod files" @@ -6102,7 +6106,7 @@ msgstr "Partager avec quelqu’un" #: pod/podfile/templates/podfile/home_content.html msgid "Already shared with:" -msgstr "Déjà partagé avec :" +msgstr "Déjà partagé avec :" #: pod/podfile/templates/podfile/home_content.html msgid "Username" @@ -6432,7 +6436,7 @@ msgstr "Taille du fichier" #: pod/recorder/models.py pod/video/models.py #: pod/video/templates/videos/video_sort_select.html msgid "Date added" -msgstr "Date d'ajout" +msgstr "Date d’ajout" #: pod/recorder/models.py msgid "Require manual claim?" @@ -6493,8 +6497,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." @@ -6923,8 +6928,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 @@ -7686,8 +7691,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" @@ -7747,7 +7752,7 @@ msgstr "Afficher les details des statistiques de visualisation" #: pod/video/templates/videos/video-info.html msgid "Addition in a playlist" -msgstr "Nombre d'ajouts dans une liste de lecture" +msgstr "Nombre d’ajouts dans une liste de lecture" #: pod/video/templates/videos/video-info.html msgid "Number of favorites" @@ -8286,12 +8291,12 @@ msgstr "Statistiques de visualisation des vidéos du thème %s" #: pod/video/views.py #, python-format msgid "You do not have access rights to this video: %s " -msgstr "Vous n’avez pas les droits d’accès à cette vidéo : %s " +msgstr "Vous n’avez pas les droits d’accès à cette vidéo : %s " #: pod/video/views.py #, python-format msgid "The following video does not exist: %s" -msgstr "La video suivante n’existe pas : %s" +msgstr "La video suivante n’existe pas : %s" #: pod/video/views.py msgid "Media upload" @@ -8494,7 +8499,7 @@ msgstr "Vous la/le retrouverez ici :" #: pod/video_encode_transcript/utils.py msgid "the:" -msgstr "le :" +msgstr "le :" #: pod/video_search/apps.py msgid "Video search" @@ -8523,67 +8528,3 @@ msgstr "Résultats de la recherche" #: pod/xapi/apps.py msgid "Esup-Pod xAPI" msgstr "xAPI Esup-Pod" - -#~ msgid "Get the video player time" -#~ msgstr "Obtenir le temps du lecteur" - -#~ msgid "content" -#~ msgstr "contenu" - -#, fuzzy -#~ msgid "Media file" -#~ msgstr "Fichier " - -#~ msgid "Added by" -#~ msgstr "Ajouté par" - -#~ msgid "Toggle your action menu" -#~ msgstr "Basculer votre menu d'actions" - -#~ msgid "Go to top" -#~ msgstr "Haut de page" - -#~ msgid "Edit the overlay" -#~ msgstr "Éditer la superposition" - -#~ msgid "Delete the overlay" -#~ msgstr "Supprimer la superposition" - -#~ msgid "Rename folder" -#~ msgstr "Renommer le dossier" - -#~ msgid "Delete folder" -#~ msgstr "Supprimer le dossier" - -#~ msgid "Share this folder" -#~ msgstr "Partager ce dossier" - -#~ msgid "End:" -#~ msgstr "Fin :" - -#~ msgid "%(counter)s Channel" -#~ msgid_plural "%(counter)s Channels" -#~ msgstr[0] "%(counter)s Chaîne" -#~ msgstr[1] "%(counter)s Chaînes" - -#~ msgid "%(counter)s Theme" -#~ msgid_plural "%(counter)s Themes" -#~ msgstr[0] "%(counter)s Thème" -#~ msgstr[1] "%(counter)s Thèmes" - -#~ msgid "No channels found" -#~ msgstr "Aucune chaîne trouvée" - -#~ msgid "Error in %s: " -#~ msgstr "Erreur sur %s : " - -#~ msgid "The" -#~ msgstr "Le" - -#~ msgid "Check this box if you want to transcript the audio. (beta version)" -#~ msgstr "" -#~ "Cocher cette case si vous voulez transcrire l’audio (version bêta, voir " -#~ "aide dans la colonne de droite)" - -#~ msgid "published" -#~ msgstr "publié" diff --git a/pod/locale/fr/LC_MESSAGES/djangojs.mo b/pod/locale/fr/LC_MESSAGES/djangojs.mo index a698c2dc1e..63d979d030 100644 Binary files a/pod/locale/fr/LC_MESSAGES/djangojs.mo and b/pod/locale/fr/LC_MESSAGES/djangojs.mo differ diff --git a/pod/locale/fr/LC_MESSAGES/djangojs.po b/pod/locale/fr/LC_MESSAGES/djangojs.po index 2385306660..90bd3c3108 100644 --- a/pod/locale/fr/LC_MESSAGES/djangojs.po +++ b/pod/locale/fr/LC_MESSAGES/djangojs.po @@ -5,16 +5,16 @@ msgid "" msgstr "" "Project-Id-Version: Esup-Pod\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-21 12:16+0000\n" +"POT-Creation-Date: 2023-09-21 14:05+0000\n" "PO-Revision-Date: \n" -"Last-Translator: AymericJak \n" +"Last-Translator: obado \n" "Language-Team: \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 3.3\n" +"X-Generator: Poedit 3.3.2\n" #: pod/chapter/static/js/chapters.js pod/enrichment/static/js/enrichment.js msgid "Get time from the player" @@ -170,6 +170,16 @@ msgstr "Veuillez entrer un texte pour le segment compris entre %s et %s :" msgid "Pause to enter caption for segment from %s to %s." msgstr "Mettez en pause pour entrer le texte du segment entre %s et %s." +#: pod/completion/static/js/caption_maker.js +#: pod/podfile/static/podfile/js/filewidget.js +msgid "Add" +msgstr "Ajouter" + +#: pod/completion/static/js/caption_maker.js +#: pod/video/static/js/comment-script.js +msgid "Delete" +msgstr "Supprimer" + #: pod/completion/static/js/caption_maker.js msgid "Caption" msgstr "Légende / Sous-titre" @@ -476,19 +486,19 @@ msgstr "" #: pod/playlist/static/playlist/js/add-or-edit.js msgid "Public: the playlist can be accessed by anyone." -msgstr "Public : la liste de lecture est accessible par tous." +msgstr "Public : la liste de lecture est accessible par tous." #: pod/playlist/static/playlist/js/add-or-edit.js msgid "" "Password-protected: the playlist can be accessed by anyone with the " "appropriate link and password." msgstr "" -"Protégé par un mot de passe : la liste de lecture est accessible à " +"Protégé par un mot de passe : la liste de lecture est accessible à " "toute personne disposant du lien et du mot de passe appropriés." #: pod/playlist/static/playlist/js/add-or-edit.js msgid "Private: only you have access to this playlist." -msgstr "Privé : vous seul avez accès à cette liste de lecture." +msgstr "Privé : vous seul avez accès à cette liste de lecture." #: pod/playlist/static/playlist/js/playlist-reorganize.js msgid "Save your reorganization" @@ -500,7 +510,12 @@ msgstr "Sauvegarder" #: pod/playlist/static/playlist/js/video-favorites-remove-card.js msgid "Network response was not ok." -msgstr "La réponse du réseau n'était pas correcte." +msgstr "La réponse du réseau n’était pas correcte." + +#: pod/podfile/static/podfile/js/filewidget.js +#: pod/video/static/js/change_video_owner.js +msgid "Loading…" +msgstr "Chargement en cours…" #: pod/podfile/static/podfile/js/filewidget.js msgid "Change image" @@ -530,10 +545,6 @@ msgstr "Retirer" msgid "Server error" msgstr "Erreur du serveur" -#: pod/podfile/static/podfile/js/filewidget.js -msgid "Add" -msgstr "Ajouter" - #: pod/podfile/static/podfile/js/filewidget.js msgid "Are you sure you want to delete this folder?" msgstr "Êtes-vous sûr(e) de vouloir supprimer ce dossier ?" @@ -547,25 +558,25 @@ msgid "This folder is empty" msgstr "Ce dossier est vide" #: pod/video/static/js/ajax-display-channels.js -msgid "Channel" -msgstr "Chaîne" +msgid "%(count)s channel" +msgid_plural "%(count)s channels" +msgstr[0] "%(count)s chaîne" +msgstr[1] "%(count)s chaînes" #: pod/video/static/js/ajax-display-channels.js msgid "No channels found" msgstr "Aucun chaîne trouvée" #: pod/video/static/js/ajax-display-channels.js -msgid "videos" -msgstr "vidéos" +msgid "%(count)s video" +msgid_plural "%(count)s videos" +msgstr[0] "%(count)s vidéo" +msgstr[1] "%(count)s vidéos" #: pod/video/static/js/change_video_owner.js msgid "No element found" msgstr "Aucun élément trouvé" -#: pod/video/static/js/change_video_owner.js -msgid "Loading…" -msgstr "Chargement en cours…" - #: pod/video/static/js/change_video_owner.js msgid "An error occurred during the change of owner" msgstr "Une erreur s’est produite lors du changement de propriétaire" @@ -582,22 +593,41 @@ msgstr "Réponse" msgid "Answers" msgstr "Réponses" -#: pod/video/static/js/comment-script.js -msgid "Delete" -msgstr "Supprimer" - #: pod/video/static/js/comment-script.js msgid "Cancel" msgstr "Annuler" +#: pod/video/static/js/comment-script.js +#, javascript-format +msgid "%s vote" +msgid_plural "%s votes" +msgstr[0] "%s vote" +msgstr[1] "%s votes" + #: pod/video/static/js/comment-script.js msgid "Agree with the comment" msgstr "D’accord avec ce commentaire" +#: pod/video/static/js/comment-script.js +msgid "Reply to comment" +msgstr "Répondre au commentaire" + +#: pod/video/static/js/comment-script.js +msgid "Reply" +msgstr "Répondre" + #: pod/video/static/js/comment-script.js msgid "Remove this comment" msgstr "Supprimer ce commentaire" +#: pod/video/static/js/comment-script.js +msgid "Add a public comment" +msgstr "Ajouter un commentaire public" + +#: pod/video/static/js/comment-script.js +msgid "Send" +msgstr "Envoyer" + #: pod/video/static/js/comment-script.js msgid "Show answers" msgstr "Afficher les réponses" @@ -610,13 +640,6 @@ msgstr "Mauvaise réponse du serveur." msgid "Sorry, you're not allowed to vote by now." msgstr "Désolé, vous n’êtes pas autorisé à voter maintenant." -#: pod/video/static/js/comment-script.js -#, javascript-format -msgid "%s vote" -msgid_plural "%s votes" -msgstr[0] "%s vote" -msgstr[1] "%s votes" - #: pod/video/static/js/comment-script.js msgid "Sorry, you can't comment this video by now." msgstr "Désolé, vous ne pouvez pas commenter cette vidéo maintenant." @@ -637,38 +660,47 @@ msgstr[0] "%s commentaire" msgstr[1] "%s commentaires" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "This content is password protected." msgstr "Ce contenu est protégé par mot de passe." #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "This content is chaptered." msgstr "Ce contenu est chapitré." #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "This content is in draft." msgstr "Ce contenu est en brouillon." #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Video content." msgstr "Contenu vidéo." #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Audio content." msgstr "Contenu audio." #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Edit the video" msgstr "Éditer la vidéo" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Complete the video" msgstr "Compléter la vidéo" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Chapter the video" msgstr "Chapitrer la vidéo" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Delete the video" msgstr "Supprimer la vidéo" @@ -741,6 +773,18 @@ msgstr "Désolé, aucune vidéo trouvée" msgid "Edit the category" msgstr "Éditer la catégorie" +#: pod/video/static/js/video_category.js +msgid "Delete the category" +msgstr "Supprimer la catégorie" + +#: pod/video/static/js/video_category.js +msgid "Success!" +msgstr "Succès !" + +#: pod/video/static/js/video_category.js +msgid "Error…" +msgstr "Erreur…" + #: pod/video/static/js/video_category.js msgid "Category created successfully" msgstr "Catégorie créée avec succès" @@ -813,32 +857,19 @@ msgstr "Ajouts en favoris total depuis la création" msgid "Slug" msgstr "Titre court" -#~ msgid "Channels" -#~ msgstr "Chaînes" - #~ msgid "video" -#~ msgstr "vidéo" - -#~ msgid "Reply to comment" -#~ msgstr "Répondre au commentaire" - -#~ msgid "Reply" -#~ msgstr "Répondre" +#~ msgid_plural "videos" +#~ msgstr[0] "vidéo" +#~ msgstr[1] "vidéos" -#~ msgid "Add a public comment" -#~ msgstr "Ajouter un commentaire public" - -#~ msgid "Send" -#~ msgstr "Envoyer" - -#~ msgid "Delete the category" -#~ msgstr "Supprimer la catégorie" +#~ msgid "Channels" +#~ msgstr "Chaînes" -#~ msgid "Success!" -#~ msgstr "Succès !" +#~ msgid "Channel" +#~ msgstr "Chaîne" -#~ msgid "Error…" -#~ msgstr "Erreur…" +#~ msgid "videos" +#~ msgstr "vidéos" #~ msgid "Are you sure you want to delete this element?" #~ msgstr "Êtes-vous sûr(e) de vouloir supprimer cet élément ?" diff --git a/pod/locale/nl/LC_MESSAGES/django.po b/pod/locale/nl/LC_MESSAGES/django.po index 00818bb9f7..3ad2b96d32 100644 --- a/pod/locale/nl/LC_MESSAGES/django.po +++ b/pod/locale/nl/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Pod\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-21 12:16+0000\n" +"POT-Creation-Date: 2023-09-21 14:05+0000\n" "PO-Revision-Date: 2023-06-08 14:37+0200\n" "Last-Translator: obado \n" "Language-Team: \n" @@ -979,14 +979,14 @@ msgstr "" #: pod/chapter/templates/video_chapter.html msgid "" -"\"Add a new chapter\" allows you to add a new chapter, \"modify\" allows you " -"to modify it and \"delete\" allows you to remove the chapter." +"“Add a new chapter” allows you to add a chapter to the video, “modify” " +"allows you to edit it and “delete” allows you to remove the chapter." msgstr "" #: pod/chapter/templates/video_chapter.html msgid "" -"Start playback of the video, pause the video and click on \"Get time from " -"the player\" to fill in the field untitled \"Start time\"." +"Start playback of the video, pause the video and click on “Get time from the " +"player” to fill in the field untitled “Start time”." msgstr "" #: pod/chapter/templates/video_chapter.html @@ -2460,7 +2460,7 @@ msgstr "" #: pod/import_video/views.py pod/meeting/views.py #, python-format msgid "" -"This video was uploaded to Pod; its origin is %(type)s : %(url)s" msgstr "" @@ -2471,8 +2471,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 @@ -2529,7 +2529,7 @@ msgstr "" #: pod/import_video/views.py #, python-format msgid "" -"This video '%(name)s' was uploaded to Pod; its origin is PeerTube : %(url)s." msgstr "" @@ -4507,6 +4507,10 @@ msgstr "" msgid "Open login page" msgstr "" +#: pod/main/templates/navbar_collapse.html +msgid "Channel list" +msgstr "" + #: pod/main/templates/navbar_collapse.html msgid "Types of videos" msgstr "" @@ -6135,8 +6139,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 diff --git a/pod/locale/nl/LC_MESSAGES/djangojs.po b/pod/locale/nl/LC_MESSAGES/djangojs.po index 1b6832e399..8e4f0e221e 100644 --- a/pod/locale/nl/LC_MESSAGES/djangojs.po +++ b/pod/locale/nl/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Esup-Pod\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-21 12:16+0000\n" +"POT-Creation-Date: 2023-09-21 14:05+0000\n" "PO-Revision-Date: 2023-02-08 15:22+0100\n" "Last-Translator: obado \n" "Language-Team: \n" @@ -155,6 +155,16 @@ msgstr "" msgid "Pause to enter caption for segment from %s to %s." msgstr "" +#: pod/completion/static/js/caption_maker.js +#: pod/podfile/static/podfile/js/filewidget.js +msgid "Add" +msgstr "" + +#: pod/completion/static/js/caption_maker.js +#: pod/video/static/js/comment-script.js +msgid "Delete" +msgstr "" + #: pod/completion/static/js/caption_maker.js msgid "Caption" msgstr "" @@ -477,6 +487,11 @@ msgstr "" msgid "Network response was not ok." msgstr "" +#: pod/podfile/static/podfile/js/filewidget.js +#: pod/video/static/js/change_video_owner.js +msgid "Loading…" +msgstr "" + #: pod/podfile/static/podfile/js/filewidget.js msgid "Change image" msgstr "" @@ -505,10 +520,6 @@ msgstr "" msgid "Server error" msgstr "" -#: pod/podfile/static/podfile/js/filewidget.js -msgid "Add" -msgstr "" - #: pod/podfile/static/podfile/js/filewidget.js msgid "Are you sure you want to delete this folder?" msgstr "" @@ -522,25 +533,25 @@ msgid "This folder is empty" msgstr "" #: pod/video/static/js/ajax-display-channels.js -msgid "Channel" -msgstr "" +msgid "%(count)s channel" +msgid_plural "%(count)s channels" +msgstr[0] "" +msgstr[1] "" #: pod/video/static/js/ajax-display-channels.js msgid "No channels found" msgstr "" #: pod/video/static/js/ajax-display-channels.js -msgid "videos" -msgstr "" +msgid "%(count)s video" +msgid_plural "%(count)s videos" +msgstr[0] "" +msgstr[1] "" #: pod/video/static/js/change_video_owner.js msgid "No element found" msgstr "" -#: pod/video/static/js/change_video_owner.js -msgid "Loading…" -msgstr "" - #: pod/video/static/js/change_video_owner.js msgid "An error occurred during the change of owner" msgstr "" @@ -558,21 +569,40 @@ msgid "Answers" msgstr "" #: pod/video/static/js/comment-script.js -msgid "Delete" +msgid "Cancel" msgstr "" #: pod/video/static/js/comment-script.js -msgid "Cancel" -msgstr "" +#, javascript-format +msgid "%s vote" +msgid_plural "%s votes" +msgstr[0] "" +msgstr[1] "" #: pod/video/static/js/comment-script.js msgid "Agree with the comment" msgstr "" +#: pod/video/static/js/comment-script.js +msgid "Reply to comment" +msgstr "" + +#: pod/video/static/js/comment-script.js +msgid "Reply" +msgstr "" + #: pod/video/static/js/comment-script.js msgid "Remove this comment" msgstr "" +#: pod/video/static/js/comment-script.js +msgid "Add a public comment" +msgstr "" + +#: pod/video/static/js/comment-script.js +msgid "Send" +msgstr "" + #: pod/video/static/js/comment-script.js msgid "Show answers" msgstr "" @@ -585,13 +615,6 @@ msgstr "" msgid "Sorry, you're not allowed to vote by now." msgstr "" -#: pod/video/static/js/comment-script.js -#, javascript-format -msgid "%s vote" -msgid_plural "%s votes" -msgstr[0] "" -msgstr[1] "" - #: pod/video/static/js/comment-script.js msgid "Sorry, you can't comment this video by now." msgstr "" @@ -612,38 +635,47 @@ msgstr[0] "" msgstr[1] "" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "This content is password protected." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "This content is chaptered." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "This content is in draft." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Video content." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Audio content." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Edit the video" msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Complete the video" msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Chapter the video" msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js +#: pod/video/static/js/video_category.js msgid "Delete the video" msgstr "" @@ -715,6 +747,18 @@ msgstr "" msgid "Edit the category" msgstr "" +#: pod/video/static/js/video_category.js +msgid "Delete the category" +msgstr "" + +#: pod/video/static/js/video_category.js +msgid "Success!" +msgstr "" + +#: pod/video/static/js/video_category.js +msgid "Error…" +msgstr "" + #: pod/video/static/js/video_category.js msgid "Category created successfully" msgstr "" diff --git a/pod/main/static/css/pod.css b/pod/main/static/css/pod.css index cb9a0e9578..607165a271 100755 --- a/pod/main/static/css/pod.css +++ b/pod/main/static/css/pod.css @@ -1303,7 +1303,7 @@ body { margin-left: auto; } -.pod-btn { +/*.pod-btn { color: var(--pod-font-color); text-decoration: none; } @@ -1312,7 +1312,7 @@ body { .pod-btn:focus { color: var(--pod-primary); text-decoration: underline; -} +}*/ /*.pod-btn-share { border: 1px solid silver; diff --git a/pod/main/static/js/main.js b/pod/main/static/js/main.js index 4e85dda90f..7f7e2c373f 100644 --- a/pod/main/static/js/main.js +++ b/pod/main/static/js/main.js @@ -1376,9 +1376,10 @@ document.addEventListener("DOMContentLoaded", function () { searchInput.classList.remove("focus-search-input"); searchInput.classList.add("hide-search-input"); } - - searchButton.addEventListener("focus", handleFocus); - searchButton.addEventListener("blur", handleBlur); - searchInput.addEventListener("focus", handleFocus); - searchInput.addEventListener("blur", handleBlur); + if (searchButton) { + searchButton.addEventListener("focus", handleFocus); + searchButton.addEventListener("blur", handleBlur); + searchInput.addEventListener("focus", handleFocus); + searchInput.addEventListener("blur", handleBlur); + } }); diff --git a/pod/main/templates/aside.html b/pod/main/templates/aside.html index dd82becf0f..a0d52c83b7 100644 --- a/pod/main/templates/aside.html +++ b/pod/main/templates/aside.html @@ -31,14 +31,14 @@

-
+ - +
@@ -52,14 +52,14 @@

-
+ - +
diff --git a/pod/main/templates/navbar.html b/pod/main/templates/navbar.html index c4f24b55bf..00a400c7d6 100644 --- a/pod/main/templates/navbar.html +++ b/pod/main/templates/navbar.html @@ -207,10 +207,10 @@
{% if user.get_full_name != '' %}{{ user.get_

{% endif %} {% if video_buttons %} - {% trans 'My videos' %} + {% trans 'My videos' %} {% endif %} {% if USE_PLAYLIST %} - {% trans 'My playlists' %} + {% trans 'My playlists' %} {% endif %} {% if USE_PLAYLIST and USE_FAVORITES %} {% get_favorite_playlist user as playlist %} diff --git a/pod/main/templates/navbar_collapse.html b/pod/main/templates/navbar_collapse.html index 4f112c09de..8ffa6fe171 100644 --- a/pod/main/templates/navbar_collapse.html +++ b/pod/main/templates/navbar_collapse.html @@ -9,7 +9,7 @@

-   +  {% trans "Channel list" %}

diff --git a/pod/meeting/views.py b/pod/meeting/views.py index 86a4fac8c0..67fe67c19a 100644 --- a/pod/meeting/views.py +++ b/pod/meeting/views.py @@ -1112,7 +1112,7 @@ def upload_bbb_recording_to_pod(request, record_id, meeting_id): recording = InternalRecording.objects.get(id=record_id) source_url = request.POST.get("source_url") - # Step 1 : Download and parse the remote HTML file if necessary + # Step 1: Download and parse the remote HTML file if necessary # Check if extension is a video extension extension = source_url.split(".")[-1].lower() if extension in VIDEO_ALLOWED_EXTENSIONS: @@ -1123,7 +1123,7 @@ def upload_bbb_recording_to_pod(request, record_id, meeting_id): video_file = parse_remote_file(source_url) source_video_url = source_url + video_file - # Step 2 : Define destination source file + # Step 2: Define destination source file extension = source_video_url.split(".")[-1].lower() discrim = datetime.now().strftime("%Y%m%d%H%M%S") dest_file = os.path.join( @@ -1135,10 +1135,10 @@ def upload_bbb_recording_to_pod(request, record_id, meeting_id): os.makedirs(os.path.dirname(dest_file), exist_ok=True) - # Step 3 : Download the video file + # Step 3: Download the video file download_video_file(source_video_url, dest_file) - # Step 4 : Save informations about the recording + # Step 4: Save informations about the recording recording_title = request.POST.get("recording_name") save_internal_recording( request, @@ -1148,9 +1148,9 @@ def upload_bbb_recording_to_pod(request, record_id, meeting_id): source_video_url, ) - # Step 5 : Save and encode Pod video + # Step 5: Save and encode Pod video description = _( - "This video was uploaded to Pod; its origin is %(type)s : " + "This video was uploaded to Pod; its origin is %(type)s: " '%(url)s' ) % {"type": "Big Blue Button", "url": source_video_url} diff --git a/pod/package.json b/pod/package.json index d5e288bdb9..5ec9f1d0cf 100644 --- a/pod/package.json +++ b/pod/package.json @@ -3,7 +3,7 @@ "dependencies": { "@silvermine/videojs-quality-selector": "^1.3.0", "blueimp-file-upload": "^10.32.0", - "bootstrap": "^5.3.0", + "bootstrap": "^5.3.2", "bootstrap-icons": "^1.10.5", "dayjs": "^1.11.8", "jqGrid": "^5.8.2", diff --git a/pod/playlist/templates/playlist/playlist-list-modal.html b/pod/playlist/templates/playlist/playlist-list-modal.html index e557a6567a..3312e6c5e1 100644 --- a/pod/playlist/templates/playlist/playlist-list-modal.html +++ b/pod/playlist/templates/playlist/playlist-list-modal.html @@ -12,7 +12,7 @@
- diff --git a/pod/video/static/js/ajax-display-channels.js b/pod/video/static/js/ajax-display-channels.js index 7f39b43f78..fdc1456a4b 100644 --- a/pod/video/static/js/ajax-display-channels.js +++ b/pod/video/static/js/ajax-display-channels.js @@ -101,15 +101,13 @@ function getThemesForSpecificChannel(channelSlug) { */ function setModalTitle(modalContentElement, channelsCount) { const modalTitleElement = modalContentElement.querySelector(".modal-title"); - if (channelsCount > 1) { - modalTitleElement.innerHTML = `  ${channelsCount} ${gettext( - "Channels", - )}`; - } else { - modalTitleElement.innerHTML = `  ${channelsCount} ${gettext( - "Channel", - )}`; - } + const channelIcon = ""; + var channelString = ngettext( + `%(count)s channel`, + `%(count)s channels`, + channelsCount); + channelString = interpolate(channelString, {count: channelsCount}, true); + modalTitleElement.innerHTML = `${channelIcon} ${channelString}`; } /** @@ -178,15 +176,14 @@ function convertToModalListElement(channel) { if (haveThemes) { spanElement = setChannelThemeButtonForModal(noWrapSpanElement, channel); } - if (channel.videoCount > 1) { - noWrapSpanElement.innerHTML += `${ - channel.videoCount - } ${gettext("videos")}`; - } else { - noWrapSpanElement.innerHTML += `${ - channel.videoCount - } ${gettext("video")}`; - } + + var videoString = ngettext( + `%(count)s video`, + `%(count)s videos`, + channel.videoCount); + videoString = interpolate(videoString, {count: channel.videoCount}, true); + noWrapSpanElement.innerHTML += `${videoString}`; + const childAndParentCouples = [ [dFlexSpanElement, linkElement], [dFlexDivElement, dFlexSpanElement], diff --git a/pod/video/templates/channel/channel_edit.html b/pod/video/templates/channel/channel_edit.html index 6876dc1b24..19f9a3f0e5 100644 --- a/pod/video/templates/channel/channel_edit.html +++ b/pod/video/templates/channel/channel_edit.html @@ -105,7 +105,7 @@

{% trans "Form fields"%} {% for title, values in form.CHANNEL_FORM_FIELDS_HELP_TEXT.items %}
-
diff --git a/pod/video/templates/channel/theme_edit.html b/pod/video/templates/channel/theme_edit.html index 703e807bb9..3fa49891b6 100644 --- a/pod/video/templates/channel/theme_edit.html +++ b/pod/video/templates/channel/theme_edit.html @@ -78,7 +78,7 @@

{% trans "Form fields"%} {% for title, values in form_theme.THEME_FORM_FIELDS_HELP_TEXT.items %}
-
diff --git a/pod/video/templates/videos/video-info.html b/pod/video/templates/videos/video-info.html index 2e9f601bfa..0e1cfa03ac 100644 --- a/pod/video/templates/videos/video-info.html +++ b/pod/video/templates/videos/video-info.html @@ -78,11 +78,11 @@ {% if video.description or tag_list or video.is_360 %}
{% if video.is_360 %} -

{% trans 'This is a 360 degree video. To look around click and drag your mouse on the video.' %}

+ {% endif %} {% tags_for_object video as tag_list %} {% if video.description or tag_list %} -

{{ video.description|safe }}

+
{{ video.description|safe }}
{% if tag_list %}

{% trans 'Tags:' %} {% for tag in tag_list %}