From 75194838dafc8797883b5350ce48f8db69ea5c17 Mon Sep 17 00:00:00 2001 From: Olivier Bado-Faustin <12731381+Badatos@users.noreply.github.com> Date: Fri, 10 Jan 2025 10:13:05 +0100 Subject: [PATCH 01/18] Code cleaning for 3.9.0 (#1238) * Remove useless html comments * Translate html comments * Remove duplicated function get_storage_path_video from video.utils * Replace '/' by os.path.join in video models * Remove duplicated code in video-script?html --- pod/live/templates/live/event-info.html | 3 ++- pod/main/templates/base.html | 3 +-- pod/main/templates/navbar.html | 2 +- .../playlist/playlist-list-modal.html | 4 ++-- pod/video/forms.py | 3 +-- pod/video/models.py | 4 ++-- .../templates/videos/video-all-info.html | 2 +- pod/video/templates/videos/video-element.html | 1 - pod/video/templates/videos/video-script.html | 3 --- pod/video/urls.py | 1 + pod/video/utils.py | 20 +------------------ pod/video_encode_transcript/models.py | 3 +-- 12 files changed, 13 insertions(+), 36 deletions(-) diff --git a/pod/live/templates/live/event-info.html b/pod/live/templates/live/event-info.html index aec2f1b631..7f3eb1b499 100644 --- a/pod/live/templates/live/event-info.html +++ b/pod/live/templates/live/event-info.html @@ -58,7 +58,8 @@

{% trans 'Type:' %}

- {% if event.is_draft == False or event.owner == request.user or request.user in event.additional_owners.all or request.user.is_superuser %} + {% if event.is_draft == False or event.owner == request.user or request.user in event.additional_owners.all or request.user.is_superuser %} + + {% block more_script %} diff --git a/pod/video/forms.py b/pod/video/forms.py index 3bc613f457..1f6c25762b 100644 --- a/pod/video/forms.py +++ b/pod/video/forms.py @@ -10,13 +10,12 @@ from django.utils.deconstruct import deconstructible from django.utils.translation import ugettext_lazy as _ from django.template.defaultfilters import filesizeformat -from .models import Video, VideoVersion +from .models import Video, VideoVersion, get_storage_path_video from .models import Channel from .models import Theme from .models import Type from .models import Discipline from .models import Notes, AdvancedNotes, NoteComments -from .utils import get_storage_path_video from pod.video_encode_transcript.models import PlaylistVideo from pod.video_encode_transcript import encode from pod.video_encode_transcript.models import EncodingVideo, EncodingAudio diff --git a/pod/video/models.py b/pod/video/models.py index d321beb881..9a7cada19a 100644 --- a/pod/video/models.py +++ b/pod/video/models.py @@ -262,9 +262,9 @@ def get_storage_path_video(instance, filename) -> str: return os.path.join( VIDEOS_DIR, instance.owner.owner.hashkey, - "%s/%s.%s" + os.path.dirname(fname), + "%s.%s" % ( - os.path.dirname(fname), slugify(os.path.basename(fname)), extension, ), diff --git a/pod/video/templates/videos/video-all-info.html b/pod/video/templates/videos/video-all-info.html index b5e406d266..cb65ee247a 100644 --- a/pod/video/templates/videos/video-all-info.html +++ b/pod/video/templates/videos/video-all-info.html @@ -17,7 +17,7 @@

{% endif %}
-
+
From e364d9c89ebba4715ea55bd1b665507166e07356 Mon Sep 17 00:00:00 2001 From: Celine Didier Date: Tue, 21 Jan 2025 15:23:46 +0100 Subject: [PATCH 05/18] [DONE] Fix node version (#1249) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixup. Format code with Black * Fix node version --------- Co-authored-by: Céline Didier --- .env.dev-exemple | 2 +- dockerfile-dev-with-volumes/README.adoc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.env.dev-exemple b/.env.dev-exemple index e1f76665cd..ec66ca9ad5 100644 --- a/.env.dev-exemple +++ b/.env.dev-exemple @@ -3,7 +3,7 @@ DJANGO_SUPERUSER_PASSWORD= DJANGO_SUPERUSER_EMAIL= ### You can use internal registry ELASTICSEARCH_TAG=elasticsearch:8.13.0 -NODE_TAG=node:19 +NODE_TAG=node:23 PYTHON_TAG=python:3.9-bullseye REDIS_TAG=redis:alpine3.16 ### DOCKER_ENV: You can specify light or full. diff --git a/dockerfile-dev-with-volumes/README.adoc b/dockerfile-dev-with-volumes/README.adoc index d8b7ec8d17..0c9fb2b8a7 100755 --- a/dockerfile-dev-with-volumes/README.adoc +++ b/dockerfile-dev-with-volumes/README.adoc @@ -50,8 +50,8 @@ linux/arm64/v8 DJANGO_SUPERUSER_USERNAME= DJANGO_SUPERUSER_PASSWORD= DJANGO_SUPERUSER_EMAIL= -ELASTICSEARCH_TAG=elasticsearch:8.8.1 -NODE_TAG=node:19 +ELASTICSEARCH_TAG=elasticsearch:8.13.0 +NODE_TAG=node:23 PYTHON_TAG=python:3.9-bullseye REDIS_TAG=redis:alpine3.16 DOCKER_ENV=light From 968f3b1c5724c6b056a57b38603715be86363be3 Mon Sep 17 00:00:00 2001 From: Olivier Bado-Faustin <12731381+Badatos@users.noreply.github.com> Date: Tue, 21 Jan 2025 16:27:32 +0100 Subject: [PATCH 06/18] Prevent video.js time-divider from being hidden when Live is off (#1252) --- pod/live/static/css/event.css | 6 +----- pod/live/templates/live/event_card.html | 2 +- pod/video/static/css/videojs-controlbar.css | 6 ++++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pod/live/static/css/event.css b/pod/live/static/css/event.css index 48b1888ec3..d2627a5efb 100644 --- a/pod/live/static/css/event.css +++ b/pod/live/static/css/event.css @@ -2,14 +2,10 @@ * Esup-Pod live event styles */ -.current_event { +.current-event { stroke: red; } -.video-js .vjs-time-control { - display: block; -} - .video-js .vjs-remaining-time { display: none; } diff --git a/pod/live/templates/live/event_card.html b/pod/live/templates/live/event_card.html index cfa1feeb5e..8b742c2318 100644 --- a/pod/live/templates/live/event_card.html +++ b/pod/live/templates/live/event_card.html @@ -8,7 +8,7 @@ {% if event.is_current %} - + {% endif %} diff --git a/pod/video/static/css/videojs-controlbar.css b/pod/video/static/css/videojs-controlbar.css index 224fd41f02..f1283ee807 100644 --- a/pod/video/static/css/videojs-controlbar.css +++ b/pod/video/static/css/videojs-controlbar.css @@ -24,8 +24,11 @@ margin-right: 1em; } -.video-js .vjs-current-time { +.video-js .vjs-time-control{ display: block; +} + +.video-js .vjs-current-time { padding-right: 0; } @@ -35,7 +38,6 @@ } .video-js .vjs-duration { - display: block; padding-left: 0; } From fd784e29aa88123f222c9c72a29e5035a65b26e0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 21 Jan 2025 15:27:52 +0000 Subject: [PATCH 07/18] Fixup. Format code with Prettier --- pod/video/static/css/videojs-controlbar.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pod/video/static/css/videojs-controlbar.css b/pod/video/static/css/videojs-controlbar.css index f1283ee807..a97035ca96 100644 --- a/pod/video/static/css/videojs-controlbar.css +++ b/pod/video/static/css/videojs-controlbar.css @@ -24,7 +24,7 @@ margin-right: 1em; } -.video-js .vjs-time-control{ +.video-js .vjs-time-control { display: block; } From 1e8c20fdf973cd9a10bd939ba82027a10c613d1a Mon Sep 17 00:00:00 2001 From: Olivier Bado-Faustin <12731381+Badatos@users.noreply.github.com> Date: Wed, 22 Jan 2025 11:31:57 +0100 Subject: [PATCH 08/18] Bump video.js to 7.21.2 (latest-7) (#1251) * Replace videojs 7.20.3 by 7.21.2 (latest-7) + correct some JSDoc formats + Uniformize default DEBUG value to True + Replace some `b` HTML tag by `strong` --- pod/completion/static/js/caption_maker.js | 62 +++---- pod/completion/static/js/completion.js | 10 +- pod/enrichment/static/js/videojs-slides.js | 2 +- .../management/commands/checkLiveStartStop.py | 2 +- pod/main/static/js/admin.js | 4 +- pod/main/static/js/utils.js | 4 +- pod/meeting/static/js/my_meetings.js | 10 +- pod/package.json | 2 +- .../static/playlist/js/add-or-edit.js | 6 +- .../static/playlist/js/playlist-player.js | 8 +- .../static/playlist/js/playlist-reorganize.js | 12 +- pod/podfile/static/podfile/js/filewidget.js | 6 +- .../static/speaker/js/speakers-management.js | 160 +++++++++--------- pod/video/management/commands/recorder.py | 4 +- pod/video/static/js/ajax-display-channels.js | 44 ++--- pod/video/static/js/change_video_owner.js | 46 ++--- .../static/js/regroup_videos_by_theme.js | 6 +- .../static/js/validate-date_delete-field.js | 4 +- pod/video/static/js/video-show.js | 4 +- pod/video/static/js/video_category.js | 18 +- pod/video/static/js/video_edit.js | 8 +- pod/video/static/js/video_select.js | 20 +-- pod/video/templates/videos/video-script.html | 10 +- pod/video_encode_transcript/transcript.py | 2 +- pod/video_search/utils.py | 2 +- 25 files changed, 228 insertions(+), 228 deletions(-) diff --git a/pod/completion/static/js/caption_maker.js b/pod/completion/static/js/caption_maker.js index c4e32b65c7..6bee3f3385 100644 --- a/pod/completion/static/js/caption_maker.js +++ b/pod/completion/static/js/caption_maker.js @@ -324,7 +324,7 @@ var captionBeingDisplayed = -1; /** * Display existing caption - * @param {[type]} seconds [description] + * @param {[type]} seconds - time in seconds */ function displayExistingCaption(seconds) { var ci = findCaptionIndex(seconds); @@ -360,7 +360,7 @@ function existingCaptionsEndTime() { /** * Update captions array. - * @param {[type]} vtt [description] + * @param {string} vtt - VTT string */ let updateCaptionsArray = (vtt) => { let arr = vtt.split("\n\n"); @@ -665,8 +665,8 @@ let updateCaptionHtmlContent = () => { /** * Update caption. - * @param {[type]} ci caption index - * @param {[type]} captionText caption text + * @param {int} ci - caption index + * @param {string} captionText - caption text */ function updateCaption(ci, captionText) { captionsArray[ci].caption = captionText; @@ -677,8 +677,8 @@ let lastEditedBlock = null; /** * Create a caption block object. - * @param {Object} newCaption Simple object representing the caption block - * @param {Function} spawnFunction Function to call after block init + * @param {Object} newCaption - Simple object representing the caption block + * @param {Function} spawnFunction - Function to call after block init */ function createCaptionBlock(newCaption, spawnFunction) { let captionText = newCaption.caption; @@ -871,7 +871,7 @@ function createCaptionBlock(newCaption, spawnFunction) { /** * Spawn New Block - * @param {Event} e Triggered Event + * @param {Event} e - Triggered Event */ spawnNew: function (e) { e.preventDefault(); @@ -900,7 +900,7 @@ function createCaptionBlock(newCaption, spawnFunction) { /** * Delete Block - * @param {Event} e Triggered Event + * @param {Event} e - Triggered Event */ delete: function (e) { e.preventDefault(); @@ -1140,8 +1140,8 @@ editorShortcuts.init(); /** * Add caption list row - * @param {[type]} ci [description] - * @param {[type]} newCaption [description] + * @param {int} ci - Caption index + * @param {[type]} newCaption - Caption object */ function addCaptionListRow(ci, newCaption) { let vtt = document.getElementById("caption-content"); @@ -1167,9 +1167,9 @@ function addCaptionListRow(ci, newCaption) { /** * Add caption - * @param {[type]} captionStart [description] - * @param {[type]} captionEnd [description] - * @param {[type]} captionText [description] + * @param {[type]} captionStart - Start time + * @param {[type]} captionEnd - End time + * @param {[type]} captionText - Caption content */ function addCaption(captionStart, captionEnd, captionText) { const pod = document.getElementById("podvideoplayer"); @@ -1190,8 +1190,8 @@ function addCaption(captionStart, captionEnd, captionText) { /** * Convert HMS time format to seconds only - * @param {string} str hms - * @return {number} corresponding seconds + * @param {string} str - hms + * @return {number} - corresponding seconds */ function hmsToSecondsOnly(str) { let p = str.split(":"), @@ -1206,7 +1206,7 @@ function hmsToSecondsOnly(str) { /** * Parses webvtt time string format into floating point seconds - * @param {[type]} sTime [description] + * @param {[type]} sTime - Webvtt time string */ function parseTime(sTime) { let seconds = hmsToSecondsOnly(sTime); @@ -1228,7 +1228,7 @@ function parseTime(sTime) { /** * formats floating point seconds into the webvtt time string format - * @param {[type]} seconds [description] + * @param {[type]} seconds - floating point seconds */ function formatTime(seconds) { var hh = Math.floor(seconds / (60 * 60)); @@ -1246,7 +1246,7 @@ function formatTime(seconds) { /** * Find caption index - * @param {[type]} seconds [description] + * @param {[type]} seconds - Time in seconds */ function findCaptionIndex(seconds) { var below = -1; @@ -1268,7 +1268,7 @@ function findCaptionIndex(seconds) { /** * Play selected caption - * @param {[type]} timeline [description] + * @param {string} timeline - */ function playSelectedCaption(timeline) { if (timeline.includes("-->")) { @@ -1288,7 +1288,7 @@ function playSelectedCaption(timeline) { /** * Escape Html entities - * @param {string} s String to be escaped + * @param {string} s - String to be escaped */ function XMLEncode(s) { return s @@ -1302,7 +1302,7 @@ function XMLEncode(s) { /** * Decode Html entities - * @param {String} s String to be decoded + * @param {String} s - String to be decoded */ function XMLDecode(s) { return s @@ -1315,7 +1315,7 @@ function XMLDecode(s) { /** * Load caption file - * @param {[type]} fileObject [description] + * @param {[type]} fileObject - File object to be loaded */ /* function loadCaptionFile(fileObject) { @@ -1344,7 +1344,7 @@ function loadCaptionFile(fileObject) { /** * Invoked by script insertion of proxyvtt.ashx - * @param {[type]} obj [description] + * @param {[type]} obj - */ function processProxyVttResponse(obj) { obj = JSON.parse(obj); @@ -1376,7 +1376,7 @@ function processProxyVttResponse(obj) { /** * Partial parser for WebVTT files based on the spec at http://dev.w3.org/html5/webvtt/ - * @param {[type]} vtt [description] + * @param {[type]} vtt - VTT file content */ function parseAndLoadWebVTT(vtt) { var vttLines = vtt.split(/\r\n|\r|\n/); // create an array of lines from our file @@ -1460,8 +1460,8 @@ const registerPlugin = videojs.registerPlugin || videojs.plugin; /** * On player ready Event - * @param {[type]} player [description] - * @param {[type]} options [description] + * @param {[type]} player - Video player + * @param {[type]} options - Options (not used ?) */ const onPlayerReady = function (player, options) { let startKeyframe; @@ -1483,8 +1483,8 @@ const onPlayerReady = function (player, options) { /** * Highlight video region - * @param {[type]} startTime [description] - * @param {[type]} endTime [description] + * @param {[type]} startTime - Start time in seconds + * @param {[type]} endTime - End time in seconds */ highlightVideoRegion = function (startTime, endTime) { clearVideoRegion(); @@ -1520,7 +1520,7 @@ const onPlayerReady = function (player, options) { /** * Seek video player to absolute `time`. - * @param {[type]} time [description] + * @param {[type]} time - absolute time target */ function seekVideoTo(time) { player.userActive(true); @@ -1529,7 +1529,7 @@ function seekVideoTo(time) { /** * Seek video player to relative `time`. - * @param {[type]} time [description] + * @param {[type]} time - relative time target */ function seekVideo(time) { player.userActive(true); @@ -1538,7 +1538,7 @@ function seekVideo(time) { /** * Timeline regions - * @param {[type]} options [description] + * @param {[type]} options - Video player options */ function timelineRegions(options) { this.ready(function () { diff --git a/pod/completion/static/js/completion.js b/pod/completion/static/js/completion.js index 5c492c94a8..461b5d8566 100644 --- a/pod/completion/static/js/completion.js +++ b/pod/completion/static/js/completion.js @@ -85,11 +85,11 @@ document.addEventListener("submit", (e) => { /** * Send and get form. * - * @param elt {HTMLElement} HTML element. - * @param action {string} Action. - * @param name {string} Name. - * @param form {string} Form. - * @param list {string} List. + * @param {HTMLElement} elt - HTML element. + * @param {string} action - Action. + * @param {string} name - Name. + * @param {string} form - Form. + * @param {string} list - List. * * @return {Promise} The form promise. */ diff --git a/pod/enrichment/static/js/videojs-slides.js b/pod/enrichment/static/js/videojs-slides.js index 3fbd3fb448..7c84a57983 100644 --- a/pod/enrichment/static/js/videojs-slides.js +++ b/pod/enrichment/static/js/videojs-slides.js @@ -243,7 +243,7 @@ var VideoSlides = function (items) { /** * slideShow function to show the current slide according to the time. * - * @param {number} time the current video time + * @param {number} time - the current video time * @return {void} doesn't return anything * @function slideShow */ diff --git a/pod/live/management/commands/checkLiveStartStop.py b/pod/live/management/commands/checkLiveStartStop.py index 42ecf42b4d..ce08c55d0d 100644 --- a/pod/live/management/commands/checkLiveStartStop.py +++ b/pod/live/management/commands/checkLiveStartStop.py @@ -18,7 +18,7 @@ ) DEFAULT_EVENT_PATH = getattr(settings, "DEFAULT_EVENT_PATH", "") -DEBUG = getattr(settings, "DEBUG", "") +DEBUG = getattr(settings, "DEBUG", True) TIME_ZONE = getattr(settings, "TIME_ZONE", "Europe/Paris") diff --git a/pod/main/static/js/admin.js b/pod/main/static/js/admin.js index 32f6f7257b..daec1e15dd 100644 --- a/pod/main/static/js/admin.js +++ b/pod/main/static/js/admin.js @@ -13,7 +13,7 @@ const fieldHtml = document.getElementsByClassName("field-html")[0]; /** * Function for show field. * - * @param {HTMLElement} field The field to show. + * @param {HTMLElement} field - The field to show. */ function showField(field) { field.classList.remove("d-none"); @@ -23,7 +23,7 @@ function showField(field) { /** * Function for hide field. * - * @param {HTMLElement} field The field to hide. + * @param {HTMLElement} field - The field to hide. */ function hideField(field) { field.classList.remove("d-block"); diff --git a/pod/main/static/js/utils.js b/pod/main/static/js/utils.js index a980d41f2e..99bbac4c9e 100644 --- a/pod/main/static/js/utils.js +++ b/pod/main/static/js/utils.js @@ -13,8 +13,8 @@ Utils.prototype = { constructor: Utils, /** * Check if element is partial/fully in screen view - * @param element {HTMLElement} element to check - * @param fullyInView {Boolean} check full in view + * @param {HTMLElement} element - element to check + * @param {Boolean} fullyInView - check full in view **/ isElementInView: function (element, fullyInView) { const pageTop = $(window).scrollTop(); diff --git a/pod/meeting/static/js/my_meetings.js b/pod/meeting/static/js/my_meetings.js index d013a7b7f0..5e90b86b4e 100644 --- a/pod/meeting/static/js/my_meetings.js +++ b/pod/meeting/static/js/my_meetings.js @@ -93,18 +93,18 @@ meetingModal.addEventListener("show.bs.modal", function (event) { /* TODO: check if level parameter can be removed. */ /** * Recursively generate an HTML unordered list version of data - * @param {Array} data Data to be displayed - * @param {Number} level level of recursion (useless?) - * @return {string} Generated HTML + * @param {Array} data - Data to be displayed + * @param {Number} level - level of recursion (useless?) + * @return {string} Generated HTML */ function generateHtml(data, level = 0) { let html = "
    "; for (let k in data) { if (typeof data[k] === "object") { html += - "
  • " + k + ": " + generateHtml(data[k], level++) + "
    • "; + "
  • " + k + ": " + generateHtml(data[k], level++) + "
    • "; } else { - html += "
  • " + k + ": " + data[k] + "
    • "; + html += "
  • " + k + ": " + data[k] + "
    • "; } } html += "
"; diff --git a/pod/package.json b/pod/package.json index 03186c412c..bdc63e8467 100644 --- a/pod/package.json +++ b/pod/package.json @@ -11,7 +11,7 @@ "jquery-ui-dist": "^1.13.2", "js-cookie": "^3.0.5", "spark-md5": "^3.0.2", - "video.js": "7.20.3", + "video.js": "latest-7", "videojs-contrib-quality-levels": "^3.0.0", "videojs-hls-quality-selector": "^1.1.4", "videojs-overlay": "^3.1.0", diff --git a/pod/playlist/static/playlist/js/add-or-edit.js b/pod/playlist/static/playlist/js/add-or-edit.js index d64189b04d..18cd0fca5f 100644 --- a/pod/playlist/static/playlist/js/add-or-edit.js +++ b/pod/playlist/static/playlist/js/add-or-edit.js @@ -6,7 +6,7 @@ /** * Hide or show the password field. If it is show, it is required. * - * @param {boolean} toHide For hide the field, set to `true`. + * @param {boolean} toHide - To hide the field, set to `true`. */ function hidePasswordField(toHide) { if (toHide) { @@ -22,8 +22,8 @@ function hidePasswordField(toHide) { /** * Update the visibility for the help text. * - * @param {string} visibility The new visibility. - * @param {HTMLElement} helpText The help text element. + * @param {string} visibility - The new visibility. + * @param {HTMLElement} helpText - The help text element. */ function updateVisibilityHelpText(visibility, helpText) { if (visibility == 'public') { diff --git a/pod/playlist/static/playlist/js/playlist-player.js b/pod/playlist/static/playlist/js/playlist-player.js index aca2f5e871..553c15fc10 100644 --- a/pod/playlist/static/playlist/js/playlist-player.js +++ b/pod/playlist/static/playlist/js/playlist-player.js @@ -131,7 +131,7 @@ function switchToNextVideo() { /** * Update the URL without refresh the page. * - * @param {string} newUrl The new URL. + * @param {string} newUrl - The new URL. */ function updateUrl(newUrl) { history.pushState({}, document.title, newUrl); @@ -141,8 +141,8 @@ function updateUrl(newUrl) { /** * Refresh element with the DocumentFragment. * - * @param {string} elementQuerySelector The query selector for the element. - * @param {*} html The html code. + * @param {string} elementQuerySelector - The query selector for the element. + * @param {*} html - The html code. */ function refreshElementWithDocumentFragment(elementQuerySelector, newHTMLContent) { const fragment = document.createDocumentFragment(); @@ -188,7 +188,7 @@ function asyncStartCountDown() { /** * Start the count down. * - * @param {function} callback The call back function. + * @param {function} callback - The call back function. */ function startCountdown(callback) { countdownElement.textContent = playlistCount; diff --git a/pod/playlist/static/playlist/js/playlist-reorganize.js b/pod/playlist/static/playlist/js/playlist-reorganize.js index 6a18db02d7..79513af726 100644 --- a/pod/playlist/static/playlist/js/playlist-reorganize.js +++ b/pod/playlist/static/playlist/js/playlist-reorganize.js @@ -14,8 +14,8 @@ addEventForReorganizedButton(); /** * Add or remove the CSS class to make drop zone hover. * - * @param {string} state State of style (`add` or `remove`). - * @param {Element} element Element to add CSS class. + * @param {string} state - State of style (`add` or `remove`). + * @param {Element} element - Element to add CSS class. */ function addOrRemoveDropZoneHoverStyleClass(state, element) { const className = 'dropzone-hover'; @@ -67,7 +67,7 @@ function addEventForReorganizedButton() { /** * Clear and transfer data when drag event starts. * - * @param {Event} event The name of the event. + * @param {Event} event - The name of the event. */ function onDragStart(event) { event.dataTransfer.clearData(); @@ -79,7 +79,7 @@ function onDragStart(event) { /** * Prevent the default behavior of the element during the event. * - * @param {Event} event The name of the event. + * @param {Event} event - The name of the event. */ function onDragOver(event) { event.preventDefault(); @@ -90,7 +90,7 @@ function onDragOver(event) { /** * Performs a swap between the dragged elements when dropping. * - * @param {Event} event The name of the event. + * @param {Event} event - The name of the event. */ function onDrop(event) { event.preventDefault(); @@ -141,7 +141,7 @@ function activateDragAndDrop(parent) { /** * Convert a 2D table into a JSON string representation. * - * @param {Array} table The 2D table to convert. + * @param {Array} table - The 2D table to convert. * * @returns {String} The JSON string representation. */ diff --git a/pod/podfile/static/podfile/js/filewidget.js b/pod/podfile/static/podfile/js/filewidget.js index 97e6d59bfd..862e3cac97 100644 --- a/pod/podfile/static/podfile/js/filewidget.js +++ b/pod/podfile/static/podfile/js/filewidget.js @@ -239,9 +239,9 @@ if (typeof loaded == "undefined") { /** * Creates a user list item elements * - * @param {string} text The text content of the button. - * @param {User} elt The user object. - * @param {string} type The type of action ("Add" or "Remove"). + * @param {string} text - The text content of the button. + * @param {User} elt - The user object. + * @param {string} type - The type of action ("Add" or "Remove"). * @returns {HTMLElement} The list item. */ function user_li(text, elt, type) { diff --git a/pod/speaker/static/speaker/js/speakers-management.js b/pod/speaker/static/speaker/js/speakers-management.js index 3c3b1ef66a..b8027b0dc4 100644 --- a/pod/speaker/static/speaker/js/speakers-management.js +++ b/pod/speaker/static/speaker/js/speakers-management.js @@ -2,96 +2,96 @@ * @file Esup-Pod speaker management script. */ document.addEventListener('DOMContentLoaded', function() { - /** - * Adds a job field to the job fields container. - * @param {string} jobId - The ID of the job (default is an empty string). - * @param {string} jobTitle - The title of the job (default is an empty string). - */ - function addJobField(jobId = '', jobTitle = '') { - var jobFieldHtml = ` -
- - - -
- `; - document.getElementById('jobFieldsContainer').insertAdjacentHTML('beforeend', jobFieldHtml); - } - - /** - * Shows the add/edit speaker modal with the provided speaker data. - * @param {Object|null} speaker - The speaker data (default is null for adding a new speaker). - */ - function showSpeakerModal(speaker = null) { - // Clear existing job fields - document.getElementById('jobFieldsContainer').textContent = ''; + /** + * Adds a job field to the job fields container. + * @param {string} jobId - The ID of the job (default is an empty string). + * @param {string} jobTitle - The title of the job (default is an empty string). + */ + function addJobField(jobId = '', jobTitle = '') { + var jobFieldHtml = ` +
+ + + +
+ `; + document.getElementById('jobFieldsContainer').insertAdjacentHTML('beforeend', jobFieldHtml); + } - if (speaker) { - // Editing speaker - document.getElementById('speakerModalLabel').textContent = gettext("Edit this speaker"); - document.getElementById('actionField').value = 'edit'; - document.getElementById('speakerId').value = speaker.id; - document.getElementById('id_firstname').value = speaker.firstname; - document.getElementById('id_lastname').value = speaker.lastname; + /** + * Shows the add/edit speaker modal with the provided speaker data. + * @param {Object|null} speaker - The speaker data (default is null for adding a new speaker). + */ + function showSpeakerModal(speaker = null) { + // Clear existing job fields + document.getElementById('jobFieldsContainer').textContent = ''; - // Fetch and populate jobs - fetch(`/speaker/get-jobs/${speaker.id}/`) - .then(response => response.json()) - .then(data => { - data.jobs.forEach(job => { - addJobField(job.id, job.title); - }); - }) - .catch(error => { - console.error('Error fetching jobs:', error); - }); - } else { - // Adding new speaker - document.getElementById('speakerModalLabel').textContent = gettext("Add a speaker"); - document.getElementById('actionField').value = 'add'; - document.getElementById('speakerId').value = ''; - document.getElementById('id_firstname').value = ''; - document.getElementById('id_lastname').value = ''; - addJobField(); // Add one empty job field by default - } + if (speaker) { + // Editing speaker + document.getElementById('speakerModalLabel').textContent = gettext("Edit this speaker"); + document.getElementById('actionField').value = 'edit'; + document.getElementById('speakerId').value = speaker.id; + document.getElementById('id_firstname').value = speaker.firstname; + document.getElementById('id_lastname').value = speaker.lastname; - // Show modal - var speakerModal = new bootstrap.Modal(document.getElementById('speakerModal')); - speakerModal.show(); + // Fetch and populate jobs + fetch(`/speaker/get-jobs/${speaker.id}/`) + .then(response => response.json()) + .then(data => { + data.jobs.forEach(job => { + addJobField(job.id, job.title); + }); + }) + .catch(error => { + console.error('Error fetching jobs:', error); + }); + } else { + // Adding new speaker + document.getElementById('speakerModalLabel').textContent = gettext("Add a speaker"); + document.getElementById('actionField').value = 'add'; + document.getElementById('speakerId').value = ''; + document.getElementById('id_firstname').value = ''; + document.getElementById('id_lastname').value = ''; + addJobField(); // Add one empty job field by default } - // Add job field on button click - document.getElementById('add-job-field').addEventListener('click', function() { - addJobField(); - }); + // Show modal + var speakerModal = new bootstrap.Modal(document.getElementById('speakerModal')); + speakerModal.show(); + } - // Remove job field on button click - document.addEventListener('click', function(event) { - if (event.target && event.target.closest('.remove-job-field')) { - event.target.closest('.job-content').remove(); - } - }); + // Add job field on button click + document.getElementById('add-job-field').addEventListener('click', function() { + addJobField(); + }); - // Set up event listeners for add/edit buttons - document.querySelectorAll('.add-speaker-btn').forEach(button => { - button.addEventListener('click', function() { - showSpeakerModal(); - }); + // Remove job field on button click + document.addEventListener('click', function(event) { + if (event.target && event.target.closest('.remove-job-field')) { + event.target.closest('.job-content').remove(); + } + }); + + // Set up event listeners for add/edit buttons + document.querySelectorAll('.add-speaker-btn').forEach(button => { + button.addEventListener('click', function() { + showSpeakerModal(); }); + }); - document.querySelectorAll('.edit-speaker-field').forEach(button => { - button.addEventListener('click', function() { - var speakerId = this.getAttribute('data-speaker-id'); + document.querySelectorAll('.edit-speaker-field').forEach(button => { + button.addEventListener('click', function() { + var speakerId = this.getAttribute('data-speaker-id'); - // Fetch speaker data (you may need to implement this endpoint) - fetch(`/speaker/get-speaker/${speakerId}/`) - .then(response => response.json()) - .then(data => { - showSpeakerModal(data.speaker); - }) - .catch(error => { - console.error('Error fetching speaker:', error); - }); + // Fetch speaker data (you may need to implement this endpoint) + fetch(`/speaker/get-speaker/${speakerId}/`) + .then(response => response.json()) + .then(data => { + showSpeakerModal(data.speaker); + }) + .catch(error => { + console.error('Error fetching speaker:', error); }); }); + }); }); diff --git a/pod/video/management/commands/recorder.py b/pod/video/management/commands/recorder.py index 3f46957772..3b700da435 100644 --- a/pod/video/management/commands/recorder.py +++ b/pod/video/management/commands/recorder.py @@ -87,8 +87,8 @@ ALLOW_MANUAL_RECORDING_CLAIMING = getattr( settings, "ALLOW_MANUAL_RECORDING_CLAIMING", False ) -# Debug mode (0: False, 1: True) -DEBUG = getattr(settings, "DEBUG", False) +# Debug mode +DEBUG = getattr(settings, "DEBUG", True) RECORDER_SELF_REQUESTS_PROXIES = getattr( settings, diff --git a/pod/video/static/js/ajax-display-channels.js b/pod/video/static/js/ajax-display-channels.js index 88e635ce5b..c927a9a1df 100644 --- a/pod/video/static/js/ajax-display-channels.js +++ b/pod/video/static/js/ajax-display-channels.js @@ -11,8 +11,8 @@ /** * Set attributes of an HTML element with a two-dimensional array. * - * @param {HTMLElement} htmlElement The HTML element. - * @param {string[][]} attributeCouples The two-dimensional array. + * @param {HTMLElement} htmlElement - The HTML element. + * @param {string[][]} attributeCouples - The two-dimensional array. */ function setAttributesWithTab(htmlElement, attributeCouples) { attributeCouples.forEach((attributeCouple) => { @@ -23,8 +23,8 @@ function setAttributesWithTab(htmlElement, attributeCouples) { /** * Get the channel list for a specific channel tab thanks to the AJAX request. * - * @param {*} page The page. - * @param {*} id The channel tab identifier. + * @param {*} page - The page. + * @param {*} id - The channel tab identifier. * * @returns The AJAX request promise. */ @@ -53,7 +53,7 @@ function getChannelsForSpecificChannelTabs(page, id = 0) { /** * Get the channel tab list thanks to the AJAX request. * - * @param {boolean} nameOnly If this options is `true`, the channel tab list contains the name of tab only. + * @param {boolean} nameOnly - If this options is `true`, the channel tab list contains the name of tab only. * * @returns The AJAX request promise. */ @@ -78,7 +78,7 @@ function getChannelTabsAjaxRequest() { /** * Get the theme list for a specific channel thanks to the AJAX request. * - * @param {string} channelSlug The channel slug. + * @param {string} channelSlug - The channel slug. * * @returns The AJAX request promise. */ @@ -106,8 +106,8 @@ function getThemesForSpecificChannel(channelSlug) { /** * Set the modal title when the user ask to view this modal. * - * @param {HTMLElement} modalContentElement The HTML element of the modal. - * @param {Array} channelsArray The channel list. + * @param {HTMLElement} modalContentElement - The HTML element of the modal. + * @param {Array} channelsArray - The channel list. */ function setModalTitle(modalContentElement, channelsCount) { const modalTitleElement = modalContentElement.querySelector(".modal-title"); @@ -124,7 +124,7 @@ function setModalTitle(modalContentElement, channelsCount) { /** * Convert a channel list to HTML modal list. * - * @param {Array} channelsArray The channel list. + * @param {Array} channelsArray - The channel list. * * @returns The HTML modal list. */ @@ -155,7 +155,7 @@ function convertToModalList(channelsArray) { /** * Convert a channel to a HTML modal list element. * - * @param {any} channel The channel to convert. + * @param {any} channel - The channel to convert. * * @returns The HTML modal list element. */ @@ -215,8 +215,8 @@ function convertToModalListElement(channel) { /** * Set the image in the innerHTML of span HTML element. * - * @param {HTMLElement} dFlexSpanElement The span HTML element. - * @param {any} channel The channel element. + * @param {HTMLElement} dFlexSpanElement - The span HTML element. + * @param {any} channel - The channel element. */ function setImageForModal(dFlexSpanElement, channel) { if (channel.headband) { @@ -227,8 +227,8 @@ function setImageForModal(dFlexSpanElement, channel) { /** * Set a channel theme collapse for the modal. * - * @param {HTMLElement} channelListElement The HTML element channel list. - * @param {any} channel The channel element. + * @param {HTMLElement} channelListElement - The HTML element channel list. + * @param {any} channel - The channel element. */ function setChannelThemeCollapseForModal( channelListElement, @@ -279,8 +279,8 @@ function setChannelThemeCollapseForModal( /** * Add a theme in a list. * - * @param {HTMLElement} listElement The HTML element list. - * @param {any} theme The theme. + * @param {HTMLElement} listElement - The HTML element list. + * @param {any} theme - The theme. */ function addThemeInList(listElement, theme) { const themeLiElement = document.createElement("li"); @@ -304,8 +304,8 @@ function addThemeInList(listElement, theme) { /** * Append child to span HTML element. This child is the theme button element. * - * @param {HTMLElement} spanElement The span HTML element. - * @param {any} channel The channel. + * @param {HTMLElement} spanElement - The span HTML element. + * @param {any} channel - The channel. */ function setChannelThemeButtonForModal(spanElement, channel) { const themesButtonElement = document.createElement("button"); @@ -328,7 +328,7 @@ function setChannelThemeButtonForModal(spanElement, channel) { /** * Create modal for a specific channel tab. * - * @param {any} channelTab The specific channel tab. + * @param {any} channelTab - The specific channel tab. */ function createModalFor(channelTab) { const headerElement = document.getElementsByTagName("header")[0]; @@ -401,9 +401,9 @@ function createModalFor(channelTab) { /** * Load the next batch of channels. * - * @param {HTMLElement} modalContentElement The modal content HTML element. - * @param {number} currentPage The current page. - * @param {boolean} allChannelsLoaded `true` if all channels loaded, `false` otherwise. + * @param {HTMLElement} modalContentElement - The modal content HTML element. + * @param {number} currentPage - The current page. + * @param {boolean} allChannelsLoaded - `true` if all channels loaded, `false` otherwise. */ function loadNextBatchOfChannels( modalContentElement, diff --git a/pod/video/static/js/change_video_owner.js b/pod/video/static/js/change_video_owner.js index 629aeff807..31fed33b99 100644 --- a/pod/video/static/js/change_video_owner.js +++ b/pod/video/static/js/change_video_owner.js @@ -100,7 +100,7 @@ /** * Add not found text * @param {HTMLElement} container - * @param {Boolean} clickable if true, text can be remove by a click on it + * @param {Boolean} clickable - if true, text can be remove by a click on it */ const addNotFound = (container, clickable = false) => { const div = document.createElement("DIV"); @@ -119,7 +119,7 @@ /** * Add or remove loader * @param {HTMLElement} container - * @param {Boolean} remove if true, try to remove loader + * @param {Boolean} remove - if true, try to remove loader */ const addRemoveLoader = (container = null, remove = false) => { let loader = document.querySelector(".manage-video__loader"); @@ -140,7 +140,7 @@ /** * Add element in list * @param {Number} el - * @param {Array} list where to add element + * @param {Array} list - where to add element */ const addInChoosedVideosArray = (el) => { if (choosed_videos.includes(el)) @@ -150,8 +150,8 @@ /** * - * @param {HTMLInputElement} input field - * @param {Number} user_id user ID + * @param {HTMLInputElement} input - field + * @param {Number} user_id - user ID */ const setOwner = (input, user_id) => { if (input.id.includes("newlogin")) new_username_id = user_id; @@ -160,8 +160,8 @@ /** * return GET param from url * @param {String} url - * @param {String} param key name - * @param {defaultValue} default value if not found + * @param {String} param - key name + * @param {defaultValue} default - value if not found * @return {String} value found or default value */ const getSearchParamFromURL = (url, key, defaultValue = null) => { @@ -199,7 +199,7 @@ /** * Listener to pagination next page - * @param {ClickEvent} e emitted event + * @param {ClickEvent} e - emitted event */ const nextPreviousHandler = function (e) { e.preventDefault(); @@ -254,7 +254,7 @@ /** * Clear suggestion elements - * @param {HTMLElement} suggestion suggestion container + * @param {HTMLElement} suggestion - suggestion container */ const clearSuggestions = (suggestion) => { suggestion.textContent = ""; @@ -262,9 +262,9 @@ /** * Make request to url - * @param {String} url request url - * @param {String} method request method - * @param {FormData} body post data + * @param {String} url - request url + * @param {String} method - request method + * @param {FormData} body - post data * @returns {Promise} response */ const makeRequest = ( @@ -287,9 +287,9 @@ /** * Add search event to an input element with delay before user stops writing - * @param {HTMLInputElement} input field to add listener - * @param {Function} callback event action - * @param {Number} delay wait time after user stops writing before executing callback + * @param {HTMLInputElement} input - field to add listener + * @param {Function} callback - event action + * @param {Number} delay - wait time after user stops writing before executing callback */ const addSearchListener = (input, callback, delay = 1100) => { let timer = null; @@ -340,9 +340,9 @@ /** * Add click event on user suggestion to get some of his videos - * @param {HTMLParagraphElement} p element to add listener + * @param {HTMLParagraphElement} p - element to add listener * @param {Number} user_id - * @param {HTMLInputElement} input field to set value with user fullname + * @param {HTMLInputElement} input - field to set value with user fullname */ const addGetVideosListener = (p, user_id, input, ..._) => { p.addEventListener("click", (e) => { @@ -465,12 +465,12 @@ /** * - * @param {String} text user first_name & last_name - * @param {Number} id user id - * @param {HTMLInputElement} input field - * @param {String} cls css class - * @param {Callable} listenerCallback callback on click - * @param {String} url current url + * @param {String} text - user first_name & last_name + * @param {Number} id - user id + * @param {HTMLInputElement} input - field + * @param {String} cls - css class + * @param {Callable} listenerCallback - callback on click + * @param {String} url - current url */ const addSuggestionElement = ( text, diff --git a/pod/video/static/js/regroup_videos_by_theme.js b/pod/video/static/js/regroup_videos_by_theme.js index f493695c12..ba11f17181 100644 --- a/pod/video/static/js/regroup_videos_by_theme.js +++ b/pod/video/static/js/regroup_videos_by_theme.js @@ -29,9 +29,9 @@ function run(has_more_themes, Helper) { /** * Make request to url - * @param {String} url request url - * @param {String} method request method - * @param {FormData} body post data + * @param {String} url - request url + * @param {String} method - request method + * @param {FormData} body - post data * @returns {Promise} json response */ const makeRequest = (url, method = "GET", body = new FormData()) => { diff --git a/pod/video/static/js/validate-date_delete-field.js b/pod/video/static/js/validate-date_delete-field.js index a7582dab84..42ba012e92 100644 --- a/pod/video/static/js/validate-date_delete-field.js +++ b/pod/video/static/js/validate-date_delete-field.js @@ -69,8 +69,8 @@ window.onload = function () { /** * Display a validation error message on current input - * @param {String} msg message to be displayed - * @param {String} type error code (added as css class) + * @param {String} msg - message to be displayed + * @param {String} type - error code (added as css class) */ function add_error_message(msg, type) { let error_message = document.createElement("li"); diff --git a/pod/video/static/js/video-show.js b/pod/video/static/js/video-show.js index c6599a4380..6433024244 100644 --- a/pod/video/static/js/video-show.js +++ b/pod/video/static/js/video-show.js @@ -30,8 +30,8 @@ document /** * Translate the title of the video player button. * - * @param {string} querySelectorButton The query selector for the button. - * @param {string} title The title. + * @param {string} querySelectorButton - The query selector for the button. + * @param {string} title - The title. */ function translateTitleOfVideoPlayerButton(querySelectorButton, title) { let translatedTitle = title; diff --git a/pod/video/static/js/video_category.js b/pod/video/static/js/video_category.js index 098a32c9d8..2ed3e548e5 100644 --- a/pod/video/static/js/video_category.js +++ b/pod/video/static/js/video_category.js @@ -54,7 +54,7 @@ if (searchCategoriesInput) { /** * Manage search category input to display chosen ones * - * @param search {string} : Search input string + * @param {string} search - Search input string */ function manageSearchCategories(search) { let categories = document.querySelectorAll( @@ -77,7 +77,7 @@ function manageSearchCategories(search) { /** * Toggle category links and filter dashboard's videos list with given categories * - * @param el {HTMLElement} : Category link clicked + * @param {HTMLElement} el - Category link clicked */ function toggleCategoryLink(el) { el.parentNode.classList.toggle("active"); @@ -87,9 +87,9 @@ function toggleCategoryLink(el) { /** * Build and return url for Get or Post categories methods * - * @param action {string} : Action defined "add", "edit" or "delete" - * @param slug {string} : Category slug given for edit or delete (can be null) - * @returns {string} : Returns built URL + * @param {string} action - Action defined "add", "edit" or "delete" + * @param {string} slug - Category slug given for edit or delete (can be null) + * @returns {string} - Returns built URL */ function getCategoriesUrl(action, slug = null) { let url; @@ -112,8 +112,8 @@ function getCategoriesUrl(action, slug = null) { /** * Async call to create Add, Edit or Delete Modal for categories managment * - * @param url {string} : Url to call (add, edit, delete) - * @param page {number} : Page url managment (can be null) + * @param {string} url - Url to call (add, edit, delete) + * @param {number} page - Page url managment (can be null) */ function get_category_modal(url, page = null) { if (page) { @@ -174,7 +174,7 @@ function get_category_modal(url, page = null) { /** * Async call to post Add, Edit or Delete categories * - * @param url {string} : Url to call (add, edit, delete) + * @param {string} url - Url to call (add, edit, delete) */ function post_category_modal(url) { let formData = new FormData(); @@ -227,7 +227,7 @@ function post_category_modal(url) { /** * Manage category videos pagination (category modal's videos list) * - * @param el {HTMLElement} : Previous or next clicked button + * @param {HTMLElement} el - Previous or next clicked button */ function manageCategoryVideosPagination(el) { let currentPage = parseInt( diff --git a/pod/video/static/js/video_edit.js b/pod/video/static/js/video_edit.js index 9d1d343c63..a12700e027 100644 --- a/pod/video/static/js/video_edit.js +++ b/pod/video/static/js/video_edit.js @@ -41,8 +41,8 @@ function applySelect2Style() { /** * Toggle the password field visibility based on the visibility select value. * - * @param visibilitySelect {HTMLSelectElement} - The select element with the visibility options. - * @param passwordField {HTMLElement} - The password field container. + * @param {HTMLSelectElement} visibilitySelect - The select element with the visibility options. + * @param {HTMLElement} passwordField - The password field container. */ function toggleFields(visibilitySelect, passwordField) { const idRestrictToGroupsField = document.getElementById( @@ -103,8 +103,8 @@ function toggleFields(visibilitySelect, passwordField) { /** * Display the description of the selected option in a select box. * - * @param selectBox {HTMLElement} - The select element. - * @param container {HTMLElement} - The container element where the description will be displayed. + * @param {HTMLElement} selectBox - The select element. + * @param {HTMLElement} container - The container element where the description will be displayed. */ function display_option_desc(selectBox, container) { // Display in $container the title of current $selectedBox option. diff --git a/pod/video/static/js/video_select.js b/pod/video/static/js/video_select.js index 1450659114..55e3dc4082 100644 --- a/pod/video/static/js/video_select.js +++ b/pod/video/static/js/video_select.js @@ -22,7 +22,7 @@ var countSelectedVideosBadge = document.getElementById( /** * Get list of selected videos's titles based on selected videos * - * @param {string} container : Identifier of container = selectedVideos's key + * @param {string} container - Identifier of container = selectedVideos's key * @returns {*[video_title]} */ function getListSelectedVideosTitles(container) { @@ -43,7 +43,7 @@ function getListSelectedVideosTitles(container) { /** * Set shared/global variable selectedVideos with selected videos based on class selected * - * @param {string} container : Identifier of container = selectedVideos's key + * @param {string} container - Identifier of container = selectedVideos's key */ function setListSelectedVideos(container) { if (container === videosListContainerId) { @@ -60,7 +60,7 @@ function setListSelectedVideos(container) { /** * Set directly selected videos on interface to improve user experience * - * @param {string} container : Identifier of container = selectedVideos's key + * @param {string} container - Identifier of container = selectedVideos's key */ function setSelectedVideos(container) { Array.from(selectedVideos[container]).forEach((elt) => { @@ -76,7 +76,7 @@ function setSelectedVideos(container) { /** * Replace count of selected videos (count label in "Apply" bulk update's badge) * - * @param {string} container : Identifier of container = selectedVideos's key + * @param {string} container - Identifier of container = selectedVideos's key */ function replaceSelectedCountVideos(container) { let newCount = selectedVideos[container].length; @@ -99,8 +99,8 @@ function replaceSelectedCountVideos(container) { /** * Toggle class selected for video cards or list-item, avoid select a video when click on links * - * @param {HTMLElement} item : HTMLElement to be toggled - * @param {string} container : Identifier of container = selectedVideos's key + * @param {HTMLElement} item - HTMLElement to be toggled + * @param {string} container - Identifier of container = selectedVideos's key */ function toggleSelectedVideo(item, container) { if (item.checked) { @@ -121,9 +121,9 @@ function toggleSelectedVideo(item, container) { } /** - * Clear videos selection : deselect all videos, reset badge count + * Clear videos selection: deselect all videos, reset badge count * - * @param {string} container : Identifier of container = selectedVideos's key + * @param {string} container - Identifier of container = selectedVideos's key */ function clearSelectedVideo(container) { selectedVideos[container] = []; @@ -148,7 +148,7 @@ function resetDashboardElements() { * Get list of selected videos slugs (HTML li formated) for modal confirm display. * * @param {HTMLElement} container - The container element that holds the selected videos. - * @returns {string} - HTML string of badges for the selected video titles. + * @returns {string} HTML string of badges for the selected video titles. */ function getHTMLBadgesSelectedTitles(container) { let str = ""; @@ -164,7 +164,7 @@ function getHTMLBadgesSelectedTitles(container) { /** * Select all videos (visible infinite-item) on given container * - * @param {string} container : Identifier of the infinite-items's container + * @param {string} container - Identifier of the infinite-items's container */ function selectAllVideos(container) { let selector = "#" + container + " .card-select-input"; diff --git a/pod/video/templates/videos/video-script.html b/pod/video/templates/videos/video-script.html index abfc9fefcd..82ad8a8bbb 100644 --- a/pod/video/templates/videos/video-script.html +++ b/pod/video/templates/videos/video-script.html @@ -37,11 +37,11 @@ options = { notSupportedMessage: "{% trans 'Please use different browser' %} (Mozilla Firefox, Google Chrome, Safari, Microsoft Edge)", //language: "fr", //en or nl - {% if video.is_video and request.GET.is_iframe %} - fluid: false, - {% else %} - fluid: true, - {% endif %} + {% if video.is_video and request.GET.is_iframe %} + fluid: false, + {% else %} + fluid: true, + {% endif %} responsive: true, playbackRates: {{video_playbackrates}}, userActions: { diff --git a/pod/video_encode_transcript/transcript.py b/pod/video_encode_transcript/transcript.py index a13b779e03..d19543222c 100644 --- a/pod/video_encode_transcript/transcript.py +++ b/pod/video_encode_transcript/transcript.py @@ -33,7 +33,7 @@ import threading import logging -DEBUG = getattr(settings, "DEBUG", False) +DEBUG = getattr(settings, "DEBUG", True) if getattr(settings, "USE_PODFILE", False): __FILEPICKER__ = True diff --git a/pod/video_search/utils.py b/pod/video_search/utils.py index 270857ed3c..677c87ae7b 100644 --- a/pod/video_search/utils.py +++ b/pod/video_search/utils.py @@ -10,7 +10,7 @@ logger = logging.getLogger(__name__) -DEBUG = getattr(settings, "DEBUG", False) +DEBUG = getattr(settings, "DEBUG", True) ES_URL = getattr(settings, "ES_URL", ["http://elasticsearch.localhost:9200/"]) ES_INDEX = getattr(settings, "ES_INDEX", "pod") From 70dcdf76dab8182f459cc0df0a11573e9ae3b920 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 22 Jan 2025 10:32:21 +0000 Subject: [PATCH 09/18] Fixup. Format code with Prettier --- pod/meeting/static/js/my_meetings.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pod/meeting/static/js/my_meetings.js b/pod/meeting/static/js/my_meetings.js index 5e90b86b4e..4a80fb66ec 100644 --- a/pod/meeting/static/js/my_meetings.js +++ b/pod/meeting/static/js/my_meetings.js @@ -102,7 +102,11 @@ function generateHtml(data, level = 0) { for (let k in data) { if (typeof data[k] === "object") { html += - "
  • " + k + ": " + generateHtml(data[k], level++) + "
    • "; + "
  • " + + k + + ": " + + generateHtml(data[k], level++) + + "
    • "; } else { html += "
  • " + k + ": " + data[k] + "
    • "; } From 3fd40aa0e600c4036facc36b7d1a726c2717ee03 Mon Sep 17 00:00:00 2001 From: Olivier Bado-Faustin <12731381+Badatos@users.noreply.github.com> Date: Wed, 22 Jan 2025 11:46:28 +0100 Subject: [PATCH 10/18] Fix Typo #1225 (#1235) * Fix Typo #1225 + replace generic i18n strings by named dict * Replace translated f-strings * cleanup i18n strings + increase sqlite timeout --- pod/ai_enhancement/forms.py | 7 +- pod/completion/static/js/caption_maker.js | 4 +- pod/locale/fr/LC_MESSAGES/django.mo | Bin 219595 -> 219632 bytes pod/locale/fr/LC_MESSAGES/django.po | 136 ++++++++---------- pod/locale/fr/LC_MESSAGES/djangojs.mo | Bin 21269 -> 21274 bytes pod/locale/fr/LC_MESSAGES/djangojs.po | 7 +- pod/locale/nl/LC_MESSAGES/django.po | 96 ++++++------- pod/locale/nl/LC_MESSAGES/djangojs.po | 5 +- pod/main/tasks.py | 16 +-- .../templatetags/flat_page_edito_filter.py | 2 +- pod/main/test_settings.py | 2 +- pod/meeting/webinar.py | 40 +++--- pod/meeting/webinar_utils.py | 62 ++++---- pod/playlist/forms.py | 11 +- pod/playlist/tests/test_forms.py | 6 +- pod/playlist/views.py | 2 +- pod/quiz/forms.py | 4 +- pod/quiz/models.py | 4 +- pod/video/utils.py | 5 +- 19 files changed, 197 insertions(+), 212 deletions(-) diff --git a/pod/ai_enhancement/forms.py b/pod/ai_enhancement/forms.py index bb18df55f7..f0bc053370 100644 --- a/pod/ai_enhancement/forms.py +++ b/pod/ai_enhancement/forms.py @@ -69,11 +69,8 @@ class Meta: "aria-describedby": "id_titleHelp", }, ), - help_text=_( - """ - Please choose a title between 1 and 250 characters. - """ - ), + help_text=_("Please choose a title between 1 and %(max)s characters.") + % {"max": 250}, ) description = forms.CharField( diff --git a/pod/completion/static/js/caption_maker.js b/pod/completion/static/js/caption_maker.js index 6bee3f3385..55a873b052 100644 --- a/pod/completion/static/js/caption_maker.js +++ b/pod/completion/static/js/caption_maker.js @@ -961,11 +961,11 @@ function createCaptionBlock(newCaption, spawnFunction) { this.div.append(this.numberCharactersDiv); this.div.append(this.buttonsDiv); + const nbCharsMsg = gettext("%s/%s characters"); // Update numberCharactersDiv content const updateCharacterCount = () => { let nbCharacters = this.captionTextInput.value.length; - this.numberCharactersDiv.textContent = - nbCharacters + gettext("/80 characters"); + this.numberCharactersDiv.textContent = interpolate(nbCharsMsg, [nbCharacters, 80]); if (nbCharacters > 80) { this.numberCharactersDiv.append(this.numberCharactersAlert); } diff --git a/pod/locale/fr/LC_MESSAGES/django.mo b/pod/locale/fr/LC_MESSAGES/django.mo index e17f63bc1b22991a56a00d3bcf49405df79ed881..f38f308794742ae77a199f06883d2fb2daac42ba 100644 GIT binary patch delta 48715 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 diff --git a/pod/locale/fr/LC_MESSAGES/django.po b/pod/locale/fr/LC_MESSAGES/django.po index e09a598279..884fcd543d 100644 --- a/pod/locale/fr/LC_MESSAGES/django.po +++ b/pod/locale/fr/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Pod\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-27 12:02+0100\n" +"POT-Creation-Date: 2024-12-11 15:32+0000\n" "PO-Revision-Date: \n" "Last-Translator: obado \n" "Language-Team: Pod Team cotech-esup-pod@esup-portail.org\n" @@ -101,15 +101,11 @@ msgstr "La discipline proposée par l’IA Aristote." msgid "Title" msgstr "Titre" -#: pod/ai_enhancement/forms.py -msgid "" -"\n" -" Please choose a title between 1 and 250 characters.\n" -" " -msgstr "" -"\n" -" Veuillez entrer un titre contenant entre 1 et 250 caractères.\n" -" " +#: pod/ai_enhancement/forms.py pod/playlist/forms.py pod/quiz/forms.py +#: pod/quiz/models.py +#, python-format +msgid "Please choose a title between 1 and %(max)s characters." +msgstr "Veuillez entrer un titre contenant entre 1 et %(max)s caractères." #: pod/ai_enhancement/forms.py pod/live/models.py pod/main/forms.py #: pod/main/models.py pod/playlist/forms.py pod/playlist/models.py @@ -4795,7 +4791,7 @@ msgstr "Dernières vidéos" msgid "Most views" msgstr "Les plus vues" -#: pod/main/models.py +#: pod/main/models.py pod/video/models.py msgid "Order" msgstr "Ordre" @@ -6514,7 +6510,7 @@ msgstr "" "

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

    \n" "

    Cordialement

    \n" -" " +" " #: pod/meeting/views.py #, python-format @@ -6597,23 +6593,25 @@ msgstr "Vous ne pouvez pas redémarrer ce webinaire en direct." #: pod/meeting/webinar.py #, python-format -msgid "Webinar mode has been successfully started for “%s” meeting." -msgstr "Le mode webinaire a bien été démarré pour la réunion « %s »." +msgid "Webinar mode has been successfully started for “%(name)s” meeting." +msgstr "Le mode webinaire a bien été démarré pour la réunion « %(name)s »." #: pod/meeting/webinar.py #, python-format -msgid "Error to start webinar mode for “%s” meeting: %s" -msgstr "Erreur de démarrage du mode webinaire pour la réunion « %s » : %s" +msgid "Error to start webinar mode for “%(name)s” meeting: %(exc)s" +msgstr "" +"Erreur de démarrage du mode webinaire pour la réunion « %(name)s » : %(exc)s" #: pod/meeting/webinar.py #, python-format -msgid "Webinar mode has been successfully stopped for “%s” meeting." -msgstr "Le mode webinaire a bien été arrêté pour la réunion « %s »." +msgid "Webinar mode has been successfully stopped for “%(name)s” meeting." +msgstr "Le mode webinaire a bien été arrêté pour la réunion « %(name)s »." #: pod/meeting/webinar.py #, python-format -msgid "Error to stop webinar mode for “%s” meeting: %s" -msgstr "Erreur dans l’arrêt du mode webinaire pour la réunion « %s » : %s" +msgid "Error to stop webinar mode for “%(name)s” meeting: %(exc)s" +msgstr "" +"Erreur de démarrage du mode webinaire pour la réunion « %(name)s » : %(exc)s" #: pod/meeting/webinar.py msgid "" @@ -6630,38 +6628,41 @@ msgstr "Trop de webinaires" #: pod/meeting/webinar_utils.py #, python-format msgid "" -"There are too many webinars (%s) for the number of live gateways allocated " -"(%s). The next meeting has been created but not like a webinar:%s %s [%s-" -"%s].\n" +"There are too many webinars (%(nb_webinars)s) for the number of live " +"gateways allocated (%(nb_live_gateways)s). The next meeting has been created " +"but not like a webinar: %(id)s %(name)s [%(start_at)s-%(end_at)s].\n" "Please fix the problem either by increasing the number of live gateways or " "by modifying/deleting one of the affected webinars (with the users’ " "agreement).\n" -"Other webinars: %s" +"Other webinars: %(names_webinars)s" msgstr "" -"Il y a trop de webinaires (%s) pour le nombre de passerelles de live " -"allouées (%s). La prochaine réunion a été créée mais pas comme un webinaire :" -"%s %s [%s-%s].\n" +"Il y a trop de webinaires (%(nb_webinars)s) pour le nombre de passerelles de " +"live allouées (%(nb_live_gateways)s). La prochaine réunion a été créée mais " +"pas comme un webinaire : %(id)s %(name)s [%(start_at)s-%(end_at)s].\n" "Veuillez résoudre le problème en augmentant le nombre de passerelles de live " "ou en modifiant/supprimant l’un des webinaires concernés (avec l’accord des " "utilisateurs).\n" -"Autres webinaires : %s" +"Autres webinaires : %(names_webinars)s" #: pod/meeting/webinar_utils.py #, python-format msgid "" -"

    There are too many webinars (%s) for the number of live gateways " -"allocated (%s). The next webinar has been created but not like a " -"webinar:

    • %s %s [%s-%s].

    Please fix the problem " -"either by increasing the number of live gateways or by modifying/deleting " -"one of the affected webinars (with the users’ agreement).
    Other webinars: " -"%s" +"

    There are too many webinars (%(nb_webinars)s) for the " +"number of live gateways allocated (%(nb_live_gateways)s). " +"The next webinar has been created but not like a webinar:" +"

    • %(id)s %(name)s [%(start_at)s-%(end_at)s].

      • Please fix the problem either by increasing the number of live " +"gateways or by modifying/deleting one of the affected webinars (with the " +"users’ agreement).
      Other webinars: %(names_webinars)s" msgstr "" -"

      Il y a trop de webinaires (%s) pour le nombre de passerelles live " -"allouées (%s). La prochaine réunion a été créée mais pas comme un " -"webinaire :

      • %s %s [%s-%s].

      Veuillez résoudre " -"le problème en augmentant le nombre de passerelles live ou en modifiant/" -"supprimant l’un des webinaires concernés (avec l’accord des utilisateurs)." -"
      Autres webinaires : %s" +"

      Il y a trop de webinaires (%(nb_webinars)s) pour le " +"nombre de passerelles live allouées (%(nb_live_gateways)s). " +"La prochaine réunion a été créée mais pas comme un webinaire :

      • %(id)s %(name)s [%(start_at)s-%(end_at)s]." +"

      Veuillez résoudre le problème en augmentant le nombre de " +"passerelles live ou en modifiant/supprimant l’un des webinaires concernés " +"(avec l’accord des utilisateurs).
      Autres webinaires : " +"%(names_webinars)s" #: pod/playlist/apps.py pod/playlist/models.py #: pod/playlist/templates/playlist/add_or_edit.html @@ -6685,10 +6686,6 @@ msgstr "Informations générales" msgid "Security informations" msgstr "Informations de sécurité" -#: pod/playlist/forms.py pod/quiz/forms.py pod/quiz/models.py -msgid "Please choose a title between 1 and 250 characters." -msgstr "Veuillez entrer un titre contenant entre 1 et 250 caractères." - #: pod/playlist/forms.py pod/playlist/models.py msgid "Please choose a description. This description is empty by default." msgstr "Veuillez choisir une description. Celle-ci est vide par défaut." @@ -6738,12 +6735,10 @@ msgstr "Lecture automatique" msgid "Please choose if this playlist is an autoplay playlist or not." msgstr "Veuillez choisir si cette playlist est en lecture automatique ou non." -#: pod/playlist/forms.py -#, python-brace-format -msgid "You cannot create a playlist named \"{FAVORITE_PLAYLIST_NAME}\"" -msgstr "" -"Vous ne pouvez pas créer une liste de lecture nommée " -"\"{FAVORITE_PLAYLIST_NAME}\"" +#: pod/playlist/forms.py pod/playlist/tests/test_forms.py +#, python-format +msgid "You cannot create a playlist named “%(name)s”" +msgstr "Vous ne pouvez pas créer une liste de lecture nommée « %(name)s »" #: pod/playlist/forms.py msgid "Remove playlist cannot be undone" @@ -6774,15 +6769,6 @@ msgstr "Protégé par un mot de passe" msgid "Private" msgstr "Privé" -#: pod/playlist/models.py -#, python-brace-format -msgid "" -"Please choose a title between 1 and {__MAX_LENGTH_FOR_PLAYLIST_NAME__} " -"characters." -msgstr "" -"Veuillez entrer un titre contenant entre 1 et " -"{__MAX_LENGTH_FOR_PLAYLIST_NAME__} caractères." - #: pod/playlist/models.py msgid "" "Selecting this setting causes your playlist to be promoted on the page " @@ -7163,6 +7149,7 @@ msgid "contact its owner" msgstr "contacter son propriétaire" #: pod/playlist/templatetags/favorites_playlist.py +#: pod/playlist/tests/test_forms.py msgid "Favorites" msgstr "Favoris" @@ -7170,10 +7157,6 @@ msgstr "Favoris" msgid "This field is required." msgstr "Ce champ est requis." -#: pod/playlist/tests/test_forms.py -msgid "You cannot create a playlist named \"Favorites\"" -msgstr "Vous ne pouvez créer une liste de lecture nommé \"Favoris\"" - #: pod/playlist/tests/test_views.py pod/playlist/views.py #, python-format msgid "Playlist: %(name)s" @@ -7187,6 +7170,10 @@ msgstr "Vous ne pouvez pas accéder à cette liste de lecture." msgid "The playlist has been deleted." msgstr "La liste de lecture a été supprimée." +#: pod/playlist/views.py +msgid "Delete the playlist" +msgstr "Supprimer la liste de lecture" + #: pod/playlist/views.py #, python-format msgid "Edit the playlist “%(pname)s”" @@ -7202,9 +7189,9 @@ msgstr "" "Les données envoyées pour créer la liste de lecture ne sont pas valides." #: pod/playlist/views.py -#, python-brace-format -msgid "Edit playlist “{playlist.name}”" -msgstr "Éditer la liste de lecture « {playlist.name} »" +#, python-format +msgid "Edit playlist “%(name)s”" +msgstr "Modifier la liste de lecture « %(name)s »" #: pod/playlist/views.py msgid "JSON in wrong format" @@ -7587,7 +7574,7 @@ msgstr "Veuillez choisir si les réponses correctes seront affichées ou non." msgid "Quizzes" msgstr "Quiz" -#: pod/quiz/models.py +#: pod/quiz/models.py pod/quiz/tests/test_models.py msgid "Quiz of video" msgstr "Quiz de la vidéo" @@ -10454,8 +10441,10 @@ msgstr "Veuillez entrer un titre." #: pod/video/utils.py #, python-format -msgid "Please enter a %s from 2 to %s characters." -msgstr "Veuillez entrer un %s contenant entre 2 et %s caractères." +msgid "Please enter a %(field_name)s from 2 to %(max_length)s characters." +msgstr "" +"Veuillez entrer un %(field_name)s contenant entre 2 et %(max_length)s " +"caractères." #: pod/video/views.py msgid "You cannot edit this channel." @@ -10881,12 +10870,3 @@ msgstr "Résultats de la recherche" #: pod/xapi/apps.py msgid "Esup-Pod xAPI" msgstr "xAPI Esup-Pod" - -#~ msgid "Delete this record." -#~ msgstr "Supprimer cet enregistrement." - -#~ msgid "Preview record." -#~ msgstr "Prévisualiser l’enregistrement." - -#~ msgid "Number of video inside the channel" -#~ msgstr "Nombre de vidéo à l’intérieur de la chaîne" diff --git a/pod/locale/fr/LC_MESSAGES/djangojs.mo b/pod/locale/fr/LC_MESSAGES/djangojs.mo index c1dd60b3f06b19e0eaf9ac0b380a8f2a58a31646..a84e3a9742d0f32f21e61f8231263249740d6eb7 100644 GIT binary patch delta 3570 zcmXZe3(S^f83*wDjgy?urx5r!eVjzT5IIVqd?bfYP6AOm44NRd2}q>K*gG=a8ktPS zBsDWia1)n8*&Hy@*7CqGm$Q`yHFDsR7}Mqy(SHBE@AmEe-Ou|x?|om_bzk=bd-hiz z*Pv zV!4BUQhvxJ_9(C5Gt9itvjdM+4f5bCY{P#s3!Y^b_>}oUSLvseeRw5DvMZaJg_m(T zzsr$4&Lnh>3E*RFyND(k z4`%|K;v=PB&LR8}v*-Jn`Cj8(o~Nyz6qO3E=BY$u=_GTV+cAK>hl0W}<^k z*T2e4c!A^DtD$zknF)L~vz2#Kre!Bnkz-6nPIGA0pp|bkQ6q2X0XBh0Be!c^`9imCLnO7?sr(@SfZt+|W-%6=c!Wd53gJ}YPHUS<~PE2#V$=5PHu!(8n`|9_1GClGb6W}4X<{4()bHmj?$D$%V$(9auuUy46 z+Y>YL`8$6W8Idx#CL&oGr~E&3_!%{#e}+xQZl#4^KMZ30(T4W=9H zu%)8ik@J4VxO~@o;g5`UrsOqT;TN_VV}Oub@U1- zuP{w~mV0ylKQUO~i-#Q28+nS&Y_vh&;P;r!{>XNGj~*%K*^Ps*sU6EE=G-r2Ds~&Q z;8tdf_cHUo#RS-Yq7!EQvdCZ-*KsDF;#YZ&*_x4_&YsO)y}Ica-_vC3fZ{om}l=&}@(w%gs!No7kIMsU6CL?7<_?f#t0R$N0-!{m^mzmOao24r`lv!XJ z2Xh%G@cVS~$^rT-Z~GX{zUu7dSFUF!UQbh&UDWX9&rCqAl_~Q~q?2DQ>kPK|Vh=a5 zv*$gJn1Q?-!q@w{dB;uvUqQ%pR_1PQ|?(!zY;c!t3nF(`>{4 zFcrMWv20vaJ7!Cn=kDMn-opg`+#>aFG&tppbbXt}wGt0xG8)JHa2B%#EfjoN#Z=&F zj^k-M(xvkf|2yJ*{*FK8AT}?p&GQ{LxZc35yK9s|dxPJz17G3U5A%1e#OCoMHXlCS Ov+cn8@NCo7L;nv?T!~Zw delta 3565 zcmXZddu&d39LMqRgKE+HO{+R>wN>q^R7f6b6IBZ&(2Aj=k+_!bI$Mg{eFMn-|41S--cG- zx*1NWnf(}Lwis_>G0uv1-HN$fcVZz%$Cy2b6R|5U!Zcir!PtV_YONT8Z5WOxF%~aj zf4qyDHzw8`%V02`Un8&q2jd!i9uMF^?8H9UtG8KqOvgaX#%#>TVfY#j!A&>_Ph%!N zMa`EU=iWcXb9J0!rV8xg3)zl|_#JAYn;41rFa-nR2?8@vndYG~FGrHHTBL}!0C~jT zLnYRNLAV<=?*Z(IZ4Lw7cpL-p7u14RQ42gmJrF|rDrGeG#WW1V64b(zaVpNo0oaa8 z=o%`32dGK~Cb;wFqqfkgV4xCBK;5_;HE}a4|S`WUCy@qu!cu9!^3BmBCqL+wC!S!*DuJfyAH!OvWBK1QmE8 zs-)F89H-%AT!*Y>S1=W=pS#6r7{U5h%0K~3MU`wJs(V+VO5W^Ue}tOoGgQ}ipeDSH zIT)Gb{$7F#d=_demm-;36RIL@sEYiADGmc4-)f>%oR8%=5BDL-TRe5sg2PeQGf{!8 z#3bB^IyHw;mAiq&WRa|*JBQmKCsgJ*m}vKB;|3@sBgum<_F zWqjztEvVzR!*j3aQSbLts0GiUGQWz-I4a#N3rkP|FT?;`o=*LBgTohUt}jpv96_Cm z4x|`%50ybI^;L6~p{^azy_m#xC#o`Ch`s=$@NKNZmH0Js60MN8S}xW)3J)V0R~doY+ay$J^H2*`UzBF&rtVRW}(h~IjUl_Q420X zZLuFU?-^8p(RpUQS>Gxc6ysbh!X5Y`UO{b53U_PI#-J)xjU(`79Ea<@>x-!Wg3)|1 zv`Wv_sQC_|o_mNPID}6A|Nnmx1HD)#pfX&5F}MV22V0Agco22pNz{AbchsIf#%PSC z<>^Dq!YHgo1zeA6$|cwfSD>2tg97T`oxwJ~&;*})KO99pcmXxhWz;Enh}yfpbe00i z!Z}!uT6i}qu=5y)*HJy-Bkg!B#jZFLnabvjp#I8W6JIERL#T;PV=(@W>hf-Epqi@; zldvA?FKb5Dur}0v54_(CM!E}5NA=EPoQ8hXF~5ZgnD2~Y-x*9o?b!kBi#Jf+9mvM1 zWWlH{h(iUMh03THWAPQ#0u8tlPoV-FM?)#_rI>^*sQZtgPM33*fhK;0DqXK)x)Kvn z3*=)ztU(&y79l6kwj+ObmXCoLNu7E5*+|sHb;y*~j5NG`iwfu&YMva*#mRSUE`vtC zSceVRz0{p>8B$H#j{WgxOvWypAuW`O6v?WPWNj^`;z`s3f1(md9_#*Ii0X+In1X&x z)cHTiKpB3IytM2->bNCywsaaYQ4i*NR-#Tvop-$g)vSK+`eW352eAOpqqZ=t%uOHx zb^j<#V|^=Qpvd3CJY0`z!VV0?d#J5>f?*g;2Wb!cq9z`Ss!S0U;T)vOwhdLmE2#6{ zuiX7No{bq?=b@u6pUFTs)T8!x87hEXNbq(J)#dRO{LjZJs6E|M435Pwu?e5UqRH+&uVNC{^{925GZ^$>un&9USD1?(7>rLa1Oxql zgyi@t{PCfMzN-CGLrZ-=^S6ZE@%7l>6#jYmsI JZw(%l@*mGTgs}hs diff --git a/pod/locale/fr/LC_MESSAGES/djangojs.po b/pod/locale/fr/LC_MESSAGES/djangojs.po index 458326e710..b3fe2fdb24 100644 --- a/pod/locale/fr/LC_MESSAGES/djangojs.po +++ b/pod/locale/fr/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Esup-Pod\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-27 12:02+0100\n" +"POT-Creation-Date: 2024-12-11 11:36+0000\n" "PO-Revision-Date: \n" "Last-Translator: obado \n" "Language-Team: \n" @@ -230,8 +230,9 @@ msgid "Time stamps" msgstr "Horodatages" #: pod/completion/static/js/caption_maker.js -msgid "/80 characters" -msgstr "80 caractères" +#, javascript-format +msgid "%s/%s characters" +msgstr "%s/%s caractères" #: pod/completion/static/js/caption_maker.js msgid "Error loading caption file: " diff --git a/pod/locale/nl/LC_MESSAGES/django.po b/pod/locale/nl/LC_MESSAGES/django.po index 02d4a85449..b3a6957579 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: 2024-11-27 12:02+0100\n" +"POT-Creation-Date: 2024-12-11 15:32+0000\n" "PO-Revision-Date: 2024-07-04 17:54+0200\n" "Last-Translator: obado \n" "Language-Team: \n" @@ -101,11 +101,10 @@ msgstr "" msgid "Title" msgstr "Titel" -#: pod/ai_enhancement/forms.py -msgid "" -"\n" -" Please choose a title between 1 and 250 characters.\n" -" " +#: pod/ai_enhancement/forms.py pod/playlist/forms.py pod/quiz/forms.py +#: pod/quiz/models.py +#, python-format +msgid "Please choose a title between 1 and %(max)s characters." msgstr "" #: pod/ai_enhancement/forms.py pod/live/models.py pod/main/forms.py @@ -2771,15 +2770,15 @@ msgstr "" #: pod/import_video/views.py #, python-format msgid "" -"This video “%(name)s” was uploaded to Pod; its origin is %(type)s: %(url)s

      %(desc)s" +"This video “%(name)s” was uploaded to Pod; its origin is %(type)s: %(url)s

      %(desc)s" 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 @@ -4457,7 +4456,7 @@ msgstr "" msgid "Get the file name" msgstr "" -#: pod/main/models.py pod/video/models.py +#: pod/main/models.py msgid "order" msgstr "" @@ -6145,8 +6144,8 @@ msgstr "" msgid "" "\n" "

      Hello,

      \n" -"

      %(owner)s invites you to the meeting " -"%(meeting_title)s.

      \n" +"

      %(owner)s invites you to the meeting " +"%(meeting_title)s.

      \n" "

      here the link to join the meeting:\n" " %(join_link)s

      \n" "

      You need this password to enter: %(password)sHello,

      \n" -"

      %(owner)s invites you to the meeting " -"%(meeting_title)s.

      \n" +"

      %(owner)s invites you to the meeting " +"%(meeting_title)s.

      \n" "

      Start date: %(start_date_time)s

      \n" "

      End date: %(end_date)s

      \n" "

      here the link to join the meeting:\n" @@ -6195,22 +6194,22 @@ msgstr "" #: pod/meeting/webinar.py #, python-format -msgid "Webinar mode has been successfully started for “%s” meeting." +msgid "Webinar mode has been successfully started for “%(name)s” meeting." msgstr "" #: pod/meeting/webinar.py #, python-format -msgid "Error to start webinar mode for “%s” meeting: %s" +msgid "Error to start webinar mode for “%(name)s” meeting: %(exc)s" msgstr "" #: pod/meeting/webinar.py #, python-format -msgid "Webinar mode has been successfully stopped for “%s” meeting." +msgid "Webinar mode has been successfully stopped for “%(name)s” meeting." msgstr "" #: pod/meeting/webinar.py #, python-format -msgid "Error to stop webinar mode for “%s” meeting: %s" +msgid "Error to stop webinar mode for “%(name)s” meeting: %(exc)s" msgstr "" #: pod/meeting/webinar.py @@ -6226,24 +6225,25 @@ msgstr "" #: pod/meeting/webinar_utils.py #, python-format msgid "" -"There are too many webinars (%s) for the number of live gateways allocated " -"(%s). The next meeting has been created but not like a webinar:%s %s [%s-" -"%s].\n" +"There are too many webinars (%(nb_webinars)s) for the number of live " +"gateways allocated (%(nb_live_gateways)s). The next meeting has been created " +"but not like a webinar: %(id)s %(name)s [%(start_at)s-%(end_at)s].\n" "Please fix the problem either by increasing the number of live gateways or " "by modifying/deleting one of the affected webinars (with the users’ " "agreement).\n" -"Other webinars: %s" +"Other webinars: %(names_webinars)s" msgstr "" #: pod/meeting/webinar_utils.py #, python-format msgid "" -"

      There are too many webinars (%s) for the number of live gateways " -"allocated (%s). The next webinar has been created but not like a " -"webinar:

      • %s %s [%s-%s].

      Please fix the problem " -"either by increasing the number of live gateways or by modifying/deleting " -"one of the affected webinars (with the users’ agreement).
      Other webinars: " -"%s" +"

      There are too many webinars (%(nb_webinars)s) for the " +"number of live gateways allocated (%(nb_live_gateways)s). " +"The next webinar has been created but not like a webinar:" +"

      • %(id)s %(name)s [%(start_at)s-%(end_at)s].

        • Please fix the problem either by increasing the number of live " +"gateways or by modifying/deleting one of the affected webinars (with the " +"users’ agreement).
        Other webinars: %(names_webinars)s" msgstr "" #: pod/playlist/apps.py pod/playlist/models.py @@ -6268,10 +6268,6 @@ msgstr "" msgid "Security informations" msgstr "" -#: pod/playlist/forms.py pod/quiz/forms.py pod/quiz/models.py -msgid "Please choose a title between 1 and 250 characters." -msgstr "" - #: pod/playlist/forms.py pod/playlist/models.py msgid "Please choose a description. This description is empty by default." msgstr "" @@ -6312,9 +6308,9 @@ msgstr "" msgid "Please choose if this playlist is an autoplay playlist or not." msgstr "" -#: pod/playlist/forms.py -#, python-brace-format -msgid "You cannot create a playlist named \"{FAVORITE_PLAYLIST_NAME}\"" +#: pod/playlist/forms.py pod/playlist/tests/test_forms.py +#, python-format +msgid "You cannot create a playlist named “%(name)s”" msgstr "" #: pod/playlist/forms.py @@ -6344,13 +6340,6 @@ msgstr "" msgid "Private" msgstr "" -#: pod/playlist/models.py -#, python-brace-format -msgid "" -"Please choose a title between 1 and {__MAX_LENGTH_FOR_PLAYLIST_NAME__} " -"characters." -msgstr "" - #: pod/playlist/models.py msgid "" "Selecting this setting causes your playlist to be promoted on the page " @@ -6711,6 +6700,7 @@ msgid "contact its owner" msgstr "" #: pod/playlist/templatetags/favorites_playlist.py +#: pod/playlist/tests/test_forms.py msgid "Favorites" msgstr "" @@ -6718,10 +6708,6 @@ msgstr "" msgid "This field is required." msgstr "" -#: pod/playlist/tests/test_forms.py -msgid "You cannot create a playlist named \"Favorites\"" -msgstr "" - #: pod/playlist/tests/test_views.py pod/playlist/views.py #, python-format msgid "Playlist: %(name)s" @@ -6735,6 +6721,10 @@ msgstr "" msgid "The playlist has been deleted." msgstr "" +#: pod/playlist/views.py +msgid "Delete the playlist" +msgstr "" + #: pod/playlist/views.py #, python-format msgid "Edit the playlist “%(pname)s”" @@ -6749,8 +6739,8 @@ msgid "The data sent to create the playlist are invalid." msgstr "" #: pod/playlist/views.py -#, python-brace-format -msgid "Edit playlist “{playlist.name}”" +#, python-format +msgid "Edit playlist “%(name)s”" msgstr "" #: pod/playlist/views.py @@ -7123,7 +7113,7 @@ msgstr "" msgid "Quizzes" msgstr "" -#: pod/quiz/models.py +#: pod/quiz/models.py pod/quiz/tests/test_models.py msgid "Quiz of video" msgstr "" @@ -7736,8 +7726,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 @@ -9767,7 +9757,7 @@ msgstr "Voer een titel in." #: pod/video/utils.py #, python-format -msgid "Please enter a %s from 2 to %s characters." +msgid "Please enter a %(field_name)s from 2 to %(max_length)s characters." msgstr "" #: pod/video/views.py diff --git a/pod/locale/nl/LC_MESSAGES/djangojs.po b/pod/locale/nl/LC_MESSAGES/djangojs.po index 206c8637b4..4eff580450 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: 2024-11-27 12:02+0100\n" +"POT-Creation-Date: 2024-12-11 11:36+0000\n" "PO-Revision-Date: 2024-06-04 16:20+0200\n" "Last-Translator: obado \n" "Language-Team: \n" @@ -212,7 +212,8 @@ msgid "Time stamps" msgstr "" #: pod/completion/static/js/caption_maker.js -msgid "/80 characters" +#, javascript-format +msgid "%s/%s characters" msgstr "" #: pod/completion/static/js/caption_maker.js diff --git a/pod/main/tasks.py b/pod/main/tasks.py index 8cd67a6a7b..1a3f8c135d 100644 --- a/pod/main/tasks.py +++ b/pod/main/tasks.py @@ -5,7 +5,7 @@ @app.task(bind=True) -def task_start_encode(self, video_id): +def task_start_encode(self, video_id: int) -> None: """Start video encoding with Celery.""" print("CELERY START ENCODE VIDEO ID %s" % video_id) from pod.video_encode_transcript.encode import encode_video @@ -14,7 +14,7 @@ def task_start_encode(self, video_id): @app.task(bind=True) -def task_start_transcript(self, video_id): +def task_start_transcript(self, video_id: int) -> None: """Start video transcripting with Celery.""" print("CELERY START TRANSCRIPT VIDEO ID %s" % video_id) from pod.video_encode_transcript.transcript import main_threaded_transcript @@ -24,8 +24,8 @@ def task_start_transcript(self, video_id): @app.task(bind=True) def task_start_encode_studio( - self, recording_id, video_output, videos, subtime, presenter -): + self, recording_id: int, video_output, videos, subtime, presenter +) -> None: """Start studio record encoding with Celery.""" print("CELERY START ENCODE VIDEOS FROM STUDIO RECORDING ID %s" % recording_id) from pod.video_encode_transcript.encode import encode_video_studio @@ -34,7 +34,7 @@ def task_start_encode_studio( @app.task(bind=True) -def task_start_live_transcription(self, url, slug, model, filepath): +def task_start_live_transcription(self, url, slug, model, filepath) -> None: """Start live transcription with Celery.""" print("CELERY START LIVE TRANSCRIPTION %s" % slug) from pod.live.live_transcript import transcribe @@ -48,7 +48,7 @@ def task_start_live_transcription(self, url, slug, model, filepath): @app.task(bind=True) -def task_end_live_transcription(self, slug): +def task_end_live_transcription(self, slug) -> None: """End live transcription with Celery.""" print("CELERY END LIVE TRANSCRIPTION %s" % slug) broadcaster = Broadcaster.objects.get(slug=slug) @@ -61,7 +61,7 @@ def task_end_live_transcription(self, slug): @app.task(bind=True) def task_start_bbb_presentation_encode_and_upload_to_pod( self, record_id: int, url: str, extension: str -): +) -> None: """Start BBB presentation encoding with Celery, then upload to Pod.""" print("CELERY START BBB ENCODE PRESENTATION/UPLOAD RECORD ID %s" % record_id) from pod.import_video.views import bbb_encode_presentation_and_upload_to_pod @@ -72,7 +72,7 @@ def task_start_bbb_presentation_encode_and_upload_to_pod( @app.task(bind=True) def task_start_bbb_presentation_encode_and_move_to_destination( self, filename: str, url: str, dest_file: str -): +) -> None: """Start BBB presentation encoding with Celery, then move the video file.""" print("CELERY START BBB ENCODE PRESENTATION/MOVE %s" % filename) from pod.import_video.views import bbb_encode_presentation_and_move_to_destination diff --git a/pod/main/templatetags/flat_page_edito_filter.py b/pod/main/templatetags/flat_page_edito_filter.py index 536bd399f8..54377fb9ee 100644 --- a/pod/main/templatetags/flat_page_edito_filter.py +++ b/pod/main/templatetags/flat_page_edito_filter.py @@ -323,7 +323,7 @@ def render_next_events(uniq_id, params, current_site, debug_elts): return part_content -def render_html(uniq_id, params, current_site, debug_elts): +def render_html(uniq_id, params, current_site, debug_elts) -> str: """Render block with html content.""" debug_elts.append("Call function render_html") diff --git a/pod/main/test_settings.py b/pod/main/test_settings.py index 61a0cdbb7b..6911b38ad6 100644 --- a/pod/main/test_settings.py +++ b/pod/main/test_settings.py @@ -45,7 +45,7 @@ "ENGINE": "django.db.backends.sqlite3", "NAME": "db-test.sqlite", "OPTIONS": { - "timeout": 20, + "timeout": 30, }, } } diff --git a/pod/meeting/webinar.py b/pod/meeting/webinar.py index ea72b191e8..af3245ce45 100644 --- a/pod/meeting/webinar.py +++ b/pod/meeting/webinar.py @@ -17,7 +17,7 @@ log = logging.getLogger("webinar") -def start_webinar(request: WSGIRequest, meet_id: int): +def start_webinar(request: WSGIRequest, meet_id: int) -> None: """Start a webinar and send a thread to stop it automatically at the end.""" try: # Get the current meeting @@ -33,8 +33,8 @@ def start_webinar(request: WSGIRequest, meet_id: int): display_message_with_icon( request, messages.INFO, - _("Webinar mode has been successfully started for “%s” meeting.") - % (meeting.name), + _("Webinar mode has been successfully started for “%(name)s” meeting.") + % ({"name": meeting.name}), ) # Manage enable_chat is False by default if meeting.enable_chat is False: @@ -42,17 +42,18 @@ def start_webinar(request: WSGIRequest, meet_id: int): toggle_rtmp_gateway(meet_id) except Exception as exc: log.error( - "Error to start webinar mode for “%s” meeting: %s" % (meet_id, str(exc)) + "Error to start webinar mode for “%(id)s” meeting: %(exc)s" + % {"id": meet_id, "exc": str(exc)} ) display_message_with_icon( request, messages.ERROR, - _("Error to start webinar mode for “%s” meeting: %s") - % (meeting.name, str(exc)), + _("Error to start webinar mode for “%(name)s” meeting: %(exc)s") + % {"name": meeting.name, "exc": str(exc)}, ) -def stop_webinar(request: WSGIRequest, meet_id: int): +def stop_webinar(request: WSGIRequest, meet_id: int) -> None: """Stop the webinar.""" try: # Get the current meeting @@ -64,20 +65,23 @@ def stop_webinar(request: WSGIRequest, meet_id: int): display_message_with_icon( request, messages.INFO, - _("Webinar mode has been successfully stopped for “%s” meeting.") - % (meeting.name), + _("Webinar mode has been successfully stopped for “%(name)s” meeting.") + % {"name": meeting.name}, ) except Exception as exc: - log.error("Error to stop webinar mode for “%s” meeting: %s" % (meet_id, str(exc))) + log.error( + "Error to stop webinar mode for “%(id)s” meeting: %(exc)s" + % {"id": meet_id, "exc": str(exc)} + ) display_message_with_icon( request, messages.ERROR, - _("Error to stop webinar mode for “%s” meeting: %s") - % (meeting.name, str(exc)), + _("Error to stop webinar mode for “%(name)s” meeting: %(exc)s") + % {"name": meeting.name, "exc": str(exc)}, ) -def start_webinar_livestream(pod_host: str, meet_id: int): +def start_webinar_livestream(pod_host: str, meet_id: int) -> None: """Run the steps to start the webinar livestream.""" try: if pod_host.find("localhost") != -1: @@ -103,7 +107,7 @@ def start_webinar_livestream(pod_host: str, meet_id: int): raise ValueError(str(exc)) -def stop_webinar_livestream(meet_id: int, force: bool): +def stop_webinar_livestream(meet_id: int, force: bool) -> None: """Stop the webinar when meeting is stopped or when user forces to stop it.""" try: log.info("stop_webinar_livestream %s: %s" % (meet_id, "stop")) @@ -135,7 +139,7 @@ def stop_webinar_livestream(meet_id: int, force: bool): raise ValueError(str(exc)) -def wait_meeting_is_stopped(meeting: Meeting): +def wait_meeting_is_stopped(meeting: Meeting) -> None: """Check regularly if meeting is stopped. If meeting is running, wait to make another check (5h max). @@ -186,7 +190,7 @@ def manage_meeting_livestream(meeting: Meeting): return livestream -def start_rtmp_gateway(pod_host: str, meet_id: int, livestream_id: int): +def start_rtmp_gateway(pod_host: str, meet_id: int, livestream_id: int) -> None: """Run the start command for SIPMediaGW RTMP gateway.""" # Get the current meeting meeting = Meeting.objects.get(id=meet_id) @@ -259,7 +263,7 @@ def stop_rtmp_gateway(meet_id: int, livestream_id: int): raise ValueError(mark_safe(message)) -def toggle_rtmp_gateway(meet_id: int): +def toggle_rtmp_gateway(meet_id: int) -> None: """Run the toggle (to show chat or not) command for SIPMediaGW RTMP gateway.""" # Get the current meeting meeting = Meeting.objects.get(id=meet_id) @@ -296,7 +300,7 @@ def toggle_rtmp_gateway(meet_id: int): log.error("No livestream object found for webinar id %s" % meet_id) -def chat_rtmp_gateway(meet_id: int, msg: str): +def chat_rtmp_gateway(meet_id: int, msg: str) -> None: """Send message command to SIPMediaGW RTMP gateway.""" # Get the current meeting meeting = Meeting.objects.get(id=meet_id) diff --git a/pod/meeting/webinar_utils.py b/pod/meeting/webinar_utils.py index 0d49ffd14b..fe2835f801 100644 --- a/pod/meeting/webinar_utils.py +++ b/pod/meeting/webinar_utils.py @@ -96,48 +96,50 @@ def search_for_available_livegateway( def send_email_webinars( meeting: Meeting, nb_webinars: int, nb_live_gateways: int, names_webinars: str -): +) -> None: """Send email notification to administrators when too many webinars.""" subject = "[" + __TITLE_SITE__ + "] %s" % _("Too many webinars") message = _( - "There are too many webinars (%s) for the number of " - "live gateways allocated (%s). " - "The next meeting has been created but not like a webinar:%s %s [%s-%s].\n" + "There are too many webinars (%(nb_webinars)s) for the number of " + "live gateways allocated (%(nb_live_gateways)s). " + "The next meeting has been created but not like a webinar: %(id)s %(name)s [%(start_at)s-%(end_at)s].\n" "Please fix the problem either by increasing the number of live gateways " "or by modifying/deleting one of the affected webinars " "(with the users’ agreement).\n" - "Other webinars: %s" - ) % ( - nb_webinars, - nb_live_gateways, - meeting.id, - meeting.name, - meeting.start_at, - meeting.start_at + meeting.expected_duration, - names_webinars, - ) + "Other webinars: %(names_webinars)s" + ) % { + "nb_webinars": nb_webinars, + "nb_live_gateways": nb_live_gateways, + "id": meeting.id, + "name": meeting.name, + "start_at": meeting.start_at, + "end_at": meeting.start_at + meeting.expected_duration, + "names_webinars": names_webinars, + } + html_message = _( - "

        There are too many webinars (%s) for the number of " - "live gateways allocated (%s). " - "The next webinar has been created but not like a webinar:" - "

        • %s %s [%s-%s].

        " + "

        There are too many webinars (%(nb_webinars)s) for the number of " + "live gateways allocated (%(nb_live_gateways)s). " + "The next webinar has been created but not like a webinar:" + "

        • %(id)s %(name)s [%(start_at)s-%(end_at)s].

        " "Please fix the problem either by increasing the number of live gateways " "or by modifying/deleting one of the affected webinars " "(with the users’ agreement).
        " - "Other webinars: %s" - ) % ( - nb_webinars, - nb_live_gateways, - meeting.id, - meeting.name, - meeting.start_at, - meeting.start_at + meeting.expected_duration, - names_webinars, - ) + "Other webinars: %(names_webinars)s" + ) % { + "nb_webinars": nb_webinars, + "nb_live_gateways": nb_live_gateways, + "id": meeting.id, + "name": meeting.name, + "start_at": meeting.start_at, + "end_at": meeting.start_at + meeting.expected_duration, + "names_webinars": names_webinars, + } + mail_admins(subject, message, fail_silently=False, html_message=html_message) -def update_livestream_event(livestream, meeting): +def update_livestream_event(livestream, meeting) -> None: """Update event livestream from meeeting attributes.""" if livestream.event.title != meeting.name: livestream.event.title = meeting.name @@ -187,7 +189,7 @@ def manage_webinar( livestream.event.delete() -def create_livestream_event(meeting: Meeting, live_gateway: LiveGateway): +def create_livestream_event(meeting: Meeting, live_gateway: LiveGateway) -> None: """Create a livestream and an event for a new webinar.""" # Create live event event = Event.objects.create( diff --git a/pod/playlist/forms.py b/pod/playlist/forms.py index a684b7ec92..129cf9a8e6 100644 --- a/pod/playlist/forms.py +++ b/pod/playlist/forms.py @@ -60,7 +60,9 @@ class Meta: "aria-describedby": "id_nameHelp", }, ), - help_text=_("Please choose a title between 1 and 250 characters."), + help_text=_( + "Please choose a title between 1 and %(max)s characters." + ) % {"max": 250} ) description = forms.CharField( label=_("Description"), @@ -156,16 +158,17 @@ def __init__(self, *args, **kwargs) -> None: if "promoted" in self.fields: del self.fields["promoted"] - def clean_name(self): + def clean_name(self) -> str: """Check if the playlist name asked is correct.""" name = self.cleaned_data["name"] if name == FAVORITE_PLAYLIST_NAME: raise forms.ValidationError( - _(f'You cannot create a playlist named "{FAVORITE_PLAYLIST_NAME}"') + _("You cannot create a playlist named “%(name)s”") + % {"name": FAVORITE_PLAYLIST_NAME} ) return name - def clean_add_owner(self, cleaned_data): + def clean_add_owner(self, cleaned_data) -> None: """Check if the owner is correct.""" if "additional_owners" in cleaned_data.keys() and isinstance( self.cleaned_data["additional_owners"], QuerySet diff --git a/pod/playlist/tests/test_forms.py b/pod/playlist/tests/test_forms.py index 3d8581e108..20ead4a741 100644 --- a/pod/playlist/tests/test_forms.py +++ b/pod/playlist/tests/test_forms.py @@ -106,7 +106,7 @@ def test_name_validation_for_public_playlist(self): self.assertFalse(invalid_form.is_valid()) self.assertEqual( invalid_form.errors["name"][0], - _('You cannot create a playlist named "Favorites"'), + _('You cannot create a playlist named “%(name)s”') % {"name": _("Favorites")}, ) print(" ---> test_name_validation_for_public_playlist ok") @@ -129,7 +129,7 @@ def test_name_validation_for_private_playlist(self) -> None: self.assertFalse(invalid_form.is_valid()) self.assertEqual( invalid_form.errors["name"][0], - _('You cannot create a playlist named "Favorites"'), + _('You cannot create a playlist named “%(name)s”') % {"name": _("Favorites")}, ) print(" ---> test_name_validation_for_private_playlist ok") @@ -154,7 +154,7 @@ def test_name_validation_for_protected_playlist(self) -> None: self.assertFalse(invalid_form.is_valid()) self.assertEqual( invalid_form.errors["name"][0], - _('You cannot create a playlist named "Favorites"'), + _('You cannot create a playlist named “%(name)s”') % {"name": _("Favorites")}, ) print(" ---> test_name_validation_for_protected_playlist ok") diff --git a/pod/playlist/views.py b/pod/playlist/views.py index 53f794fb50..a5e79cce6a 100644 --- a/pod/playlist/views.py +++ b/pod/playlist/views.py @@ -474,7 +474,7 @@ def handle_get_request_for_add_or_edit_function(request: WSGIRequest, slug: str) or request.user in get_additional_owners(playlist) ) and playlist.editable: form = PlaylistForm(instance=playlist, user=request.user) - page_title = _(f"Edit playlist “{playlist.name}”") + page_title = _("Edit playlist “%(name)s”") % {"name": playlist.name} else: return redirect(reverse("playlist:list")) else: diff --git a/pod/quiz/forms.py b/pod/quiz/forms.py index 5f3fc9e05d..2b5cf759ce 100644 --- a/pod/quiz/forms.py +++ b/pod/quiz/forms.py @@ -36,7 +36,9 @@ class QuestionForm(forms.Form): label=_("Title"), required=True, widget=forms.TextInput(attrs={"placeholder": _("Your question")}), - help_text=_("Please choose a title between 1 and 250 characters."), + help_text=_( + "Please choose a title between 1 and %(max)s characters." + ) % {"max": 250} ) explanation = forms.CharField( label=_("Explanation"), diff --git a/pod/quiz/models.py b/pod/quiz/models.py index 8120ed85fd..daa0b34a2f 100644 --- a/pod/quiz/models.py +++ b/pod/quiz/models.py @@ -98,7 +98,9 @@ class Question(models.Model): title = models.CharField( verbose_name=_("Title"), max_length=250, - help_text=_("Please choose a title between 1 and 250 characters."), + help_text=_( + "Please choose a title between 1 and %(max)s characters." + ) % {"max": 250} ) explanation = models.TextField( verbose_name=_("Explanation"), diff --git a/pod/video/utils.py b/pod/video/utils.py index 74846f289b..ecf96896e2 100644 --- a/pod/video/utils.py +++ b/pod/video/utils.py @@ -280,6 +280,9 @@ def verify_field_length(field, field_name: str = "title", max_length: int = 100) msg.append(_("Please enter a title.")) elif len(field) < 2 or len(field) > max_length: msg.append( - _("Please enter a %s from 2 to %s characters." % (field_name, max_length)) + _( + "Please enter a %(field_name)s from 2 to %(max_length)s characters." + % {"field_name": field_name, "max_length": max_length} + ) ) return msg From b0eb0465c96f86d5205fc64c57f0d1a91d181b9b Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 22 Jan 2025 10:46:46 +0000 Subject: [PATCH 11/18] Fixup. Format code with Prettier --- pod/completion/static/js/caption_maker.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pod/completion/static/js/caption_maker.js b/pod/completion/static/js/caption_maker.js index 55a873b052..797e9c212c 100644 --- a/pod/completion/static/js/caption_maker.js +++ b/pod/completion/static/js/caption_maker.js @@ -965,7 +965,10 @@ function createCaptionBlock(newCaption, spawnFunction) { // Update numberCharactersDiv content const updateCharacterCount = () => { let nbCharacters = this.captionTextInput.value.length; - this.numberCharactersDiv.textContent = interpolate(nbCharsMsg, [nbCharacters, 80]); + this.numberCharactersDiv.textContent = interpolate(nbCharsMsg, [ + nbCharacters, + 80, + ]); if (nbCharacters > 80) { this.numberCharactersDiv.append(this.numberCharactersAlert); } From 2d84b4213f724211f46549e40f2e6bd66334af3d Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 22 Jan 2025 10:47:01 +0000 Subject: [PATCH 12/18] Fixup. Format code with Black --- pod/playlist/forms.py | 5 ++--- pod/playlist/tests/test_forms.py | 6 +++--- pod/quiz/forms.py | 5 ++--- pod/quiz/models.py | 5 ++--- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pod/playlist/forms.py b/pod/playlist/forms.py index 129cf9a8e6..fdfd3690a4 100644 --- a/pod/playlist/forms.py +++ b/pod/playlist/forms.py @@ -60,9 +60,8 @@ class Meta: "aria-describedby": "id_nameHelp", }, ), - help_text=_( - "Please choose a title between 1 and %(max)s characters." - ) % {"max": 250} + help_text=_("Please choose a title between 1 and %(max)s characters.") + % {"max": 250}, ) description = forms.CharField( label=_("Description"), diff --git a/pod/playlist/tests/test_forms.py b/pod/playlist/tests/test_forms.py index 20ead4a741..bd3d1834f6 100644 --- a/pod/playlist/tests/test_forms.py +++ b/pod/playlist/tests/test_forms.py @@ -106,7 +106,7 @@ def test_name_validation_for_public_playlist(self): self.assertFalse(invalid_form.is_valid()) self.assertEqual( invalid_form.errors["name"][0], - _('You cannot create a playlist named “%(name)s”') % {"name": _("Favorites")}, + _("You cannot create a playlist named “%(name)s”") % {"name": _("Favorites")}, ) print(" ---> test_name_validation_for_public_playlist ok") @@ -129,7 +129,7 @@ def test_name_validation_for_private_playlist(self) -> None: self.assertFalse(invalid_form.is_valid()) self.assertEqual( invalid_form.errors["name"][0], - _('You cannot create a playlist named “%(name)s”') % {"name": _("Favorites")}, + _("You cannot create a playlist named “%(name)s”") % {"name": _("Favorites")}, ) print(" ---> test_name_validation_for_private_playlist ok") @@ -154,7 +154,7 @@ def test_name_validation_for_protected_playlist(self) -> None: self.assertFalse(invalid_form.is_valid()) self.assertEqual( invalid_form.errors["name"][0], - _('You cannot create a playlist named “%(name)s”') % {"name": _("Favorites")}, + _("You cannot create a playlist named “%(name)s”") % {"name": _("Favorites")}, ) print(" ---> test_name_validation_for_protected_playlist ok") diff --git a/pod/quiz/forms.py b/pod/quiz/forms.py index 2b5cf759ce..3d7b1383a3 100644 --- a/pod/quiz/forms.py +++ b/pod/quiz/forms.py @@ -36,9 +36,8 @@ class QuestionForm(forms.Form): label=_("Title"), required=True, widget=forms.TextInput(attrs={"placeholder": _("Your question")}), - help_text=_( - "Please choose a title between 1 and %(max)s characters." - ) % {"max": 250} + help_text=_("Please choose a title between 1 and %(max)s characters.") + % {"max": 250}, ) explanation = forms.CharField( label=_("Explanation"), diff --git a/pod/quiz/models.py b/pod/quiz/models.py index daa0b34a2f..02b276ce65 100644 --- a/pod/quiz/models.py +++ b/pod/quiz/models.py @@ -98,9 +98,8 @@ class Question(models.Model): title = models.CharField( verbose_name=_("Title"), max_length=250, - help_text=_( - "Please choose a title between 1 and %(max)s characters." - ) % {"max": 250} + help_text=_("Please choose a title between 1 and %(max)s characters.") + % {"max": 250}, ) explanation = models.TextField( verbose_name=_("Explanation"), From 98c2e1d962e04ebb8f87cbbffa4798f9e6347c5a Mon Sep 17 00:00:00 2001 From: Noah <119636554+Naihl@users.noreply.github.com> Date: Wed, 22 Jan 2025 15:04:14 +0100 Subject: [PATCH 13/18] WebTV features (#1233) * add speaker features * add duplication feature * fix optional firstname * feat: additional_owners in duplicate * feat: duplicate confirmation button * fix: confirmation text * feat: jsdoc confirmDuplication function * fix: remove useless comment * fix: importation error * fix: duplication error * fix: video_duplicate docstring * feat: REQUIRED_SPEAKER_FIRSTNAME in setting * settings modification --- pod/duplicate/__init__.py | 0 pod/duplicate/admin.py | 0 pod/duplicate/apps.py | 7 + pod/duplicate/context_processors.py | 12 ++ pod/duplicate/models.py | 0 pod/duplicate/tests/test_views.py | 70 ++++++++++ pod/duplicate/urls.py | 8 ++ pod/duplicate/views.py | 129 ++++++++++++++++++ pod/locale/fr/LC_MESSAGES/django.mo | Bin 219632 -> 220086 bytes pod/locale/fr/LC_MESSAGES/django.po | 28 +++- pod/locale/fr/LC_MESSAGES/djangojs.po | 2 +- pod/locale/nl/LC_MESSAGES/django.po | 28 +++- pod/locale/nl/LC_MESSAGES/djangojs.po | 2 +- pod/main/configuration.json | 46 +++++++ pod/settings.py | 5 + pod/speaker/context_processors.py | 2 + pod/speaker/forms.py | 3 + .../templatetags/speaker_template_tags.py | 17 ++- pod/speaker/utils.py | 23 +++- pod/speaker/views.py | 9 +- pod/urls.py | 7 + pod/video/forms.py | 3 +- pod/video/models.py | 3 + .../static/js/link_video_dropdown_menu.js | 21 +++ .../videos/link_video_dropdown_menu.html | 21 ++- pod/video/templates/videos/video-info.html | 9 +- pod/video/templates/videos/video_edit.html | 2 +- .../templates/videos/video_page_content.html | 7 +- pod/video/urls.py | 4 + pod/video/views.py | 34 ++++- 30 files changed, 480 insertions(+), 22 deletions(-) create mode 100644 pod/duplicate/__init__.py create mode 100644 pod/duplicate/admin.py create mode 100644 pod/duplicate/apps.py create mode 100644 pod/duplicate/context_processors.py create mode 100644 pod/duplicate/models.py create mode 100644 pod/duplicate/tests/test_views.py create mode 100644 pod/duplicate/urls.py create mode 100644 pod/duplicate/views.py create mode 100644 pod/video/static/js/link_video_dropdown_menu.js diff --git a/pod/duplicate/__init__.py b/pod/duplicate/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pod/duplicate/admin.py b/pod/duplicate/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pod/duplicate/apps.py b/pod/duplicate/apps.py new file mode 100644 index 0000000000..68ed512f59 --- /dev/null +++ b/pod/duplicate/apps.py @@ -0,0 +1,7 @@ +from django.apps import AppConfig +from django.utils.translation import gettext_lazy as _ + + +class DuplicateConfig(AppConfig): + name = 'pod.duplicate' + verbose_name = _("Video duplicates") diff --git a/pod/duplicate/context_processors.py b/pod/duplicate/context_processors.py new file mode 100644 index 0000000000..760691a60f --- /dev/null +++ b/pod/duplicate/context_processors.py @@ -0,0 +1,12 @@ +"""Esup-Pod duplicate context processor.""" + +from django.conf import settings as django_settings + +USE_DUPLICATE = getattr(django_settings, "USE_DUPLICATE", False) + + +def context_settings(request): + """Return all context settings for duplicate app.""" + new_settings = {} + new_settings["USE_DUPLICATE"] = USE_DUPLICATE + return new_settings diff --git a/pod/duplicate/models.py b/pod/duplicate/models.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pod/duplicate/tests/test_views.py b/pod/duplicate/tests/test_views.py new file mode 100644 index 0000000000..a3c50d947c --- /dev/null +++ b/pod/duplicate/tests/test_views.py @@ -0,0 +1,70 @@ +# pod/video/tests/test_video_duplicate.py + +from django.test import TestCase +from django.urls import reverse +from django.contrib.auth.models import User +from pod.video.models import Video, Type, Discipline, Channel, Theme + + +class VideoDuplicateViewTest(TestCase): + """Test case for duplicating videos.""" + + def setUp(self): + """Set up required objects for the tests.""" + self.user = User.objects.create_user(username="testuser", password="password") + self.type = Type.objects.create(title="Test Type") + self.discipline = Discipline.objects.create(title="Test Discipline") + self.channel = Channel.objects.create(title="Test Channel", slug="test-channel") + self.theme = Theme.objects.create(title="Test Theme") + self.video = Video.objects.create( + title="Original Video", + slug="original-video", + type=self.type, + owner=self.user, + description="Original description", + description_fr="Description originale", + description_en="Original description", + date_evt="2023-01-01", + main_lang="en", + licence="CC BY-SA", + is_draft=False, + is_restricted=False, + allow_downloading=True, + is_360=False, + date_delete="2024-01-01", + disable_comment=False, + ) + self.video.discipline.add(self.discipline) + self.video.channel.add(self.channel) + self.video.theme.add(self.theme) + self.client.login(username="testuser", password="password") + + def test_video_duplicate(self): + """Test duplicating a video.""" + response = self.client.post(reverse("video_duplicate", args=[self.video.slug])) + + # Check that the duplicated video exists + duplicated_video = Video.objects.get(slug="original-video-copy") + self.assertEqual(duplicated_video.title, "Copy of Original Video") + self.assertEqual(duplicated_video.type, self.type) + self.assertEqual(duplicated_video.owner, self.user) + self.assertEqual(duplicated_video.description, "Original description") + self.assertEqual(duplicated_video.description_fr, "Description originale") + self.assertEqual(duplicated_video.description_en, "Original description") + self.assertEqual(duplicated_video.date_evt, "2023-01-01") + self.assertEqual(duplicated_video.main_lang, "en") + self.assertEqual(duplicated_video.licence, "CC BY-SA") + self.assertTrue(duplicated_video.is_draft) + self.assertEqual(duplicated_video.is_restricted, False) + self.assertEqual(duplicated_video.allow_downloading, True) + self.assertEqual(duplicated_video.is_360, False) + self.assertEqual(duplicated_video.date_delete, "2024-01-01") + self.assertEqual(duplicated_video.disable_comment, False) + + # Check many-to-many relations + self.assertEqual(list(duplicated_video.discipline.all()), [self.discipline]) + self.assertEqual(list(duplicated_video.channel.all()), [self.channel]) + self.assertEqual(list(duplicated_video.theme.all()), [self.theme]) + + # Check the response status code + self.assertEqual(response.status_code, 302) # Redirect after successful duplication diff --git a/pod/duplicate/urls.py b/pod/duplicate/urls.py new file mode 100644 index 0000000000..e5a41efdb4 --- /dev/null +++ b/pod/duplicate/urls.py @@ -0,0 +1,8 @@ +from django.urls import path +from .views import video_duplicate + +app_name = 'duplicate' + +urlpatterns = [ + path('video_duplicate//', video_duplicate, name='video_duplicate'), +] diff --git a/pod/duplicate/views.py b/pod/duplicate/views.py new file mode 100644 index 0000000000..f99d4c9b07 --- /dev/null +++ b/pod/duplicate/views.py @@ -0,0 +1,129 @@ +from django.shortcuts import get_object_or_404, redirect +from django.urls import reverse +from pod.completion.models import Contributor, Document +from pod.speaker.models import JobVideo +from pod.video.models import Video +from django.contrib.auth.decorators import login_required +from django.utils.translation import gettext as _ +from django.utils.text import slugify + + +def generate_unique_slug(base_slug): + """ + Generates a unique slug based on the given base slug. + Args: + base_slug (str): The base slug to be made unique. + Returns: + str: A unique slug based on the given base slug + """ + slug = base_slug + counter = 1 + while Video.objects.filter(slug=slug).exists(): + slug = f"{base_slug}-{counter}" + counter += 1 + return slug + + +@login_required +def video_duplicate(request, slug): + """ + Duplicates a video and its related objects (contributors, speakers, documents) based on the given slug. + Args: + request (HttpRequest): The HTTP request object containing user information. + slug (str): The slug of the original video to be duplicated. + Returns: + HttpResponseRedirect: A redirect to the newly duplicated video's detail page. + Raises: + Http404: If the original video with the given slug does not exist. + The duplicated video will have the following properties copied from the original video: + - title (prefixed with "Copy of ") + - slug (suffixed with "-copy") + - type + - owner (set to the current user) + - description, description_fr, description_en + - date_evt + - cursus + - main_lang + - licence + - thumbnail + - is_draft (set to True) + - is_restricted + - password + - allow_downloading + - is_360 + - transcript + - date_delete + - disable_comment + - tags + Additionally, the following many-to-many relationships are copied: + - discipline + - restrict_access_to_groups + - channel + - theme + - additional_owners + The following related objects are also duplicated: + - Contributors + - JobVideo (speakers) + - Documents + """ + + original_video = get_object_or_404(Video, slug=slug) + new_slug = generate_unique_slug(slugify(_("%(slug)s-copy") % {'slug': original_video.slug})) + + duplicated_video = Video.objects.create( + title=_("Copy of %(title)s") % {'title': original_video.title}, + slug=new_slug, + type=original_video.type, + owner=request.user, + description=original_video.description, + description_fr=original_video.description_fr, + description_en=original_video.description_en, + date_evt=original_video.date_evt, + cursus=original_video.cursus, + main_lang=original_video.main_lang, + licence=original_video.licence, + thumbnail=original_video.thumbnail, + is_draft=True, + is_restricted=original_video.is_restricted, + password=original_video.password, + allow_downloading=original_video.allow_downloading, + is_360=original_video.is_360, + transcript=original_video.transcript, + date_delete=original_video.date_delete, + disable_comment=original_video.disable_comment, + tags=original_video.tags, + ) + + # Many-to-Many Relations + duplicated_video.discipline.set(original_video.discipline.all()) + duplicated_video.restrict_access_to_groups.set(original_video.restrict_access_to_groups.all()) + duplicated_video.channel.set(original_video.channel.all()) + duplicated_video.theme.set(original_video.theme.all()) + duplicated_video.additional_owners.set(original_video.additional_owners.all()) + + # Copying contributors + for contributor in Contributor.objects.filter(video=original_video): + Contributor.objects.create( + video=duplicated_video, + name=contributor.name, + email_address=contributor.email_address, + role=contributor.role, + weblink=contributor.weblink, + ) + + # Copying speakers + for job_video in JobVideo.objects.filter(video=original_video): + JobVideo.objects.create( + job=job_video.job, + video=duplicated_video, + ) + + # Copying documents + for document in Document.objects.filter(video=original_video): + Document.objects.create( + video=duplicated_video, + document=document.document, + private=document.private, + ) + + return redirect(reverse('video:video_edit', args=[duplicated_video.slug])) diff --git a/pod/locale/fr/LC_MESSAGES/django.mo b/pod/locale/fr/LC_MESSAGES/django.mo index f38f308794742ae77a199f06883d2fb2daac42ba..51e9ea397121bc7f9572e26cb3e49e8f677da58e 100644 GIT binary patch delta 48165 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

        a! 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 GH2WXfI~<(= delta 47768 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

        b^%Y9w!>KfYea{?}Z@T5mEWMKvf8RX`S0L&A{7 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 z≫ysK=;poPy}!{VzR%ePZ(&X_mcb;_@Bfl z;^o^M!&`!%{s+)vK8?@Ds~L+sM<1Md%*-LZevYUe{XX#QufI%j;_VD9j3rHxPYz;r zcz1(i^s0tvXHU3We^OFs?*~5GT=US_WoA5lxc&?eGz`8-oa~s>@K&d<|9l;TzVkFw zQsX3XFJj>k$yFamo@e0HXg};0eHI2JR%9>|R5k!~v=PN$(i!Hhv~<8G?_BUl4ttKWuJZEdD+2t^%_s zk^nmwcBT1bzOx~7p1E(*`@ahSi^Yct-kjI=Drla=%kh5`Ut}QJe4LiJV;qodRtWwz z;t9RYILW%2ZDF=7EZNziaR%Z8chEUozyY@~HmuV8J=+Jw%fI!YA-8hT6n} z-|8p3ir}@xtLQDlA7b_l@k;$R;v0JRid)4^_`71CG$-?c;b%0HH8i+F^YK`akN*FU z{o?5>T6i=5?wC)^)n@P3zc`-uY1lmuIih|=92(sB^N#TO{~R#Q(6{2({63-sV!=*B zm+1XOq_E-2ddcpD?NBE>AE&9hJ;As1x5FyXY45?B zp>0-r`>emp>H+y=C=b_#wQy$yipzydut3u=)j_@>h$$=RFH7yWR4}IAvht^;+}Nu*2ey=4a>sG!x2U zE0KRj*yjnGiQluw z`YrRm{)gm;du4ub)n#J(e`@!*_&da8XT#ryWyFG3OaDQ<5e|7Oj(MTL({H3z*4)$P zuD9%VNBvH{mPlQ^`}J$4Z&OHCQloZUoR9e8qND}VFuh5Jujk2zsL!%|>;K`Oraq|G zGLA{y#(2BZV)-!m$KqBym%s))Ebo;$L()tmYfBL-Se$Hn95{#ga=aA;r^ezDdS!V> z!h>M%n>iG{%W<=|6JFV2#rQGvU+MiKFP{DV|Fq&s7ai4j-qeIxo&<_naE^MZ!S(t@ z@mk4yTht(qTdn^PY%ZNu=^*uZajN;k@&@L*#9>ME>hyu7uRmw1=jWM$1gan>d&-hz zGt^Cp{*T_0=zR(QS-+CH0^wveBfexwX}wMAY5Yx`p6XulDOstm1V0%zBOR3em6=2) zTC^-BVS|w8A&#}YPdw=YLemM1ji*^)W)|#eoMc1IB)c5{N%0_`6TR8EvvJqq4At*I zCvX28jjSy}zDC{N;>mnBQgZ_r@{iQZ`Hz;bi-CXZe=DyiX049-q840WStI#_W|zjn zTVhv@{5mI7I)FhTaD{lMBPxd4^@fwxH*hn-{rbO!-6Fq`cZ>Ox3mnikW`1z&3;H*i z-{_#@I4faA=zqnZOTYh@YnJELG?s*zGE>~b!+eLqWJ~ocN1o~zVYxnnv6f8dD>dHQzApp9@&4=oJV2UH(Xr_7nJ(XroxL zEjXX#N#}nk@6c7eYRpvk@(zxCy;#dk2VRrTXuXE8>*J_5PWJpShv+L7cO;axTjkX( z{-eQ5_=o%v%@e_YM!&y$A;IrM@Jt%p;7iT@rGQq_?5&rz)$$E=E=}+MlTDB2UE*a1 z@6LzwzFB{Nfx+t>k+pwCvI)N*d?~>r@|m8p8ZS@#M9eO9U>W(#cq`%e>nF=O+lQ+) zjv}nl_$&tQRriaR@mu-%@zn1Tcqs5B@R*spuy@Rjz`09ahYtzPZSY#=lXcAxeg>B} zJq~?6eg3O!UgMh9anW(jQbe>k4P%+t&0=+qwRN_O4jil2kEyepzT_z5GCt{i{ zA-`5{v!gD}J1XzjzyBHmIvegKZi;KKNfTjzH26~pwX>jV;QiyMEHA~!(-C3C#T#f| zVd+@;X|zX+1Juu^2TA+)Njehx2QdA57;aHFL$l;(!IIS$k0v2`Biy-q55+-6^k&Mx zip3joN_jQ=!it$W4nN(@M!XW@OmSBdWjSLL5wKAsS$#v54JDfZPj)GR?XY@!f56MN z{BeFR{Cu1y!EYg-4gWLV*)f~u8>_FkXA&RCpEEZERwh0FOvN~0Coj!Yz`h15#lzfrqGEa8Qg4yy%TzsRUL+VxPi`DDW5qt-q2k$~)wO)0+eY`QOr^74C zlfBHV@c+;)9P=s+AYSECzjy}BR2L;ZmIck=V)qxi{0ZY6$_xdD1t z@jt|}ZVtRBwCHXI&kQtiEN)YXU)Ir`H_C3KV7EE*GDEYFue3H5% z-XnSgf%pk> zvKx6H{T=XRb@&M0P+bcz*+=4MmM3c;2c-N#oLBYkl2>u)eRTHIEuDS;KOFciLOH{| zk>|&fp5kG|J^TW`mnSQP*Voe*ji*l7cY3$eIBanb3+~oWwm?2vZ@X9r|8<%Z%}DVlG^Y%$FG zba$s8T-v?J>cJaY7N7a`hlT2{{&I8qva9PK_~6XdmHw4``r5AwHF-F\n" "Language-Team: Pod Team cotech-esup-pod@esup-portail.org\n" @@ -2167,6 +2167,20 @@ msgstr "Vous ne pouvez pas supprimer cet habillage." msgid "Deleting the dressing “%s”" msgstr "Supprimer l’habillage « %s »" +#: pod/duplicate/apps.py +msgid "Video duplicates" +msgstr "Duplication de vidéo" + +#: pod/duplicate/views.py +#, python-format +msgid "%(slug)s-copy" +msgstr "%(slug)s-copie" + +#: pod/duplicate/views.py +#, python-format +msgid "Copy of %(title)s" +msgstr "Copie de %(title)s" + #: pod/enrichment/apps.py pod/enrichment/models.py msgid "Enrichments" msgstr "Enrichissements" @@ -9803,6 +9817,14 @@ msgstr "Chapitrer la vidéo" msgid "Dress the video" msgstr "Habiller la vidéo" +#: pod/video/templates/videos/link_video_dropdown_menu.html +msgid "Duplicate the video" +msgstr "Dupliquer la vidéo" + +#: pod/video/templates/videos/link_video_dropdown_menu.html +msgid "Are you sure you want to duplicate this video?" +msgstr "Voulez-vous vraiment dupliquer cette vidéo ?" + #: pod/video/templates/videos/link_video_dropdown_menu.html #: pod/video/templates/videos/video_edit.html msgid "Delete the video" @@ -10328,6 +10350,10 @@ msgstr "Description du thème" msgid "The video is currently waiting for Aristote AI treatment." msgstr "La vidéo est actuellement en attente du traitement par l’IA Aristote." +#: pod/video/templates/videos/video_page_content.html +msgid "The form does not contain a video." +msgstr "La fiche ne contient pas de vidéo." + #: pod/video/templates/videos/video_row_select.html msgid "Selected" msgstr "Sélectionné" diff --git a/pod/locale/fr/LC_MESSAGES/djangojs.po b/pod/locale/fr/LC_MESSAGES/djangojs.po index b3fe2fdb24..fe0daf6ccb 100644 --- a/pod/locale/fr/LC_MESSAGES/djangojs.po +++ b/pod/locale/fr/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Esup-Pod\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-11 11:36+0000\n" +"POT-Creation-Date: 2025-01-20 09:49+0100\n" "PO-Revision-Date: \n" "Last-Translator: obado \n" "Language-Team: \n" diff --git a/pod/locale/nl/LC_MESSAGES/django.po b/pod/locale/nl/LC_MESSAGES/django.po index b3a6957579..47ae2df2d5 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: 2024-12-11 15:32+0000\n" +"POT-Creation-Date: 2025-01-20 09:49+0100\n" "PO-Revision-Date: 2024-07-04 17:54+0200\n" "Last-Translator: obado \n" "Language-Team: \n" @@ -2077,6 +2077,20 @@ msgstr "" msgid "Deleting the dressing “%s”" msgstr "" +#: pod/duplicate/apps.py +msgid "Video duplicates" +msgstr "" + +#: pod/duplicate/views.py +#, python-format +msgid "%(slug)s-copy" +msgstr "" + +#: pod/duplicate/views.py +#, python-format +msgid "Copy of %(title)s" +msgstr "" + #: pod/enrichment/apps.py pod/enrichment/models.py msgid "Enrichments" msgstr "" @@ -9156,6 +9170,14 @@ msgstr "" msgid "Dress the video" msgstr "" +#: pod/video/templates/videos/link_video_dropdown_menu.html +msgid "Duplicate the video" +msgstr "" + +#: pod/video/templates/videos/link_video_dropdown_menu.html +msgid "Are you sure you want to duplicate this video?" +msgstr "" + #: pod/video/templates/videos/link_video_dropdown_menu.html #: pod/video/templates/videos/video_edit.html msgid "Delete the video" @@ -9649,6 +9671,10 @@ msgstr "" msgid "The video is currently waiting for Aristote AI treatment." msgstr "" +#: pod/video/templates/videos/video_page_content.html +msgid "The form does not contain a video." +msgstr "" + #: pod/video/templates/videos/video_row_select.html msgid "Selected" msgstr "" diff --git a/pod/locale/nl/LC_MESSAGES/djangojs.po b/pod/locale/nl/LC_MESSAGES/djangojs.po index 4eff580450..56f4c7d578 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: 2024-12-11 11:36+0000\n" +"POT-Creation-Date: 2025-01-20 09:49+0100\n" "PO-Revision-Date: 2024-06-04 16:20+0200\n" "Last-Translator: obado \n" "Language-Team: \n" diff --git a/pod/main/configuration.json b/pod/main/configuration.json index 9e795e3d2a..8930f5445d 100644 --- a/pod/main/configuration.json +++ b/pod/main/configuration.json @@ -1068,6 +1068,38 @@ "fr": "Configuration de l’application dressing" } }, + "duplicate": { + "description": { + "en": [ + "Duplicate App to create a copy of the form of an existing video", + "Set `USE_DUPLICATE` to True to activate this application." + ], + "fr": [ + "Application Duplicate pour créer une copie du formulaire d’une vidéo existante", + "Mettre `USE_DUPLICATE` à True pour activer cette application." + ] + }, + "settings": { + "USE_DUPLICATE": { + "default_value": false, + "description": { + "en": [ + "Activation of duplicate. Allows users to duplicate a video" + ], + "fr": [ + "Activation de duplicate.", + "Permet aux utilisateurs de dupliquer une vidéo" + ] + }, + "pod_version_end": "", + "pod_version_init": "" + } + }, + "title": { + "en": "Duplicate application configuration", + "fr": "Configuration de l’application duplicate" + } + }, "enrichment": { "description": {}, "settings": {}, @@ -1100,7 +1132,21 @@ }, "pod_version_end": "", "pod_version_init": "3.8.0" + }, + "REQUIRED_SPEAKER_FIRSTNAME": { + "default_value": true, + "description": { + "en": [ + "First name required in the speaker addition form" + ], + "fr": [ + "Prénom obligatoire dans le formulaire d'ajout intervenant" + ] + }, + "pod_version_end": "", + "pod_version_init": "" } + }, "title": { "en": "Seaker application configuration", diff --git a/pod/settings.py b/pod/settings.py index 45bde195bc..582efe9fda 100644 --- a/pod/settings.py +++ b/pod/settings.py @@ -74,6 +74,7 @@ "pod.ai_enhancement", "pod.speaker", "pod.custom", + "pod.duplicate" ] ## @@ -135,6 +136,7 @@ "pod.import_video.context_processors.context_settings", "pod.cut.context_processors.context_settings", "pod.speaker.context_processors.context_settings", + "pod.duplicate.context_processors.context_settings", ], }, }, @@ -397,6 +399,9 @@ # } +REQUIRED_SPEAKER_FIRSTNAME = False + + ## # Applications settings (and settings locale if any) # diff --git a/pod/speaker/context_processors.py b/pod/speaker/context_processors.py index c081280c7d..5a5260457a 100644 --- a/pod/speaker/context_processors.py +++ b/pod/speaker/context_processors.py @@ -4,6 +4,8 @@ USE_SPEAKER = getattr(django_settings, "USE_SPEAKER", False) +REQUIRED_SPEAKER_FIRSTNAME = getattr(django_settings, "REQUIRED_SPEAKER_FIRSTNAME", True) + def context_settings(request): """Return all context settings for speaker app.""" diff --git a/pod/speaker/forms.py b/pod/speaker/forms.py index 409ba4ee2f..da0f1da003 100644 --- a/pod/speaker/forms.py +++ b/pod/speaker/forms.py @@ -6,6 +6,7 @@ from django.forms.widgets import HiddenInput from .models import Speaker, Job, JobVideo from pod.main.forms_utils import add_placeholder_and_asterisk +from django.conf import settings class JobWidget(s2forms.ModelSelect2Widget): @@ -28,6 +29,8 @@ class Meta: def __init__(self, *args, **kwargs): """Init method.""" super(SpeakerForm, self).__init__(*args, **kwargs) + if not getattr(settings, "REQUIRED_SPEAKER_FIRSTNAME", False): + self.fields["firstname"].required = False self.fields = add_placeholder_and_asterisk(self.fields) diff --git a/pod/speaker/templatetags/speaker_template_tags.py b/pod/speaker/templatetags/speaker_template_tags.py index 6f0134893f..079a294660 100644 --- a/pod/speaker/templatetags/speaker_template_tags.py +++ b/pod/speaker/templatetags/speaker_template_tags.py @@ -3,7 +3,7 @@ from django import template -from pod.speaker.utils import get_video_speakers +from pod.speaker.utils import get_video_speakers, get_video_speakers_grouped from pod.video.models import Video @@ -22,3 +22,18 @@ def get_video_speaker(video: Video) -> list: list (:class:`list(pod.speaker.models.VideoJob)`): The list of speakers job. """ return get_video_speakers(video) + + +@register.simple_tag(name="get_video_speaker_grouped") +def get_video_speaker_grouped(video: Video) -> dict: + """ + Group the jobs by speaker for a given video. + + Args: + video (Video): The video for which to group the speakers. + + Returns: + List[VideoJob]: A list of VideoJob objects representing the speakers associated with the video. + """ + + return get_video_speakers_grouped(video) diff --git a/pod/speaker/utils.py b/pod/speaker/utils.py index 7bfa5abe09..f377938898 100644 --- a/pod/speaker/utils.py +++ b/pod/speaker/utils.py @@ -1,6 +1,6 @@ """Esup-Pod speaker utilities.""" -from typing import Optional +from typing import Optional, Dict, List from pod.speaker.models import Speaker, JobVideo from pod.video.models import Video @@ -26,3 +26,24 @@ def get_video_speakers(video: Video) -> Optional[JobVideo]: Optional[JobVideo]: The jobs associated with the video, or None if no job is found. """ return JobVideo.objects.filter(video=video) + + +def get_video_speakers_grouped(video) -> Dict[Speaker, List[str]]: + """ + Group the jobs by speaker for a given video. + + Args: + video (Video): The video for which to group the speakers. + + Returns: + Dict[Speaker, List[str]]: A dictionary where the keys are the speakers (Speaker) + and the values are lists of job titles (str) associated with each speaker. + """ + speakers = video.jobvideo_set.select_related('job__speaker').all() + grouped_speakers = {} + for jobvideo in speakers: + speaker = jobvideo.job.speaker + if speaker not in grouped_speakers: + grouped_speakers[speaker] = [] + grouped_speakers[speaker].append(jobvideo.job.title) + return grouped_speakers diff --git a/pod/speaker/views.py b/pod/speaker/views.py index 118c1e83c0..c624d370b3 100644 --- a/pod/speaker/views.py +++ b/pod/speaker/views.py @@ -14,6 +14,7 @@ from django.core.exceptions import PermissionDenied, ObjectDoesNotExist from django.core.handlers.wsgi import WSGIRequest from django.db import transaction +from django.conf import settings @csrf_protect @@ -195,8 +196,12 @@ def edit_speaker_details(request: WSGIRequest): firstname = request.POST.get("firstname") lastname = request.POST.get("lastname") - if not speakerid or not firstname or not lastname: - raise ValueError("Missing speaker information") + if getattr(settings, "REQUIRED_SPEAKER_FIRSTNAME", False): + if not speakerid or not firstname or not lastname: + raise ValueError("Missing speaker information") + else: + if not speakerid or not lastname: + raise ValueError("Missing speaker information") speaker = Speaker.objects.get(id=speakerid) speaker.firstname = firstname diff --git a/pod/urls.py b/pod/urls.py index 6a66b8afed..bb578c6032 100644 --- a/pod/urls.py +++ b/pod/urls.py @@ -39,6 +39,8 @@ USE_IMPORT_VIDEO = getattr(settings, "USE_IMPORT_VIDEO", True) USE_QUIZ = getattr(settings, "USE_QUIZ", True) USE_AI_ENHANCEMENT = getattr(settings, "USE_AI_ENHANCEMENT", False) +WEBTV_MODE = getattr(settings, "WEBTV_MODE", False) +USE_DUPLICATE = getattr(settings, "USE_DUPLICATE", False) if USE_CAS: from cas import views as cas_views @@ -198,6 +200,11 @@ ), ] +if USE_DUPLICATE: + urlpatterns += [ + path("duplicate/", include("pod.duplicate.urls", namespace="duplicate")), + ] + if settings.DEBUG: urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) if importlib.util.find_spec("debug_toolbar") is not None: diff --git a/pod/video/forms.py b/pod/video/forms.py index 1f6c25762b..8917f23380 100644 --- a/pod/video/forms.py +++ b/pod/video/forms.py @@ -951,7 +951,8 @@ def __init__(self, *args, **kwargs) -> None: # remove required=True for videofield if instance if self.fields.get("video") and self.instance and self.instance.video: - del self.fields["video"].widget.attrs["required"] + # remove del self.fields["video"].widget.attrs["required"] + self.fields["video"].widget.attrs.pop("required", None) if self.fields.get("owner"): self.fields["owner"].queryset = self.fields["owner"].queryset.filter( owner__sites=Site.objects.get_current() diff --git a/pod/video/models.py b/pod/video/models.py index 9a7cada19a..08261ce885 100644 --- a/pod/video/models.py +++ b/pod/video/models.py @@ -37,6 +37,7 @@ from pod.main.models import AdditionalChannelTab import importlib from django.contrib.auth.hashers import make_password +from pod.main.context_processors import WEBTV_MODE from sorl.thumbnail import get_thumbnail from pod.authentication.models import AccessGroup @@ -684,6 +685,8 @@ class Video(models.Model): upload_to=get_storage_path_video, max_length=255, help_text=_("You can send an audio or video file."), + null=WEBTV_MODE, + blank=WEBTV_MODE, ) title = models.CharField( _("Title"), diff --git a/pod/video/static/js/link_video_dropdown_menu.js b/pod/video/static/js/link_video_dropdown_menu.js new file mode 100644 index 0000000000..f08e52fd3d --- /dev/null +++ b/pod/video/static/js/link_video_dropdown_menu.js @@ -0,0 +1,21 @@ +/** + * @file Esup-Pod function for handling video duplication confirmation. + */ + +/** + * Displays a confirmation dialog before redirecting the user to a duplication URL. + * + * @param {Event} event - The event triggered by clicking the link. + * @param {string} url - The duplication URL to redirect to if the user confirms. + * @param {string} confirmationText - The confirmation text to display in the dialog. + * @returns {boolean} - Returns false if the user cancels the confirmation, otherwise redirects to the URL. + */ +/* exported confirmDuplication */ +function confirmDuplication(event, url, confirmationText) { + if (confirm(confirmationText)) { + window.location.href = url; + } else { + event.preventDefault(); + return false; + } +} diff --git a/pod/video/templates/videos/link_video_dropdown_menu.html b/pod/video/templates/videos/link_video_dropdown_menu.html index 696be2a97e..11fc56217f 100644 --- a/pod/video/templates/videos/link_video_dropdown_menu.html +++ b/pod/video/templates/videos/link_video_dropdown_menu.html @@ -1,5 +1,7 @@ {% load i18n %} {% load ai_enhancement_template_tags %} +{% load static %} +

          {% if request.path == '/video/dashboard/' %} @@ -95,7 +97,24 @@ {% endif %} {% endif %} - {% if video.encoded and video.encoding_in_progress is False %} + + {% if USE_DUPLICATE %} + + + {% trans 'Duplicate the video' %} + + {% endif %} + + + {% if video.encoding_in_progress is False %} {% if video.owner == request.user or request.user.is_superuser or perms.video.delete_video %}
        • diff --git a/pod/video/templates/videos/video-info.html b/pod/video/templates/videos/video-info.html index 1e7934ffcc..8cf4452744 100644 --- a/pod/video/templates/videos/video-info.html +++ b/pod/video/templates/videos/video-info.html @@ -176,10 +176,13 @@