Skip to content

Commit

Permalink
Merge develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@SebastienCozeDev
SebastienCozeDev committed Jan 16, 2024
2 parents 0193cee + 6eda22a commit 7bbea0f
Show file tree
Hide file tree
Showing 17 changed files with 292 additions and 101 deletions.
5 changes: 5 additions & 0 deletions pod/completion/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@ class Document(models.Model):
verbose_name=_("Document"),
on_delete=models.CASCADE,
)
private = models.BooleanField(
verbose_name=_("Private document"),
default=False,
help_text=_("Document is private."),
)

class Meta:
verbose_name = _("Document")
Expand Down
8 changes: 7 additions & 1 deletion pod/completion/templates/document/list_document.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@ <h2 class="card-title pod-card__title">{% trans 'List of additional resources' %
<tbody>
{% for doc in list_document %}
<tr>
<td class="document_name">{{doc.document.name}} ({{ doc.document.file_ext }})</td>
<td class="document_name">{{doc.document.name}} ({{ doc.document.file_ext }})
{% if doc.private %}
<i class="bi bi-eye-slash" aria-hidden="true"></i>
{% else %}
<i class="bi bi-eye" aria-hidden="true"></i>
{% endif %}
</td>
<td>
<form class="form_modif completion d-inline-block" action="{% url 'video:completion:video_completion_document' slug=video.slug %}" method="POST">
{% csrf_token %}
Expand Down
2 changes: 1 addition & 1 deletion pod/completion/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ def video_completion_document_new(request, video):

def video_completion_document_save(request, video):
"""View to save document associated to a video."""
form_document = DocumentForm(request.POST)
form_document = DocumentForm(request, request.POST)
if request.POST.get("document_id") and request.POST["document_id"] != "None":
document = get_object_or_404(Document, id=request.POST["document_id"])
form_document = DocumentForm(request.POST, instance=document)
Expand Down
5 changes: 5 additions & 0 deletions pod/enrichment/static/css/videojs-slides.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
z-index: 2;
}

.vjs-wavesurfer.vjs-fluid wave.vjs-wavedisplay {
z-index: 0;
}

.vjs-slides {
display: block;
}
Expand All @@ -18,6 +22,7 @@
height: 100%;
bottom: 0;
padding: 0;
z-index: 1;
}

.video-slides > li {
Expand Down
4 changes: 4 additions & 0 deletions pod/enrichment/templates/enrichment/video_enrichment-iframe.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@

{% block more_script %}
{{block.super}}
<script>
var enrichmentIsOn = true;
</script>

<script id="enrichment_script_id" src="{% static 'js/videojs-slides.js' %}?ver={{VERSION}}"></script>
{% include 'enrichment/video_enrichment-script.html' %}
{% endblock more_script %}
70 changes: 39 additions & 31 deletions pod/locale/fr/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Pod\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-12-13 11:52+0100\n"
"POT-Creation-Date: 2024-01-08 12:08+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: obado <[email protected]>\n"
"Language-Team: Pod Team [email protected]\n"
Expand Down Expand Up @@ -1236,6 +1236,14 @@ msgstr "Vidéo"
msgid "Document"
msgstr "Document"

#: pod/completion/models.py
msgid "Private document"
msgstr "Document privé"

#: pod/completion/models.py
msgid "Document is private."
msgstr "Le document est privé."

#: pod/completion/models.py pod/podfile/models.py
msgid "Documents"
msgstr "Documents"
Expand Down Expand Up @@ -2138,10 +2146,6 @@ msgstr "Vous ne pouvez faire des enrichissements qui se chevauchent."
msgid "You must save your enrichments to view the result."
msgstr "Vous devez sauvegarder vos enrichissements pour voir le résultat."

#: pod/enrichment/templates/enrichment/enrichment_informations_card_aside.html
msgid "Informations"
msgstr "Informations"

#: pod/enrichment/templates/enrichment/enrichment_informations_card_aside.html
msgid "To help you, the different types of enrichments have specific colors:"
msgstr ""
Expand Down Expand Up @@ -2228,7 +2232,8 @@ msgstr "Vous ne pouvez pas enrichir cette vidéo."

#: pod/enrichment/views.py pod/video/views.py
msgid "You cannot access this playlist because it is private."
msgstr "Vous ne pouvez pas accéder à cette liste de lecture car elle est privée."
msgstr ""
"Vous ne pouvez pas accéder à cette liste de lecture car elle est privée."

#: pod/import_video/apps.py
msgid "Import External Video"
Expand Down Expand Up @@ -2687,14 +2692,18 @@ msgstr "L’enregistrement externe a été supprimé."
msgid "Impossible to create the external recording"
msgstr "Impossible de créer l’enregistrement externe"

#: pod/import_video/views.py
msgid "Impossible to upload to Pod the video"
msgstr "Impossible de téléverser la vidéo PeerTube sur Pod"

#: pod/import_video/views.py pod/meeting/views.py
#, python-format
msgid ""
"This video was uploaded to Pod; its origin is %(type)s: <a href=\"%(url)s\" "
"target=\"_blank\">%(url)s</a>"
msgstr ""
"Cette vidéo a été téléversée sur Pod ; son origine est %(type)s : <a href="
"\"%(url)s\" target=\"_blank\">%(url)s</a>"
"Cette vidéo a été téléversée sur Pod ; son origine est %(type)s : <a "
"href=\"%(url)s\" target=\"_blank\">%(url)s</a>"

#: pod/import_video/views.py pod/meeting/views.py
msgid "Try changing the record type or address for this recording."
Expand All @@ -2703,18 +2712,19 @@ msgstr ""
"enregistrement."

#: pod/import_video/views.py
#, python-format
msgid ""
"This video '%(name)s' was uploaded to Pod; its origin is %(type)s: <a href="
"\"%(url)s\" target=\"_blank\">%(url)s</a><br><br>%(desc)s"
"This video '%(name)s' was uploaded to Pod; its origin is %(type)s: <a "
"href=\"%(url)s\" target=\"_blank\">%(url)s</a><br><br>%(desc)s"
msgstr ""
"Cette vidéo « %(name)s » a été téléversée sur Pod ; son origine est "
"%(type)s : <a href=\"%(url)s\" target=\"_blank\">%(url)s</a><br><br>%(desc)s"

#: pod/import_video/views.py
#, python-format
msgid ""
"This video '%(name)s' was uploaded to Pod; its origin is Youtube: <a href="
"\"%(url)s\" target=\"_blank\">%(url)s</a>"
"This video '%(name)s' was uploaded to Pod; its origin is Youtube: <a "
"href=\"%(url)s\" target=\"_blank\">%(url)s</a>"
msgstr ""
"Cette vidéo « %(name)s » a été téléversée sur Pod ; son origine est "
"Youtube : <a href=\"%(url)s\" target=\"_blank\">%(url)s</a>"
Expand Down Expand Up @@ -3184,7 +3194,6 @@ msgid "Heartbeats"
msgstr "Signaux"

#: pod/live/templates/bbb/bbb_form.html
#: pod/live/templates/meeting/bbb_form.html
msgid "Send message"
msgstr "Envoyer un message"

Expand All @@ -3202,12 +3211,10 @@ msgid "Message"
msgstr "Message"

#: pod/live/templates/bbb/bbb_form.html
#: pod/live/templates/meeting/bbb_form.html
msgid "You must be authenticated to send a message."
msgstr "Vous devez être authentifié pour envoyer un message."

#: pod/live/templates/bbb/bbb_form.html
#: pod/live/templates/meeting/bbb_form.html pod/main/templates/aside.html
#: pod/live/templates/bbb/bbb_form.html pod/main/templates/aside.html
msgid "Submit"
msgstr "Envoyer"

Expand Down Expand Up @@ -5665,16 +5672,16 @@ msgid ""
msgstr ""
"\n"
" <p>Bonjour,\n"
" <p>%(owner)s vous invite à une réunion récurrente <b>"
"%(meeting_title)s</b>.</p>\n"
" <p>%(owner)s vous invite à une réunion récurrente "
"<b>%(meeting_title)s</b>.</p>\n"
" <p>Date de début : %(start_date_time)s </p>\n"
" <p>Récurrent jusqu’à la date : %(end_date)s </p>\n"
" <p>La réunion se tiendra tou(te)s les %(frequency)s %(recurrence)s </"
"p>\n"
" <p>Voici le lien pour rejoindre la réunion :\n"
" <a href=\"%(join_link)s\">%(join_link)s</a></p>\n"
" <p>Vous avez besoin de ce mot de passe pour entrer : <b>"
"%(password)s</b> </p>\n"
" <p>Vous avez besoin de ce mot de passe pour entrer : "
"<b>%(password)s</b> </p>\n"
" <p>Cordialement</p>\n"
" "

Expand All @@ -5700,8 +5707,8 @@ msgstr ""
" <p>Date de fin : %(end_date)s </p>\n"
" <p>Voici le lien pour rejoindre la réunion :\n"
" <a href=\"%(join_link)s\">%(join_link)s</a></p>\n"
" <p>Vous avez besoin de ce mot de passe pour entrer : <b>"
"%(password)s</b> </p>\n"
" <p>Vous avez besoin de ce mot de passe pour entrer : "
"<b>%(password)s</b> </p>\n"
" <p>Cordialement</p>\n"
" "

Expand Down Expand Up @@ -6728,8 +6735,8 @@ msgstr "Prévisualisation d’enregistrement"
#: pod/video/templates/videos/video-element.html
msgid ""
"To view this video please enable JavaScript, and consider upgrading to a web "
"browser that <a href=\"https://videojs.com/html5-video-support/\" target="
"\"_blank\">supports HTML5 video</a>"
"browser that <a href=\"https://videojs.com/html5-video-support/\" "
"target=\"_blank\">supports HTML5 video</a>"
msgstr ""
"Pour visionner cette vidéo, veuillez activer JavaScript et envisager de "
"passer à un navigateur Web qui <a href=\"https://videojs.com/html5-video-"
Expand Down Expand Up @@ -6808,9 +6815,10 @@ msgid ""
msgstr ""
"<p>Bonjour,<br> un nouvel enregistrement a été ajouté sur la plateforme "
"%(title_site)s à partir de l’enregistreur « %(recorder)s ».<br>Pour "
"l’ajouter, cliquez sur le lien ci-dessous.</p><p><a href=\"%(link_url)s\">"
"%(link_url)s</a><br><em>Si le lien n’est pas actif, il faut le copier-coller "
"dans la barre d’adresse de votre navigateur.</em></p><p>Cordialement.</p>"
"l’ajouter, cliquez sur le lien ci-dessous.</p><p><a "
"href=\"%(link_url)s\">%(link_url)s</a><br><em>Si le lien n’est pas actif, il "
"faut le copier-coller dans la barre d’adresse de votre navigateur.</em></"
"p><p>Cordialement.</p>"

#: pod/recorder/views.py
msgid "New recording added."
Expand Down Expand Up @@ -7158,8 +7166,8 @@ msgid ""
"%(url)s</a></p>\n"
msgstr ""
"vous pouvez changer la date de suppression en éditant votre vidéo :</p>\n"
"<p><a href=\"%(scheme)s:%(url)s\" rel=\"noopener\" target=\"_blank\">"
"%(scheme)s:%(url)s</a></p>\n"
"<p><a href=\"%(scheme)s:%(url)s\" rel=\"noopener\" "
"target=\"_blank\">%(scheme)s:%(url)s</a></p>\n"
"\n"

#: pod/video/management/commands/check_obsolete_videos.py
Expand Down Expand Up @@ -7937,8 +7945,8 @@ msgid ""
"This video is chaptered. Click the chapter button <span class=\"vjs-icon-"
"chapters\"></span> on the video player to view them."
msgstr ""
"Cette vidéo est chapitrée. Cliquez sur le bouton de chapitre <span class="
"\"vjs-icon-chapters\"></span> sur le lecteur vidéo pour les voir."
"Cette vidéo est chapitrée. Cliquez sur le bouton de chapitre <span "
"class=\"vjs-icon-chapters\"></span> sur le lecteur vidéo pour les voir."

#: pod/video/templates/videos/video-all-info.html
msgid "Other versions"
Expand Down
Binary file modified pod/locale/fr/LC_MESSAGES/djangojs.mo
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion pod/locale/fr/LC_MESSAGES/djangojs.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Esup-Pod\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-12-13 11:52+0100\n"
"POT-Creation-Date: 2024-01-08 12:08+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: ptitloup <[email protected]>\n"
"Language-Team: \n"
Expand Down
49 changes: 20 additions & 29 deletions pod/locale/nl/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Pod\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-12-13 11:52+0100\n"
"POT-Creation-Date: 2024-01-08 12:08+0100\n"
"PO-Revision-Date: 2023-06-08 14:37+0200\n"
"Last-Translator: obado <[email protected]>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -1171,6 +1171,14 @@ msgstr ""
msgid "Document"
msgstr ""

#: pod/completion/models.py
msgid "Private document"
msgstr ""

#: pod/completion/models.py
msgid "Document is private."
msgstr ""

#: pod/completion/models.py pod/podfile/models.py
msgid "Documents"
msgstr ""
Expand Down Expand Up @@ -2519,6 +2527,10 @@ msgstr ""
msgid "Impossible to create the external recording"
msgstr ""

#: pod/import_video/views.py
msgid "Impossible to upload to Pod the video"
msgstr ""

#: pod/import_video/views.py pod/meeting/views.py
#, python-format
msgid ""
Expand All @@ -2533,15 +2545,15 @@ msgstr ""
#: pod/import_video/views.py
#, python-format
msgid ""
"This video '%(name)s' was uploaded to Pod; its origin is %(type)s: <a href="
"\"%(url)s\" target=\"_blank\">%(url)s</a><br><br>%(desc)s"
"This video '%(name)s' was uploaded to Pod; its origin is %(type)s: <a "
"href=\"%(url)s\" target=\"_blank\">%(url)s</a><br><br>%(desc)s"
msgstr ""

#: pod/import_video/views.py
#, python-format
msgid ""
"This video '%(name)s' was uploaded to Pod; its origin is Youtube: <a href="
"\"%(url)s\" target=\"_blank\">%(url)s</a>"
"This video '%(name)s' was uploaded to Pod; its origin is Youtube: <a "
"href=\"%(url)s\" target=\"_blank\">%(url)s</a>"
msgstr ""

#: pod/import_video/views.py
Expand Down Expand Up @@ -2970,7 +2982,6 @@ msgid "Heartbeats"
msgstr ""

#: pod/live/templates/bbb/bbb_form.html
#: pod/live/templates/meeting/bbb_form.html
msgid "Send message"
msgstr ""

Expand All @@ -2985,12 +2996,10 @@ msgid "Message"
msgstr ""

#: pod/live/templates/bbb/bbb_form.html
#: pod/live/templates/meeting/bbb_form.html
msgid "You must be authenticated to send a message."
msgstr ""

#: pod/live/templates/bbb/bbb_form.html
#: pod/live/templates/meeting/bbb_form.html pod/main/templates/aside.html
#: pod/live/templates/bbb/bbb_form.html pod/main/templates/aside.html
msgid "Submit"
msgstr ""

Expand Down Expand Up @@ -3498,12 +3507,6 @@ msgstr ""
msgid "Past events"
msgstr ""

#: pod/live/templates/meeting/bbb_form.html
msgid ""
"You can send a message (100 characters maximum) to the speakers/trainers. "
"They will receive it in few seconds."
msgstr ""

#: pod/live/utils.py
#, python-format
msgid "Registration of event #%(content_id)s"
Expand Down Expand Up @@ -5276,18 +5279,6 @@ msgstr ""
msgid "occurrences"
msgstr ""

#: pod/meeting/templates/meeting/webinary_options_modal_form.html
msgid "Enable the chat"
msgstr ""

#: pod/meeting/templates/meeting/webinary_options_modal_form.html
msgid "enable_chat"
msgstr ""

#: pod/meeting/templates/meeting/webinary_options_modal_form.html
msgid "Show chat"
msgstr ""

#: pod/meeting/utils.py
#, python-format
msgid "A new Big Blue Button recording for '%(name)s' meeting is available"
Expand Down Expand Up @@ -6361,8 +6352,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 <a href=\"https://videojs.com/html5-video-support/\" target="
"\"_blank\">supports HTML5 video</a>"
"browser that <a href=\"https://videojs.com/html5-video-support/\" "
"target=\"_blank\">supports HTML5 video</a>"
msgstr ""

#: pod/recorder/templates/recorder/link_record.html
Expand Down
2 changes: 1 addition & 1 deletion pod/locale/nl/LC_MESSAGES/djangojs.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Esup-Pod\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-12-13 11:52+0100\n"
"POT-Creation-Date: 2024-01-08 12:08+0100\n"
"PO-Revision-Date: 2023-02-08 15:22+0100\n"
"Last-Translator: obado <[email protected]>\n"
"Language-Team: \n"
Expand Down
Loading

0 comments on commit 7bbea0f

Please sign in to comment.