Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/EsupPortail/Esup-Pod int…
Browse files Browse the repository at this point in the history
…o AymericJak/improve_title_sort
  • Loading branch information
AymericJak committed Nov 6, 2023
2 parents 91d20d5 + 9538a68 commit 9fc6229
Showing 21 changed files with 249 additions and 91 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ lang:
echo "Processing python files..."
python3 manage.py makemessages --all -i "opencast-studio/*" -i "pod/custom/settings_local.py" --add-location=file
echo "Processing javascript files..."
python3 manage.py makemessages -d djangojs -l fr -l nl -i "*.min.js" -i "pod/static/*" -i "opencast-studio/*" -i "*/node_modules/*" --add-location=file
python3 manage.py makemessages -d djangojs -l fr -l nl -i "*.min.js" -i "pod/static/*" -i "opencast-studio/*" -i "*/node_modules/*" -i "node_modules/*" --add-location=file

#compilation des fichiers de langue
compilelang:
@@ -76,7 +76,7 @@ pystyle:

# Collects all static files inside all apps and put a copy inside the static directory declared in settings.py
statics:
cd pod; yarn upgrade
cd pod; yarn install; yarn upgrade
# --clear Clear the existing files before trying to copy or link the original file.
python3 manage.py collectstatic --clear

2 changes: 1 addition & 1 deletion pod/chapter/static/css/chapters.css
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ table.scroll thead th.chapter_time_end {

form#form_chapter,
form#form_chapter_import {
background-color: rgba(0 0 0 0.05);
background-color: rgb(0 0 0 / 5%);
}

.form-group.row p {
4 changes: 2 additions & 2 deletions pod/chapter/static/css/videojs-chapters.css
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
top: 0;
height: 100%;
width: 20%;
background-color: rgba(43 51 63 0.7);
background-color: rgb(43 51 63 / 70%);
overflow-y: auto;
cursor: default;
z-index: 2;
@@ -48,7 +48,7 @@
list-style-type: none;
text-align: -webkit-match-parent;
margin: 0 3px;
border-top: 1px solid rgba(0 0 0 0.8);
border-top: 1px solid rgb(0 0 0 / 80%);
}

.chapters-list ol li a {
6 changes: 3 additions & 3 deletions pod/completion/static/css/caption_maker.css
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@
}

.newEditorBlock:hover {
background-color: rgba(223 230 246 0.4);
background-color: rgb(223 230 246 / 40%);
}

.newEditorBlock > textarea {
@@ -129,7 +129,7 @@

.captionBeingEdited {
border-left: 3px solid var(--pod-primary);
background-color: rgba(223 230 246 0.4);
background-color: rgb(223 230 246 / 40%);
}

.captionTimestamps {
@@ -226,7 +226,7 @@
.regionHighligh {
position: absolute;
z-index: 1;
background-color: rgba(173 50 122 0.5);
background-color: rgb(173 50 122 / 50%);
height: 3px;
}

2 changes: 1 addition & 1 deletion pod/cut/static/css/video_cut.css
Original file line number Diff line number Diff line change
@@ -97,7 +97,7 @@ input[type="range"]::-ms-thumb {
/* --bs-btn-focus-shadow-rgb: var(--pod-primary-rgb); */
--bs-btn-focus-shadow-rgb: 200, 200, 253;
--bs-btn-focus-box-shadow: 0 0 0 0.25rem
rgba(var(--bs-btn-focus-shadow-rgb) 0.5);
rgb(var(--bs-btn-focus-shadow-rgb) / 50%);
}

input[type="range"]:active::-webkit-slider-thumb,
2 changes: 1 addition & 1 deletion pod/enrichment/static/css/enrichment.css
Original file line number Diff line number Diff line change
@@ -55,5 +55,5 @@ table.scroll thead th {
}

form#form_enrich {
background-color: rgba(0 0 0 0.05);
background-color: rgb(0 0 0 / 5%);
}
2 changes: 1 addition & 1 deletion pod/enrichment/static/css/videojs-slides.css
Original file line number Diff line number Diff line change
@@ -213,7 +213,7 @@
top: -0.5rem;
height: 100%;
position: relative;
background: rgba(100 100 100 0.5);
background: rgb(100 100 100 / 50%);
}

.vjs-chapbar-holder {
25 changes: 21 additions & 4 deletions pod/locale/fr/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
@@ -5,16 +5,16 @@ msgid ""
msgstr ""
"Project-Id-Version: Pod\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-10-16 13:36+0000\n"
"POT-Creation-Date: 2023-10-31 11:26+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: Ptitloup <nicolas.can@univ-lille.fr>\n"
"Last-Translator: obado <bado@unice.fr>\n"
"Language-Team: Pod Team [email protected]\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Poedit 3.3.2\n"
"X-Generator: Poedit 3.4\n"

#: pod/authentication/admin.py pod/main/forms.py
msgid "Email"
@@ -370,7 +370,7 @@ msgstr ""
"URL de la vignette correspondant à l’enregistrement de la présentation BBB."

#: pod/bbb/models.py pod/import_video/models.py pod/meeting/models.py
#: pod/playlist/models.py pod/recorder/models.py
#: pod/playlist/models.py pod/recorder/models.py pod/video/models.py
msgid "User"
msgstr "Utilisateur"

@@ -6112,6 +6112,7 @@ msgid "The playlist has been deleted."
msgstr "La liste de lecture a été supprimée."

#: pod/playlist/views.py
#, python-format
msgid "Edit the playlist “%(pname)s”"
msgstr "Modifier la liste de lecture « %(pname)s »"

@@ -7346,6 +7347,18 @@ msgstr "Nombre de vues"
msgid "View counts"
msgstr "Statistiques"

#: pod/video/models.py
msgid "Marker time"
msgstr "Marqueur de temps"

#: pod/video/models.py
msgid "User viewing time marker of video"
msgstr "Marqueur de lecture de vidéo de l’utilisateur"

#: pod/video/models.py
msgid "Users viewing time marker of video"
msgstr "Marqueur de lecture de vidéo des utilisateurs"

#: pod/video/models.py
msgid "Video version"
msgstr "Version de la video"
@@ -7663,6 +7676,10 @@ msgstr "Aide pour les champs de formulaire"
msgid "This content is password protected."
msgstr "Ce contenu est protégé par un mot de passe."

#: pod/video/templates/videos/card.html
msgid "This content has restricted access."
msgstr "Ce contenu est en accès restreint."

#: pod/video/templates/videos/card.html
msgid "This content is chaptered."
msgstr "Ce contenu est chapitré."
92 changes: 72 additions & 20 deletions pod/locale/fr/LC_MESSAGES/djangojs.po
Original file line number Diff line number Diff line change
@@ -5,16 +5,16 @@ msgid ""
msgstr ""
"Project-Id-Version: Esup-Pod\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-10-16 13:36+0000\n"
"POT-Creation-Date: 2023-10-31 11:26+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: AymericJak <aymeric.jakobowski@univ-lille.fr>\n"
"Last-Translator: obado <bado@unice.fr>\n"
"Language-Team: \n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Poedit 3.3.2\n"
"X-Generator: Poedit 3.4\n"

#: pod/chapter/static/js/chapters.js pod/enrichment/static/js/enrichment.js
msgid "Get time from the player"
@@ -179,11 +179,19 @@ msgstr "Mettez en pause pour entrer le texte du segment entre %s et %s."
msgid "A caption cannot has more than 80 characters."
msgstr "Une légende / sous-titre ne peut comporter plus de 80 caractères."

#: pod/completion/static/js/caption_maker.js
msgid "Add a caption/subtitle after this one"
msgstr "Ajouter un(e) légende/sous-titre ci-dessous"

#: pod/completion/static/js/caption_maker.js
#: pod/podfile/static/podfile/js/filewidget.js
msgid "Add"
msgstr "Ajouter"

#: pod/completion/static/js/caption_maker.js
msgid "Delete this caption/subtitle"
msgstr "Supprimer ce(tte) légende/sous-titre"

#: pod/completion/static/js/caption_maker.js
#: pod/video/static/js/comment-script.js
msgid "Delete"
@@ -509,6 +517,11 @@ msgstr "Sauvegarder"
msgid "Network response was not ok."
msgstr "La réponse du réseau n’était pas correcte."

#: pod/podfile/static/podfile/js/filewidget.js
#: pod/video/static/js/change_video_owner.js
msgid "Loading…"
msgstr "Chargement en cours…"

#: pod/podfile/static/podfile/js/filewidget.js
msgid "Change image"
msgstr "Changer d’image"
@@ -598,18 +611,26 @@ msgstr "Souscription aux notifications réussie."
msgid "Error while subscribing to push notifications."
msgstr "Une erreur est survenue lors de la souscription aux notifications."

#: pod/video/static/js/ajax-display-channels.js
msgid "%(count)s channel"
msgid_plural "%(count)s channels"
msgstr[0] "%(count)s chaîne"
msgstr[1] "%(count)s chaînes"

#: pod/video/static/js/ajax-display-channels.js
msgid "No channels found"
msgstr "Aucun chaîne trouvée"

#: pod/video/static/js/ajax-display-channels.js
msgid "%(count)s video"
msgid_plural "%(count)s videos"
msgstr[0] "%(count)s vidéo"
msgstr[1] "%(count)s vidéos"

#: pod/video/static/js/change_video_owner.js
msgid "No element found"
msgstr "Aucun élément trouvé"

#: pod/video/static/js/change_video_owner.js
msgid "Loading…"
msgstr "Chargement en cours…"

#: pod/video/static/js/change_video_owner.js
msgid "An error occurred during the change of owner"
msgstr "Une erreur s’est produite lors du changement de propriétaire"
@@ -630,14 +651,37 @@ msgstr "Réponses"
msgid "Cancel"
msgstr "Annuler"

#: pod/video/static/js/comment-script.js
#, javascript-format
msgid "%s <span class=\"d-none d-md-inline\">vote</span>"
msgid_plural "%s <span class=\"d-none d-md-inline\">votes</span>"
msgstr[0] "%s <span class=\"d-none d-md-inline\">vote</span>"
msgstr[1] "%s <span class=\"d-none d-md-inline\">votes</span>"

#: pod/video/static/js/comment-script.js
msgid "Agree with the comment"
msgstr "D’accord avec ce commentaire"

#: pod/video/static/js/comment-script.js
msgid "Reply to comment"
msgstr "Répondre au commentaire"

#: pod/video/static/js/comment-script.js
msgid "Reply"
msgstr "Répondre"

#: pod/video/static/js/comment-script.js
msgid "Remove this comment"
msgstr "Supprimer ce commentaire"

#: pod/video/static/js/comment-script.js
msgid "Add a public comment"
msgstr "Ajouter un commentaire public"

#: pod/video/static/js/comment-script.js
msgid "Send"
msgstr "Envoyer"

#: pod/video/static/js/comment-script.js
msgid "Show answers"
msgstr "Afficher les réponses"
@@ -650,13 +694,6 @@ msgstr "Mauvaise réponse du serveur."
msgid "Sorry, you're not allowed to vote by now."
msgstr "Désolé, vous n’êtes pas autorisé à voter maintenant."

#: pod/video/static/js/comment-script.js
#, javascript-format
msgid "%s <span class=\"d-none d-md-inline\">vote</span>"
msgid_plural "%s <span class=\"d-none d-md-inline\">votes</span>"
msgstr[0] "%s <span class=\"d-none d-md-inline\">vote</span>"
msgstr[1] "%s <span class=\"d-none d-md-inline\">votes</span>"

#: pod/video/static/js/comment-script.js
msgid "Sorry, you can't comment this video by now."
msgstr "Désolé, vous ne pouvez pas commenter cette vidéo maintenant."
@@ -677,38 +714,47 @@ msgstr[0] "%s commentaire"
msgstr[1] "%s commentaires"

#: pod/video/static/js/regroup_videos_by_theme.js
#: pod/video/static/js/video_category.js
msgid "This content is password protected."
msgstr "Ce contenu est protégé par mot de passe."

#: pod/video/static/js/regroup_videos_by_theme.js
#: pod/video/static/js/video_category.js
msgid "This content is chaptered."
msgstr "Ce contenu est chapitré."

#: pod/video/static/js/regroup_videos_by_theme.js
#: pod/video/static/js/video_category.js
msgid "This content is in draft."
msgstr "Ce contenu est en brouillon."

#: pod/video/static/js/regroup_videos_by_theme.js
#: pod/video/static/js/video_category.js
msgid "Video content."
msgstr "Contenu vidéo."

#: pod/video/static/js/regroup_videos_by_theme.js
#: pod/video/static/js/video_category.js
msgid "Audio content."
msgstr "Contenu audio."

#: pod/video/static/js/regroup_videos_by_theme.js
#: pod/video/static/js/video_category.js
msgid "Edit the video"
msgstr "Éditer la vidéo"

#: pod/video/static/js/regroup_videos_by_theme.js
#: pod/video/static/js/video_category.js
msgid "Complete the video"
msgstr "Compléter la vidéo"

#: pod/video/static/js/regroup_videos_by_theme.js
#: pod/video/static/js/video_category.js
msgid "Chapter the video"
msgstr "Chapitrer la vidéo"

#: pod/video/static/js/regroup_videos_by_theme.js
#: pod/video/static/js/video_category.js
msgid "Delete the video"
msgstr "Supprimer la vidéo"

@@ -781,6 +827,18 @@ msgstr "Désolé, aucune vidéo trouvée"
msgid "Edit the category"
msgstr "Éditer la catégorie"

#: pod/video/static/js/video_category.js
msgid "Delete the category"
msgstr "Supprimer la catégorie"

#: pod/video/static/js/video_category.js
msgid "Success!"
msgstr "Succès !"

#: pod/video/static/js/video_category.js
msgid "Error…"
msgstr "Erreur…"

#: pod/video/static/js/video_category.js
msgid "Category created successfully"
msgstr "Catégorie créée avec succès"
@@ -856,9 +914,3 @@ msgstr "Ajouts en favoris total depuis la création"
#: pod/video/static/js/video_stats_view.js
msgid "Slug"
msgstr "Titre court"

#~ msgid "Add a caption/subtitle after this one"
#~ msgstr "Ajouter un(e) légende/sous-titre ci-dessous"

#~ msgid "Delete this caption/subtitle"
#~ msgstr "Supprimer ce(tte) légende/sous-titre"
Loading

0 comments on commit 9fc6229

Please sign in to comment.