Merge pull request #1179 from EsupPortail/develop

[DONE] Develop #3.8.1
EsupPortail · Jul 19, 2024 · 6442209 · 6442209
2 parents 7091bcd + fec6af0
commit 6442209
Show file tree

Hide file tree

Showing 38 changed files with 721 additions and 455 deletions.
diff --git a/CONFIGURATION_FR.md b/CONFIGURATION_FR.md
@@ -1785,7 +1785,7 @@ Mettre `USE_QUIZ` à True pour activer cette application.<br>
   >>                 _(
   >>                     "In this field you can select and add additional owners to the "
   >>                     "video. These additional owners will have the same rights as "
-  >>                     "you except that they can’t delete this video."
+  >>                     "you except that they can’t delete this media."
   >>                 )
   >>             ],
   >>         ),
@@ -1989,6 +1989,11 @@ Application pour l’encodage et la transcription de vidéo.<br>
 Il est possible d’encoder en local ou en distant.<br>
 Attention, il faut configurer Celery pour l’envoi des instructions pour l’encodage distant.<br>
 
+* `CAPTIONS_STRICT_ACCESSIBILITY`
+  > valeur par défaut : `False`
+  >> Si True, les sous-titres seront générés en respectant strictement les normes<br>
+  >> d’accessibilité. L'apparition d'un message d’avertissement sera affiché si les<br>
+  >> sous-titres ne respectent pas ces normes, même si la valeur est à False.<br>
 * `CELERY_BROKER_URL`
   > valeur par défaut : `redis://redis.localhost:6379/5`
   >> URL du courtier de messages où Celery stocke les ordres d’encodage et de transcription.<br>

diff --git a/pod/ai_enhancement/views.py b/pod/ai_enhancement/views.py
@@ -27,7 +27,7 @@
 from pod.main.views import in_maintenance
 from pod.quiz.utils import import_quiz
 from pod.video.models import Video, Discipline
-from pod.video_encode_transcript.transcript import saveVTT
+from pod.video_encode_transcript.transcript import save_vtt
 
 AI_ENHANCEMENT_CLIENT_ID = getattr(settings, "AI_ENHANCEMENT_CLIENT_ID", "mocked_id")
 AI_ENHANCEMENT_CLIENT_SECRET = getattr(
@@ -332,7 +332,7 @@ def enhance_subtitles(request: WSGIRequest, video_slug: str) -> HttpResponse:
         web_vtt = json_to_web_vtt(
             latest_version["transcript"]["sentences"], video.duration
         )
-        saveVTT(video, web_vtt, latest_version["transcript"]["language"])
+        save_vtt(video, web_vtt, latest_version["transcript"]["language"])
         latest_track = (
             Track.objects.filter(
                 video=video,

diff --git a/pod/bbb/templates/bbb/live_publish_meeting.html b/pod/bbb/templates/bbb/live_publish_meeting.html
@@ -77,7 +77,9 @@ <h3>{% trans "Are you sure you want to perform a BigBlueButton live?" %}</h3>
             {% endspaceless %}
         {% endfor %}
       </fieldset>
-	  <small class="form-text">{% trans 'Please note: shortly after clicking the "Perform a BigBlueButton live" button, the live stream will be available to users on the <i class=\"bi bi-broadcast\"></i> <b>Lives</b> page.' %}</small><br>
+      <small class="form-text">
+        {% trans 'Please note: shortly after clicking the “Perform a BigBlueButton live” button, the live stream will be available to users on the <i class="bi bi-broadcast" aria-hidden="true"></i> <strong>Lives</strong> page.' %}
+      </small><br>
     </div>
     <div class="text-center">
       <button type="submit" class="btn btn-primary">{% trans "Perform a BigBlueButton live" %}</button>

diff --git a/pod/completion/models.py b/pod/completion/models.py
@@ -111,9 +111,9 @@ def verify_attributs(self) -> list:
         if not self.name or self.name == "":
             msg.append(_("Please enter a name."))
         elif len(self.name) < 2 or len(self.name) > 200:
-            msg.append(_("Please enter a name from 2 to 200 caracters."))
+            msg.append(_("Please enter a name from 2 to 200 characters."))
         if self.weblink and len(self.weblink) > 200:
-            msg.append(_("You cannot enter a weblink with more than 200 caracters."))
+            msg.append(_("You cannot enter a weblink with more than 200 characters."))
         if not self.role:
             msg.append(_("Please enter a role."))
         return msg

diff --git a/pod/completion/static/css/caption_maker.css b/pod/completion/static/css/caption_maker.css
@@ -9,7 +9,7 @@
   min-height: 297px;
 }
 
-.videoError {
+.video-error {
   display: block;
   background-color: #999;
   width: 100%;
@@ -19,26 +19,26 @@
   padding: 12px;
 }
 
-#videoError {
+#video-error {
   display: none;
 }
 
-#captionTitle {
+#caption-title {
   padding-top: 4px;
   padding-bottom: 4px;
   min-height: 32px;
 }
 
-#textCaptionEntry {
+#text-caption-entry {
   text-align: center;
 }
 
-#textCaptionEntry.playing {
+#text-caption-entry.playing {
   background-color: var(--pod-background-dark);
   color: white;
 }
 
-.shortcutKey {
+.shortcut-key {
   display: inline-block;
   border: 2px solid #222;
   border-radius: 6px;
@@ -50,47 +50,47 @@
   text-align: center;
 }
 
-.shortcutKey svg {
+.shortcut-key svg {
   transform: translateY(-2px);
 }
 
 /* the list of captions */
-.gray_no_video {
+.gray-no-video {
   display: flex;
   flex-wrap: wrap;
   border-top: 1px solid #e1e1e1;
 }
 
-.videoSection {
+.video-section {
   float: left;
   min-height: 425px;
   width: 49%;
   padding: 24px 0;
   padding-right: 24px;
 }
 
-.caption_content {
+.caption-content-div {
   border-left: 1px solid #e1e1e1;
   display: inline-block;
   width: 49%;
 }
 
-.caption_content .caption_title {
+.caption-content-div .caption_title {
   display: flex;
   position: relative;
 }
 
-.caption_content svg {
+.caption-content-div svg {
   width: 20px;
   color: var(--secondary);
   margin-left: 4px;
 }
 
-.caption_content .caption_title svg:hover + .help_text {
+.caption-content-div .caption_title svg:hover + .help_text {
   display: block;
 }
 
-.caption_content .help_text {
+.caption-content-div .help_text {
   display: none;
   position: absolute;
   background: var(--pod-primary);
@@ -104,63 +104,50 @@
   line-height: 1.4;
 }
 
-.captions_editor {
+.captions-editor {
   height: 470px;
   overflow-y: auto;
 }
 
-#newCaptionsEditor {
+#new-captions-editor {
   margin-bottom: 6px;
 }
 
-.newEditorBlock {
+.new-editor-block {
   border-bottom: 1px solid #e1e1e1;
-  padding: 8px;
+  padding: 16px 8px;
   transition: 0.2s;
 }
 
-.newEditorBlock:hover {
-  background-color: rgb(223 230 246 / 40%);
+.new-editor-block:hover {
+  background-color: var(--pod-background-neutre1-bloc-hover);
 }
 
-.newEditorBlock > textarea {
+.new-editor-block > textarea {
   width: 77%;
 }
 
 .captionBeingEdited {
   border-left: 3px solid var(--pod-primary);
-  background-color: rgb(223 230 246 / 40%);
+  background-color: var(--pod-background-neutre1-bloc-hover);
 }
 
 .captionTimestamps {
   line-height: 32px;
 }
 
-.newEditorBlock a {
+.new-editor-block a {
   display: block;
 }
 
-.newEditorBlock input {
+.new-editor-block input {
   margin: 6px 0;
   max-width: 78px;
   display: inline-block;
   padding: 4px;
 }
 
-.captionButtons button {
-  display: block;
-  width: 28px;
-  height: 28px;
-  padding: 0;
-  border: 0;
-  border-radius: 50%;
-}
-
-.captionButtons button:hover {
-  background: var(--pod-primary-lighten);
-}
-
-#addSubtitle svg {
+#add-subtitle svg {
   color: var(--pod-link-color);
 }
 
@@ -178,33 +165,32 @@
   max-width: 1000px;
 }
 
-#editorTipsAndGoBack {
+#editor-tips-and-go-back {
   width: 100%;
   clear: both;
   padding-top: 24px;
-  padding-bottom: 24px;
   display: block;
   border-top: 1px solid #e1e1e1;
 }
 
 @media only screen and (max-width: 800px) {
-  .gray_no_video {
+  .gray-no-video {
     display: flex;
     flex-direction: column;
   }
 
-  .gray_no_video > div {
+  .gray-no-video > div {
     width: 100% !important;
   }
 
-  .gray_no_video div:first-child {
+  .gray-no-video div:first-child {
     overflow: hidden;
     margin: 0;
     margin-bottom: 1em;
     min-height: unset !important;
   }
 
-  .newEditorBlock > textarea {
+  .new-editor-block > textarea {
     width: 60%;
   }
 }