Skip to content

Commit 6442209

Browse files
authored
Merge pull request #1179 from EsupPortail/develop
[DONE] Develop #3.8.1
2 parents 7091bcd + fec6af0 commit 6442209

File tree

38 files changed

+721
-455
lines changed

38 files changed

+721
-455
lines changed

CONFIGURATION_FR.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1785,7 +1785,7 @@ Mettre `USE_QUIZ` à True pour activer cette application.<br>
17851785
>> _(
17861786
>> "In this field you can select and add additional owners to the "
17871787
>> "video. These additional owners will have the same rights as "
1788-
>> "you except that they can’t delete this video."
1788+
>> "you except that they can’t delete this media."
17891789
>> )
17901790
>> ],
17911791
>> ),
@@ -1989,6 +1989,11 @@ Application pour l’encodage et la transcription de vidéo.<br>
19891989
Il est possible d’encoder en local ou en distant.<br>
19901990
Attention, il faut configurer Celery pour l’envoi des instructions pour l’encodage distant.<br>
19911991
1992+
* `CAPTIONS_STRICT_ACCESSIBILITY`
1993+
> valeur par défaut : `False`
1994+
>> Si True, les sous-titres seront générés en respectant strictement les normes<br>
1995+
>> d’accessibilité. L'apparition d'un message d’avertissement sera affiché si les<br>
1996+
>> sous-titres ne respectent pas ces normes, même si la valeur est à False.<br>
19921997
* `CELERY_BROKER_URL`
19931998
> valeur par défaut : `redis://redis.localhost:6379/5`
19941999
>> URL du courtier de messages où Celery stocke les ordres d’encodage et de transcription.<br>

pod/ai_enhancement/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from pod.main.views import in_maintenance
2828
from pod.quiz.utils import import_quiz
2929
from pod.video.models import Video, Discipline
30-
from pod.video_encode_transcript.transcript import saveVTT
30+
from pod.video_encode_transcript.transcript import save_vtt
3131

3232
AI_ENHANCEMENT_CLIENT_ID = getattr(settings, "AI_ENHANCEMENT_CLIENT_ID", "mocked_id")
3333
AI_ENHANCEMENT_CLIENT_SECRET = getattr(
@@ -332,7 +332,7 @@ def enhance_subtitles(request: WSGIRequest, video_slug: str) -> HttpResponse:
332332
web_vtt = json_to_web_vtt(
333333
latest_version["transcript"]["sentences"], video.duration
334334
)
335-
saveVTT(video, web_vtt, latest_version["transcript"]["language"])
335+
save_vtt(video, web_vtt, latest_version["transcript"]["language"])
336336
latest_track = (
337337
Track.objects.filter(
338338
video=video,

pod/bbb/templates/bbb/live_publish_meeting.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ <h3>{% trans "Are you sure you want to perform a BigBlueButton live?" %}</h3>
7777
{% endspaceless %}
7878
{% endfor %}
7979
</fieldset>
80-
<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>
80+
<small class="form-text">
81+
{% 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.' %}
82+
</small><br>
8183
</div>
8284
<div class="text-center">
8385
<button type="submit" class="btn btn-primary">{% trans "Perform a BigBlueButton live" %}</button>

pod/completion/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ def verify_attributs(self) -> list:
111111
if not self.name or self.name == "":
112112
msg.append(_("Please enter a name."))
113113
elif len(self.name) < 2 or len(self.name) > 200:
114-
msg.append(_("Please enter a name from 2 to 200 caracters."))
114+
msg.append(_("Please enter a name from 2 to 200 characters."))
115115
if self.weblink and len(self.weblink) > 200:
116-
msg.append(_("You cannot enter a weblink with more than 200 caracters."))
116+
msg.append(_("You cannot enter a weblink with more than 200 characters."))
117117
if not self.role:
118118
msg.append(_("Please enter a role."))
119119
return msg

pod/completion/static/css/caption_maker.css

Lines changed: 30 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
min-height: 297px;
1010
}
1111

12-
.videoError {
12+
.video-error {
1313
display: block;
1414
background-color: #999;
1515
width: 100%;
@@ -19,26 +19,26 @@
1919
padding: 12px;
2020
}
2121

22-
#videoError {
22+
#video-error {
2323
display: none;
2424
}
2525

26-
#captionTitle {
26+
#caption-title {
2727
padding-top: 4px;
2828
padding-bottom: 4px;
2929
min-height: 32px;
3030
}
3131

32-
#textCaptionEntry {
32+
#text-caption-entry {
3333
text-align: center;
3434
}
3535

36-
#textCaptionEntry.playing {
36+
#text-caption-entry.playing {
3737
background-color: var(--pod-background-dark);
3838
color: white;
3939
}
4040

41-
.shortcutKey {
41+
.shortcut-key {
4242
display: inline-block;
4343
border: 2px solid #222;
4444
border-radius: 6px;
@@ -50,47 +50,47 @@
5050
text-align: center;
5151
}
5252

53-
.shortcutKey svg {
53+
.shortcut-key svg {
5454
transform: translateY(-2px);
5555
}
5656

5757
/* the list of captions */
58-
.gray_no_video {
58+
.gray-no-video {
5959
display: flex;
6060
flex-wrap: wrap;
6161
border-top: 1px solid #e1e1e1;
6262
}
6363

64-
.videoSection {
64+
.video-section {
6565
float: left;
6666
min-height: 425px;
6767
width: 49%;
6868
padding: 24px 0;
6969
padding-right: 24px;
7070
}
7171

72-
.caption_content {
72+
.caption-content-div {
7373
border-left: 1px solid #e1e1e1;
7474
display: inline-block;
7575
width: 49%;
7676
}
7777

78-
.caption_content .caption_title {
78+
.caption-content-div .caption_title {
7979
display: flex;
8080
position: relative;
8181
}
8282

83-
.caption_content svg {
83+
.caption-content-div svg {
8484
width: 20px;
8585
color: var(--secondary);
8686
margin-left: 4px;
8787
}
8888

89-
.caption_content .caption_title svg:hover + .help_text {
89+
.caption-content-div .caption_title svg:hover + .help_text {
9090
display: block;
9191
}
9292

93-
.caption_content .help_text {
93+
.caption-content-div .help_text {
9494
display: none;
9595
position: absolute;
9696
background: var(--pod-primary);
@@ -104,63 +104,50 @@
104104
line-height: 1.4;
105105
}
106106

107-
.captions_editor {
107+
.captions-editor {
108108
height: 470px;
109109
overflow-y: auto;
110110
}
111111

112-
#newCaptionsEditor {
112+
#new-captions-editor {
113113
margin-bottom: 6px;
114114
}
115115

116-
.newEditorBlock {
116+
.new-editor-block {
117117
border-bottom: 1px solid #e1e1e1;
118-
padding: 8px;
118+
padding: 16px 8px;
119119
transition: 0.2s;
120120
}
121121

122-
.newEditorBlock:hover {
123-
background-color: rgb(223 230 246 / 40%);
122+
.new-editor-block:hover {
123+
background-color: var(--pod-background-neutre1-bloc-hover);
124124
}
125125

126-
.newEditorBlock > textarea {
126+
.new-editor-block > textarea {
127127
width: 77%;
128128
}
129129

130130
.captionBeingEdited {
131131
border-left: 3px solid var(--pod-primary);
132-
background-color: rgb(223 230 246 / 40%);
132+
background-color: var(--pod-background-neutre1-bloc-hover);
133133
}
134134

135135
.captionTimestamps {
136136
line-height: 32px;
137137
}
138138

139-
.newEditorBlock a {
139+
.new-editor-block a {
140140
display: block;
141141
}
142142

143-
.newEditorBlock input {
143+
.new-editor-block input {
144144
margin: 6px 0;
145145
max-width: 78px;
146146
display: inline-block;
147147
padding: 4px;
148148
}
149149

150-
.captionButtons button {
151-
display: block;
152-
width: 28px;
153-
height: 28px;
154-
padding: 0;
155-
border: 0;
156-
border-radius: 50%;
157-
}
158-
159-
.captionButtons button:hover {
160-
background: var(--pod-primary-lighten);
161-
}
162-
163-
#addSubtitle svg {
150+
#add-subtitle svg {
164151
color: var(--pod-link-color);
165152
}
166153

@@ -178,33 +165,32 @@
178165
max-width: 1000px;
179166
}
180167

181-
#editorTipsAndGoBack {
168+
#editor-tips-and-go-back {
182169
width: 100%;
183170
clear: both;
184171
padding-top: 24px;
185-
padding-bottom: 24px;
186172
display: block;
187173
border-top: 1px solid #e1e1e1;
188174
}
189175

190176
@media only screen and (max-width: 800px) {
191-
.gray_no_video {
177+
.gray-no-video {
192178
display: flex;
193179
flex-direction: column;
194180
}
195181

196-
.gray_no_video > div {
182+
.gray-no-video > div {
197183
width: 100% !important;
198184
}
199185

200-
.gray_no_video div:first-child {
186+
.gray-no-video div:first-child {
201187
overflow: hidden;
202188
margin: 0;
203189
margin-bottom: 1em;
204190
min-height: unset !important;
205191
}
206192

207-
.newEditorBlock > textarea {
193+
.new-editor-block > textarea {
208194
width: 60%;
209195
}
210196
}

0 commit comments

Comments
 (0)