diff --git a/pod/authentication/models.py b/pod/authentication/models.py index 4e5abdae1d..b788045410 100644 --- a/pod/authentication/models.py +++ b/pod/authentication/models.py @@ -64,10 +64,16 @@ FILES_DIR = getattr(settings, "FILES_DIR", "files") -def get_name(self): - if HIDE_USERNAME: - return "%s %s" % (self.first_name, self.last_name) - return "%s %s (%s)" % (self.first_name, self.last_name, self.username) +def get_name(self) -> str: + """ + Returns the user's full name, including the username if not hidden. + + Returns: + str: The user's full name and username if not hidden. + """ + if HIDE_USERNAME or not self.is_authenticated: + return self.get_full_name().strip() + return f"{self.get_full_name()} ({self.get_username()})".strip() User.add_to_class("__str__", get_name) diff --git a/pod/enrichment/templates/enrichment/video_enrichment.html b/pod/enrichment/templates/enrichment/video_enrichment.html index 8ac576c6ed..82b12fe2e0 100644 --- a/pod/enrichment/templates/enrichment/video_enrichment.html +++ b/pod/enrichment/templates/enrichment/video_enrichment.html @@ -19,7 +19,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/pod/live/templates/live/event-info.html b/pod/live/templates/live/event-info.html index 03ebe960e2..19cb538e25 100644 --- a/pod/live/templates/live/event-info.html +++ b/pod/live/templates/live/event-info.html @@ -40,13 +40,14 @@

{% trans 'Location:' %}

  • {% trans 'Added by:' %}

    - + {% if event.owner.owner.userpicture.file %} {% thumbnail event.owner.owner.userpicture.file "x34" as im %} {% endthumbnail %} {% endif %} - {{ event.owner.get_full_name }} + {{ event.owner }} +
  • diff --git a/pod/locale/fr/LC_MESSAGES/django.mo b/pod/locale/fr/LC_MESSAGES/django.mo index 018f0cca33..9cbc9898ea 100644 Binary files a/pod/locale/fr/LC_MESSAGES/django.mo and b/pod/locale/fr/LC_MESSAGES/django.mo differ diff --git a/pod/locale/fr/LC_MESSAGES/django.po b/pod/locale/fr/LC_MESSAGES/django.po index 559dbd1148..e886257365 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: 2023-08-31 12:25+0000\n" +"POT-Creation-Date: 2023-09-01 09:54+0000\n" "PO-Revision-Date: \n" "Last-Translator: obado \n" "Language-Team: Pod Team pod@esup-portail.org\n" @@ -2133,9 +2133,12 @@ msgid "Enriched" msgstr "Enrichi" #: pod/enrichment/templates/enrichment/video_enrichment.html +#: pod/live/templates/live/event-info.html +#: pod/video/templates/videos/video-info.html #: pod/video/templates/videos/video_opengraph.html -msgid "Added by" -msgstr "Ajouté par" +#: pod/video/templates/videos/video_page_content.html +msgid "Added by:" +msgstr "Ajouté par :" #: pod/enrichment/templates/enrichment/video_enrichment.html msgid "Informations" @@ -2400,7 +2403,7 @@ msgid "Tags" msgstr "Mots clés" #: pod/import_video/templates/import_video/filter_aside.html -#: pod/main/templates/navbar.html pod/main/templates/navbar_collapse.html +#: pod/main/templates/navbar_collapse.html #: pod/meeting/templates/meeting/filter_aside_recording.html #: pod/video/templates/videos/filter_aside.html #: pod/video/templates/videos/filter_aside_category.html @@ -3169,7 +3172,7 @@ msgid "Home" msgstr "Accueil" #: pod/live/templates/live/direct.html -#: pod/live/templates/live/event-script.html +#: pod/live/templates/live/event-script.html pod/main/templates/footer.html #: pod/video/templates/videos/video-script.html msgid "New window" msgstr "Nouvelle fenêtre" @@ -3264,12 +3267,6 @@ msgstr "%(start_date)s au %(end_date)s" msgid "Location:" msgstr "Lieu :" -#: pod/live/templates/live/event-info.html -#: pod/video/templates/videos/video-info.html -#: pod/video/templates/videos/video_page_content.html -msgid "Added by:" -msgstr "Ajouté par :" - #: pod/live/templates/live/event-info.html #: pod/video/templates/videos/video-info.html msgid "Type:" @@ -4518,8 +4515,8 @@ msgid "Back to the previous page" msgstr "Retour à la page précédente" #: pod/main/templates/footer.html -msgid "Go to top" -msgstr "Haut de page" +msgid "Return to top of page" +msgstr "Retourner en haut de la page" #: pod/main/templates/footer.html msgid "" @@ -4534,8 +4531,12 @@ msgid "Esup Portal" msgstr "ESUP-Portail" #: pod/main/templates/footer.html -msgid "Pod Project" -msgstr "Projet Pod" +msgid "Show Esup-Pod project" +msgstr "Afficher le projet Esup-Pod" + +#: pod/main/templates/footer.html +msgid "Esup-Pod Project" +msgstr "Projet Esup-Pod" #: pod/main/templates/footer.html pod/video/feeds.py msgid "video platform of" @@ -4615,14 +4616,38 @@ msgstr "Listes de lecture promues" msgid "Channels" msgstr "Chaînes" +#: pod/main/templates/navbar.html +msgid "Search for a media on" +msgstr "Rechercher un média sur" + +#: pod/main/templates/navbar.html +msgid "Search a media" +msgstr "Rechercher un média" + +#: pod/main/templates/navbar.html +msgid "Start media search on" +msgstr "Lancer la recherche d'un média sur" + #: pod/main/templates/navbar.html msgid "Some features are unavailable" msgstr "Certaines fonctionnalités sont indisponibles" +#: pod/main/templates/navbar.html +msgid "Add a new video on" +msgstr "Ajouter une nouvelle vidéo sur" + #: pod/main/templates/navbar.html msgid "Add a video" msgstr "Ajouter une vidéo" +#: pod/main/templates/navbar.html +msgid "Show all my videos on" +msgstr "Afficher toutes mes vidéos sur" + +#: pod/main/templates/navbar.html +msgid "Show all my meetings on" +msgstr "Afficher toutes mes réunions sur" + #: pod/main/templates/navbar.html #: pod/meeting/templates/meeting/add_or_edit.html #: pod/meeting/templates/meeting/delete.html @@ -4659,7 +4684,11 @@ msgstr "Utilise une police plus adaptée aux personnes atteintes de dyslexie." #: pod/main/templates/navbar.html msgid "Dyslexia mode" -msgstr "Police ‘Open Dyslexic’" +msgstr "Mode dyslexie" + +#: pod/main/templates/navbar.html +msgid "Toggle user menu" +msgstr "Basculer le menu utilisateur" #: pod/main/templates/navbar.html msgid "Add your picture" @@ -4714,6 +4743,10 @@ msgstr "Nombre de vidéos :" msgid "Number of playlists:" msgstr "Nombre de listes de lecture :" +#: pod/main/templates/navbar.html +msgid "Open login page" +msgstr "Ouvrir la page de connexion" + #: pod/main/templates/navbar_collapse.html msgid "Types of videos" msgstr "Types de vidéos" @@ -8444,6 +8477,15 @@ msgstr "Résultats de la recherche" msgid "Esup-Pod xAPI" msgstr "xAPI Esup-Pod" +#~ msgid "Added by" +#~ msgstr "Ajouté par" + +#~ msgid "Toggle your action menu" +#~ msgstr "Basculer votre menu d'actions" + +#~ msgid "Go to top" +#~ msgstr "Haut de page" + #~ msgid "Edit the overlay" #~ msgstr "Éditer la superposition" diff --git a/pod/locale/fr/LC_MESSAGES/djangojs.po b/pod/locale/fr/LC_MESSAGES/djangojs.po index 7f928cf6ed..ca09391b09 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: 2023-08-31 12:25+0000\n" +"POT-Creation-Date: 2023-09-01 09:54+0000\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 b6ec15d8cd..f1ecd0e284 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: 2023-08-31 12:25+0000\n" +"POT-Creation-Date: 2023-09-01 09:54+0000\n" "PO-Revision-Date: 2023-06-08 14:37+0200\n" "Last-Translator: obado \n" "Language-Team: \n" @@ -2026,8 +2026,11 @@ msgid "Enriched" msgstr "" #: pod/enrichment/templates/enrichment/video_enrichment.html +#: pod/live/templates/live/event-info.html +#: pod/video/templates/videos/video-info.html #: pod/video/templates/videos/video_opengraph.html -msgid "Added by" +#: pod/video/templates/videos/video_page_content.html +msgid "Added by:" msgstr "" #: pod/enrichment/templates/enrichment/video_enrichment.html @@ -2259,7 +2262,7 @@ msgid "Tags" msgstr "" #: pod/import_video/templates/import_video/filter_aside.html -#: pod/main/templates/navbar.html pod/main/templates/navbar_collapse.html +#: pod/main/templates/navbar_collapse.html #: pod/meeting/templates/meeting/filter_aside_recording.html #: pod/video/templates/videos/filter_aside.html #: pod/video/templates/videos/filter_aside_category.html @@ -2959,7 +2962,7 @@ msgid "Home" msgstr "" #: pod/live/templates/live/direct.html -#: pod/live/templates/live/event-script.html +#: pod/live/templates/live/event-script.html pod/main/templates/footer.html #: pod/video/templates/videos/video-script.html msgid "New window" msgstr "" @@ -3050,12 +3053,6 @@ msgstr "" msgid "Location:" msgstr "" -#: pod/live/templates/live/event-info.html -#: pod/video/templates/videos/video-info.html -#: pod/video/templates/videos/video_page_content.html -msgid "Added by:" -msgstr "" - #: pod/live/templates/live/event-info.html #: pod/video/templates/videos/video-info.html msgid "Type:" @@ -4276,7 +4273,7 @@ msgid "Back to the previous page" msgstr "" #: pod/main/templates/footer.html -msgid "Go to top" +msgid "Return to top of page" msgstr "" #: pod/main/templates/footer.html @@ -4290,7 +4287,11 @@ msgid "Esup Portal" msgstr "" #: pod/main/templates/footer.html -msgid "Pod Project" +msgid "Show Esup-Pod project" +msgstr "" + +#: pod/main/templates/footer.html +msgid "Esup-Pod Project" msgstr "" #: pod/main/templates/footer.html pod/video/feeds.py @@ -4369,14 +4370,38 @@ msgstr "" msgid "Channels" msgstr "" +#: pod/main/templates/navbar.html +msgid "Search for a media on" +msgstr "" + +#: pod/main/templates/navbar.html +msgid "Search a media" +msgstr "" + +#: pod/main/templates/navbar.html +msgid "Start media search on" +msgstr "" + #: pod/main/templates/navbar.html msgid "Some features are unavailable" msgstr "" +#: pod/main/templates/navbar.html +msgid "Add a new video on" +msgstr "" + #: pod/main/templates/navbar.html msgid "Add a video" msgstr "" +#: pod/main/templates/navbar.html +msgid "Show all my videos on" +msgstr "" + +#: pod/main/templates/navbar.html +msgid "Show all my meetings on" +msgstr "" + #: pod/main/templates/navbar.html #: pod/meeting/templates/meeting/add_or_edit.html #: pod/meeting/templates/meeting/delete.html @@ -4415,6 +4440,10 @@ msgstr "" msgid "Dyslexia mode" msgstr "" +#: pod/main/templates/navbar.html +msgid "Toggle user menu" +msgstr "" + #: pod/main/templates/navbar.html msgid "Add your picture" msgstr "" @@ -4468,6 +4497,10 @@ msgstr "" msgid "Number of playlists:" msgstr "" +#: pod/main/templates/navbar.html +msgid "Open login page" +msgstr "" + #: pod/main/templates/navbar_collapse.html msgid "Types of videos" msgstr "" diff --git a/pod/locale/nl/LC_MESSAGES/djangojs.po b/pod/locale/nl/LC_MESSAGES/djangojs.po index cf7d9f20f4..1d6fc51ca9 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: 2023-08-31 12:25+0000\n" +"POT-Creation-Date: 2023-09-01 09:54+0000\n" "PO-Revision-Date: 2023-02-08 15:22+0100\n" "Last-Translator: obado \n" "Language-Team: \n" diff --git a/pod/main/templates/base.html b/pod/main/templates/base.html index 8818a5ae02..7a8cf660b1 100644 --- a/pod/main/templates/base.html +++ b/pod/main/templates/base.html @@ -82,7 +82,9 @@ diff --git a/pod/main/templates/footer.html b/pod/main/templates/footer.html index d9a7d27857..658e92e50d 100644 --- a/pod/main/templates/footer.html +++ b/pod/main/templates/footer.html @@ -3,17 +3,17 @@ {% spaceless %}

    - - + +

    - {{TITLE_ETB}}
    + {{ TITLE_ETB }}
    {% for text in FOOTER_TEXT %} - {{text|safe}}
    + {{ text|safe }}
    {% endfor %}

    @@ -22,17 +22,21 @@

    - {{TITLE_SITE}} {% trans "video platform of" %} {{TITLE_ETB}} - {% trans "Release" %} {{VERSION}} - {{VIDEOS_COUNT}} {% trans "videos availables" %} [ {{VIDEOS_DURATION}} ] + {{ TITLE_SITE }} {% trans 'video platform of' %} {{ TITLE_ETB }} - {% trans 'Release' %} {{ VERSION }} - {{ VIDEOS_COUNT }} {% trans 'videos availables' %} [ {{ VIDEOS_DURATION }} ]

    {% endspaceless %} diff --git a/pod/main/templates/navbar.html b/pod/main/templates/navbar.html index d05ede968d..e6c8b0b6ed 100644 --- a/pod/main/templates/navbar.html +++ b/pod/main/templates/navbar.html @@ -8,10 +8,6 @@ {% load favorites_playlist %}
    - {% comment %}{% endcomment %} +
    • {% endif %} {% if HIDE_TYPES_TAB == False %} {% endif %} {% if USE_PLAYLIST %} {% endif %} {% if "live" in THIRD_PARTY_APPS %} {% endif %} {% if HIDE_CHANNEL_TAB == False %}
  • @@ -65,11 +61,11 @@
    Menu
    - -
    @@ -79,27 +75,36 @@
    Menu
    {% if user.is_authenticated %} {% if MAINTENANCE_MODE %}
  • - {{MAINTENANCE_REASON}}
    {% trans "Some features are unavailable" %}     + {{MAINTENANCE_REASON}}
    {% trans 'Some features are unavailable' %}
    • {% else %} {% show_video_buttons as video_buttons %} {% if video_buttons %}
  • - {% trans "Add a video" %} + + + {% trans 'Add a video' %} +
  • - {% trans "My videos" %} + + + {% trans 'My videos' %} +
    • {% endif %} {% show_meeting_button as meeting_button %} {% if meeting_button %}
  • - {% trans "My meetings" %} + + + {% trans 'My meetings' %} +
    • {% endif %} {% endif %} {% endif %} - +
  • @@ -181,16 +186,16 @@
    {% trans 'Configuration'%}
    -
    {% if user.get_full_name != '' %}{{ user.get_full_name }}{% else %}{{ user.username }}{% endif %}
    +
    {% if user.get_full_name != '' %}{{ user.get_full_name }}{% else %}{{ user.get_username }}{% endif %}
    {% endspaceless %} {% endfor %}
    - + -  {% trans "Back to my playlists" %} +  {% trans 'Back to my playlists' %}
    diff --git a/pod/playlist/templates/playlist/playlist-informations-card.html b/pod/playlist/templates/playlist/playlist-informations-card.html index 294a5fa62a..13af04e742 100644 --- a/pod/playlist/templates/playlist/playlist-informations-card.html +++ b/pod/playlist/templates/playlist/playlist-informations-card.html @@ -3,32 +3,32 @@

    -  {% trans "Informations about the playlist" %} +  {% trans 'Informations about the playlist' %}

    - {% trans "Last updated on" %} {{ playlist.date_updated.date }} {% trans "at" %} {{ playlist.date_updated.time }} + {% trans 'Last updated on' %} {{ playlist.date_updated.date }} {% trans 'at' %} {{ playlist.date_updated.time }}

    {% get_playlist_description playlist %}

    - {% trans "Right of access:" %} {% include "playlist/playlist_visibility_icon.html" with playlist=playlist %} + {% trans 'Right of access:' %} {% include "playlist/playlist_visibility_icon.html" with playlist=playlist %}

    - {% trans "Playlist owner:" %} {{ playlist.owner }} + {% trans 'Playlist owner:' %} {{ playlist.owner }}

    {% if additional_owners|length > 0 %}
    - {% trans "Additional owners" %} : + {% trans 'Additional owners' %} :
    @@ -64,12 +64,12 @@

    {% include 'videos/filter_aside.html' %}

    -

    {% trans "Help - Drag & Drop" %}

    +

    {% trans 'Help - Drag & Drop' %}

      -
    1. {% trans "Select the video to move by clicking and holding." %}
      2. -
    2. {% trans "While holding down the video, drag it to the desired location." %}
      3. -
    3. {% trans "Drop the video on another to swap their position." %}
      4. +
    4. {% trans 'Select the video to move by clicking and holding.' %}
      5. +
    5. {% trans 'While holding down the video, drag it to the desired location.' %}
      6. +
    6. {% trans 'Drop the video on another to swap their position.' %}
    diff --git a/pod/video/templates/channel/my_channels.html b/pod/video/templates/channel/my_channels.html index 43fa6f55eb..5a4e260284 100644 --- a/pod/video/templates/channel/my_channels.html +++ b/pod/video/templates/channel/my_channels.html @@ -3,10 +3,10 @@ {% load static %} {% load thumbnail %} -{% block breadcrumbs %}{{ block.super }}
  • {% trans "My channels" %}
    • {% endblock %} +{% block breadcrumbs %}{{ block.super }}
  • {% trans 'My channels' %}
    • {% endblock %} {% block page_title %} -{% trans "My channels" %} +{% trans 'My channels' %} {% endblock %} @@ -17,13 +17,13 @@
  • - + {% if channel.headband %} {% thumbnail channel.headband.file "x34" as im %} {% endthumbnail %} {% endif %} - {{channel.title}} + {{ channel.title }} {{channel.video_count}} diff --git a/pod/video/templates/videos/filter_aside.html b/pod/video/templates/videos/filter_aside.html index 6e5f9ad551..2cf78a6811 100644 --- a/pod/video/templates/videos/filter_aside.html +++ b/pod/video/templates/videos/filter_aside.html @@ -5,11 +5,11 @@ {% spaceless %}

    -  {% trans "Filters"%} +  {% trans 'Filters' %}

    - {% trans "The videos on the left are automatically sorted according to the filters selected. Check options to adjust results." %} + {% trans 'The videos on the left are automatically sorted according to the filters selected. Check options to adjust results.' %}

    @@ -19,20 +19,20 @@

    {% if not HIDE_USER_FILTER and user.is_authenticated %}
    - {% trans "Users" %} + {% trans 'Users' %}
    - +