From ed357d1e987b4e64a709328ee9f59fd847861e8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sat, 18 Jul 2020 08:34:25 +0200 Subject: [PATCH] templates: add proper markup for appbar action buttons --- emissions/locale/fr/LC_MESSAGES/django.po | 222 +++++++++--------- .../templates/emissions/category_list.html | 8 +- emissions/templates/emissions/days.html | 8 +- .../templates/emissions/emission_form.html | 2 +- .../templates/emissions/emission_list.html | 7 +- .../emissions/episode_confirm_delete.html | 4 +- .../templates/emissions/episode_detail.html | 2 +- .../templates/emissions/episode_form.html | 4 +- .../templates/emissions/episode_regie.html | 2 +- .../emissions/newsitem_confirm_delete.html | 2 +- .../templates/emissions/newsitem_detail.html | 2 +- .../templates/emissions/newsitem_form.html | 3 +- .../emissions/soundfile_confirm_delete.html | 2 +- 13 files changed, 137 insertions(+), 131 deletions(-) diff --git a/emissions/locale/fr/LC_MESSAGES/django.po b/emissions/locale/fr/LC_MESSAGES/django.po index 4cc87ad..f2911df 100644 --- a/emissions/locale/fr/LC_MESSAGES/django.po +++ b/emissions/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: django-panik-emissions 0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-16 17:04+0200\n" +"POT-Creation-Date: 2020-07-16 14:25+0200\n" "PO-Revision-Date: 2020-05-16 17:05+0200\n" "Last-Translator: Frederic Peters \n" "Language: fr\n" @@ -17,438 +17,432 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: emissions/forms.py:34 +#: forms.py:34 msgid "Monday" msgstr "Lundi" -#: emissions/forms.py:34 +#: forms.py:34 msgid "Tuesday" msgstr "Mardi" -#: emissions/forms.py:34 +#: forms.py:34 msgid "Wednesday" msgstr "Mercredi" -#: emissions/forms.py:34 +#: forms.py:34 msgid "Thursday" msgstr "Jeudi" -#: emissions/forms.py:35 +#: forms.py:35 msgid "Friday" msgstr "Vendredi" -#: emissions/forms.py:35 +#: forms.py:35 msgid "Saturday" msgstr "Samedi" -#: emissions/forms.py:35 +#: forms.py:35 msgid "Sunday" msgstr "Dimanche" -#: emissions/forms.py:178 +#: forms.py:178 msgid "First Diffusion" msgstr "Première diffusion" -#: emissions/forms.py:180 +#: forms.py:180 msgid "Second Diffusion" msgstr "Deuxième diffusion" -#: emissions/forms.py:182 +#: forms.py:182 msgid "Third Diffusion" msgstr "Troisième diffusion" -#: emissions/forms.py:184 +#: forms.py:184 msgid "Fourth Diffusion" msgstr "Quatrième diffusion" -#: emissions/forms.py:250 +#: forms.py:250 msgid "Invalid file, could not get duration." msgstr "Fichier invalide, impossible d’en déterminer la durée." -#: emissions/models.py:24 +#: models.py:24 msgid "Unspecified" msgstr "Pas précisée" -#: emissions/models.py:25 +#: models.py:25 msgid "Creative Commons Attribution" msgstr "Creative Commons Attribution" -#: emissions/models.py:26 +#: models.py:26 msgid "Creative Commons Attribution ShareAlike" msgstr "Creative Commons Attribution ShareAlike" -#: emissions/models.py:27 +#: models.py:27 msgid "Creative Commons Attribution NonCommercial" msgstr "Creative Commons Attribution NonCommercial" -#: emissions/models.py:28 +#: models.py:28 msgid "Creative Commons Attribution NoDerivs" msgstr "Creative Commons Attribution NoDerivs" -#: emissions/models.py:29 +#: models.py:29 msgid "Creative Commons Attribution NonCommercial ShareAlike" msgstr "Creative Commons Attribution NonCommercial ShareAlike" -#: emissions/models.py:30 +#: models.py:30 msgid "Creative Commons Attribution NonCommercial NoDerivs" msgstr "Creative Commons Attribution NonCommercial NoDerivs" -#: emissions/models.py:31 +#: models.py:31 msgid "Creative Commons Zero / Public Domain" msgstr "Creative Commons Zero / Domaine public" -#: emissions/models.py:32 +#: models.py:32 msgid "Art Libre" msgstr "Art Libre" -#: emissions/models.py:36 +#: models.py:36 msgid "Standard" msgstr "Normale" -#: emissions/models.py:37 +#: models.py:37 msgid "High" msgstr "Élevée" -#: emissions/models.py:38 +#: models.py:38 msgid "Highest" msgstr "Très élevée" -#: emissions/models.py:64 emissions/models.py:571 +#: models.py:64 models.py:573 msgid "Category" msgstr "Catégorie" -#: emissions/models.py:65 emissions/models.py:130 +#: models.py:65 models.py:130 msgid "Categories" msgstr "Catégories" -#: emissions/models.py:68 emissions/models.py:87 emissions/models.py:105 -#: emissions/models.py:125 emissions/models.py:336 emissions/models.py:486 -#: emissions/models.py:539 emissions/models.py:562 emissions/models.py:600 -#: emissions/models.py:731 +#: models.py:68 models.py:87 models.py:105 models.py:125 models.py:337 +#: models.py:488 models.py:541 models.py:564 models.py:602 models.py:733 msgid "Title" msgstr "Titre" -#: emissions/models.py:70 +#: models.py:70 msgid "iTunes Category Name" msgstr "Nom de catégorie iTunes" -#: emissions/models.py:83 +#: models.py:83 msgid "Colour" msgstr "Couleur" -#: emissions/models.py:84 emissions/models.py:131 +#: models.py:84 models.py:131 msgid "Colours" msgstr "Couleurs" -#: emissions/models.py:101 emissions/models.py:489 +#: models.py:101 models.py:491 msgid "Format" msgstr "Format" -#: emissions/models.py:102 +#: models.py:102 msgid "Formats" msgstr "Formats" -#: emissions/models.py:121 emissions/models.py:335 emissions/models.py:572 -#: emissions/models.py:618 emissions/models.py:697 +#: models.py:121 models.py:336 models.py:574 models.py:620 models.py:699 msgid "Emission" msgstr "Émission" -#: emissions/models.py:122 +#: models.py:122 msgid "Emissions" msgstr "Émissions" -#: emissions/models.py:127 emissions/models.py:338 +#: models.py:127 models.py:339 msgid "Subtitle" msgstr "Sous-titre" -#: emissions/models.py:128 emissions/models.py:339 emissions/models.py:564 -#: emissions/models.py:605 +#: models.py:128 models.py:340 models.py:566 models.py:607 msgid "Description" msgstr "Description" -#: emissions/models.py:129 +#: models.py:129 msgid "Archived" msgstr "Archivé" -#: emissions/models.py:135 emissions/models.py:232 emissions/models.py:341 -#: emissions/models.py:487 +#: models.py:135 models.py:232 models.py:342 models.py:489 msgid "Duration" msgstr "Durée" -#: emissions/models.py:136 emissions/models.py:233 emissions/models.py:342 +#: models.py:136 models.py:233 models.py:343 msgid "In minutes" msgstr "En minutes" -#: emissions/models.py:138 +#: models.py:138 msgid "Default license for podcasts" msgstr "Licence par défaut pour les podcasts" -#: emissions/models.py:140 +#: models.py:140 msgid "Podcast sound quality" msgstr "Qualité de l’encodage des podcasts" -#: emissions/models.py:142 +#: models.py:142 msgid "Email" msgstr "Adresse électronique" -#: emissions/models.py:143 +#: models.py:143 msgid "Website" msgstr "Site web" -#: emissions/models.py:145 emissions/models.py:344 emissions/models.py:567 +#: models.py:145 models.py:345 models.py:569 msgid "Image" msgstr "Illustration" -#: emissions/models.py:215 +#: models.py:215 msgid "Schedule" msgstr "Horaire" -#: emissions/models.py:216 +#: models.py:216 msgid "Schedules" msgstr "Horaires" -#: emissions/models.py:220 +#: models.py:220 msgid "Every week" msgstr "Toutes les semaines" -#: emissions/models.py:221 +#: models.py:221 msgid "First week" msgstr "Première semaine" -#: emissions/models.py:222 +#: models.py:222 msgid "Second week" msgstr "Deuxième semaine" -#: emissions/models.py:223 +#: models.py:223 msgid "Third week" msgstr "Troisième semaine" -#: emissions/models.py:224 +#: models.py:224 msgid "Fourth week" msgstr "Quatrième semaine" -#: emissions/models.py:225 +#: models.py:225 msgid "First and third week" msgstr "Première et troisième semaine" -#: emissions/models.py:226 +#: models.py:226 msgid "Second and fourth week" msgstr "Deuxième et quatrième semaine" -#: emissions/models.py:230 +#: models.py:230 msgid "Weeks" msgstr "Semaines" -#: emissions/models.py:231 +#: models.py:231 msgid "Rerun" msgstr "Rediffusion" -#: emissions/models.py:238 +#: models.py:238 msgid "1st of the month" msgstr "1er du mois" -#: emissions/models.py:240 +#: models.py:240 msgid "2nd of the month" msgstr "2e du mois" -#: emissions/models.py:242 +#: models.py:242 msgid "3rd of the month" msgstr "3e du mois" -#: emissions/models.py:244 +#: models.py:244 msgid "4th of the month" msgstr "4e du mois" -#: emissions/models.py:246 +#: models.py:246 msgid "1st and 3rd" msgstr "1er et 3e" -#: emissions/models.py:248 +#: models.py:248 msgid "2nd and 4th" msgstr "2e et 4e" -#: emissions/models.py:331 emissions/models.py:438 emissions/models.py:479 -#: emissions/models.py:620 +#: models.py:332 models.py:439 models.py:481 models.py:622 msgid "Episode" msgstr "Épisode" -#: emissions/models.py:332 +#: models.py:333 msgid "Episodes" msgstr "Épisodes" -#: emissions/models.py:340 emissions/models.py:570 +#: models.py:341 models.py:572 msgid "Tags" msgstr "Tags" -#: emissions/models.py:434 +#: models.py:435 msgid "Diffusion" msgstr "Diffusion" -#: emissions/models.py:435 +#: models.py:436 msgid "Diffusions" msgstr "Diffusions" -#: emissions/models.py:439 emissions/models.py:460 +#: models.py:440 models.py:462 msgid "Date/time" msgstr "Date et heure" -#: emissions/models.py:456 +#: models.py:458 msgid "Absence" msgstr "Absence" -#: emissions/models.py:457 +#: models.py:459 msgid "Absences" msgstr "Absences" -#: emissions/models.py:475 emissions/models.py:622 +#: models.py:477 models.py:624 msgid "Sound file" msgstr "Fichier son" -#: emissions/models.py:476 +#: models.py:478 msgid "Sound files" msgstr "Fichiers son" -#: emissions/models.py:480 +#: models.py:482 msgid "File" msgstr "Fichier" -#: emissions/models.py:481 +#: models.py:483 msgid "Podcastable" msgstr "Podcastable" -#: emissions/models.py:483 +#: models.py:485 msgid "The file can be published online according to SABAM rules." msgstr "Le fichier peut être mis en ligne en respectant la SABAM." -#: emissions/models.py:484 +#: models.py:486 msgid "Fragment" msgstr "Fragment" -#: emissions/models.py:485 +#: models.py:487 msgid "The file is some segment or extra content, not the complete recording." msgstr "" "Le fichier est une partie ou du contenu supplémentaire, pas l'enregistrement " "principal." -#: emissions/models.py:487 +#: models.py:489 msgid "In seconds" msgstr "En secondes" -#: emissions/models.py:490 +#: models.py:492 msgid "License" msgstr "Licence" -#: emissions/models.py:535 +#: models.py:537 msgid "News Category" msgstr "Catégorie d'actu" -#: emissions/models.py:536 +#: models.py:538 msgid "News Categories" msgstr "Catégories d'actu" -#: emissions/models.py:558 emissions/models.py:616 +#: models.py:560 models.py:618 msgid "News Item" msgstr "Actu" -#: emissions/models.py:559 +#: models.py:561 msgid "News Items" msgstr "Actus" -#: emissions/models.py:565 +#: models.py:567 msgid "Publication Date" msgstr "Date de publication" -#: emissions/models.py:566 +#: models.py:568 msgid "The news won't appear on the website before this date." msgstr "L'actu n'apparaitra pas sur le site avant cette date." -#: emissions/models.py:574 +#: models.py:576 msgid "Expiration Date" msgstr "Date d'expiration" -#: emissions/models.py:575 +#: models.py:577 msgid "Event Date" msgstr "Date de l'événement" -#: emissions/models.py:576 +#: models.py:578 msgid "If this is an event, set the date here so it appears in the agenda." msgstr "" "Si c'est un événement, en mettre la date ici le fera apparaître dans " "l'agenda." -#: emissions/models.py:596 +#: models.py:598 msgid "Nonstop zone" msgstr "Zone nonstop" -#: emissions/models.py:597 +#: models.py:599 msgid "Nonstop zones" msgstr "Zones nonstop" -#: emissions/models.py:603 +#: models.py:605 msgid "Start" msgstr "Début" -#: emissions/models.py:604 +#: models.py:606 msgid "End" msgstr "fin" -#: emissions/models.py:606 +#: models.py:608 msgid "Redirect Path" msgstr "Chemin de redirection" -#: emissions/models.py:614 +#: models.py:616 msgid "Alternate Title" msgstr "Titre alternatif" -#: emissions/models.py:624 +#: models.py:626 msgid "Page" msgstr "Page" -#: emissions/models.py:695 +#: models.py:697 msgid "News" msgstr "Actu" -#: emissions/models.py:732 +#: models.py:734 msgid "Notes" msgstr "Notes" -#: emissions/models.py:733 +#: models.py:735 msgid "Sound" msgstr "Son" -#: emissions/models.py:737 +#: models.py:739 msgid "Playlist Element" msgstr "Élément de playlist" -#: emissions/models.py:738 +#: models.py:740 msgid "Playlist Elements" msgstr "Éléments de playlist" -#: emissions/templates/emissions/newsitem_detail.html:29 +#: templates/emissions/newsitem_detail.html:30 msgid "Event Date:" msgstr "Date de l'événement :" -#: emissions/views.py:53 +#: views.py:53 msgid "Your changes will appear online in a few minutes." msgstr "Vos modifications seront effectives sur le site dans quelques minutes." -#: emissions/views.py:362 +#: views.py:362 msgid "Record" msgstr "Enregistrement" -#: emissions/views.py:608 +#: views.py:608 msgid "Error adding file" msgstr "Erreur à l'ajout du fichier" -#: emissions/views.py:617 +#: views.py:617 msgid "File uploaded successfully." msgstr "Fichier chargé." -#: emissions/views.py:688 +#: views.py:688 msgid "Started recording" msgstr "Enregistrement démarré" -#: emissions/views.py:699 +#: views.py:699 msgid "Stopped recording" msgstr "Enregistrement arrêté" diff --git a/emissions/templates/emissions/category_list.html b/emissions/templates/emissions/category_list.html index d7d6d3f..f5be662 100644 --- a/emissions/templates/emissions/category_list.html +++ b/emissions/templates/emissions/category_list.html @@ -2,8 +2,12 @@ {% block appbar %}

Émissions

-Par ordre alphabétique - Par jour - Par genre -- Toutes les actus + +Par ordre alphabétique +Par jour +Par genre +Toutes les actus + {% endblock %} {% block content %} diff --git a/emissions/templates/emissions/days.html b/emissions/templates/emissions/days.html index db33735..b228e44 100644 --- a/emissions/templates/emissions/days.html +++ b/emissions/templates/emissions/days.html @@ -2,8 +2,12 @@ {% block appbar %}

Émissions

-Par ordre alphabétique - Par jour - Par genre -- Toutes les actus + +Par ordre alphabétique +Par jour +Par genre +Toutes les actus + {% endblock %} {% block content %} diff --git a/emissions/templates/emissions/emission_form.html b/emissions/templates/emissions/emission_form.html index 3f23fa8..c9a8159 100644 --- a/emissions/templates/emissions/emission_form.html +++ b/emissions/templates/emissions/emission_form.html @@ -7,7 +7,7 @@ {% block appbar %}

{{ emission.title }}

-Retourner à l'émission +Retourner à l'émission {% endblock %} diff --git a/emissions/templates/emissions/emission_list.html b/emissions/templates/emissions/emission_list.html index aa3eecd..ee3d2a0 100644 --- a/emissions/templates/emissions/emission_list.html +++ b/emissions/templates/emissions/emission_list.html @@ -2,8 +2,11 @@ {% block appbar %}

Émissions

-Par ordre alphabétique - Par jour - Par genre -- Toutes les actus + +Par ordre alphabétique +Par jour +Par genre +Toutes les actus {% endblock %} diff --git a/emissions/templates/emissions/episode_confirm_delete.html b/emissions/templates/emissions/episode_confirm_delete.html index a0679c5..9385725 100644 --- a/emissions/templates/emissions/episode_confirm_delete.html +++ b/emissions/templates/emissions/episode_confirm_delete.html @@ -2,7 +2,9 @@ {% block appbar %}

{{ object.emission.title }} - {{ object.title }}

-Retourner à l'accueil + +Retourner à l'accueil + {% endblock %} {% block content %} diff --git a/emissions/templates/emissions/episode_detail.html b/emissions/templates/emissions/episode_detail.html index 2cc0d00..9820b80 100644 --- a/emissions/templates/emissions/episode_detail.html +++ b/emissions/templates/emissions/episode_detail.html @@ -3,7 +3,7 @@ {% block appbar %}

{{ episode.emission.title }} — {{ episode.title }}

-Retourner à l'émission +Retourner à l'émission {% endblock %} {% block content %} diff --git a/emissions/templates/emissions/episode_form.html b/emissions/templates/emissions/episode_form.html index 916c794..81235ed 100644 --- a/emissions/templates/emissions/episode_form.html +++ b/emissions/templates/emissions/episode_form.html @@ -8,10 +8,10 @@ {% block appbar %} {% if episode.id %}

{{ episode.emission.title }} — {{ episode.title }}

-Retourner à l'épisode +Retourner à l'épisode {% else %}

{{ emission.title }} — Nouvel épisode

-Retourner à l'émission +Retourner à l'émission {% endif %} {% endblock %} diff --git a/emissions/templates/emissions/episode_regie.html b/emissions/templates/emissions/episode_regie.html index e75e445..888d756 100644 --- a/emissions/templates/emissions/episode_regie.html +++ b/emissions/templates/emissions/episode_regie.html @@ -2,7 +2,7 @@ {% load soundfiles panikdbtags %} {% block appbar %}

{{ episode.emission.title }} — {{ episode.title }}

-Retourner à l'épisode +Retourner à l'épisode {% endblock %} {% block content %} diff --git a/emissions/templates/emissions/newsitem_confirm_delete.html b/emissions/templates/emissions/newsitem_confirm_delete.html index 3baa4cb..b5d9add 100644 --- a/emissions/templates/emissions/newsitem_confirm_delete.html +++ b/emissions/templates/emissions/newsitem_confirm_delete.html @@ -2,7 +2,7 @@ {% block appbar %}

{{ object.datetime|date:"d E o"|lower }} - {{ object.title }}

-Retourner à l'accueil +Retourner à l'accueil {% endblock %} {% block content %} diff --git a/emissions/templates/emissions/newsitem_detail.html b/emissions/templates/emissions/newsitem_detail.html index edfcdf0..6b631a6 100644 --- a/emissions/templates/emissions/newsitem_detail.html +++ b/emissions/templates/emissions/newsitem_detail.html @@ -3,7 +3,7 @@ {% block appbar %}

{{ object.date|date:"d E o"|lower }} - {{ object.title }}

- + {% if object.emission %} Retourner à la page de l'émission - diff --git a/emissions/templates/emissions/newsitem_form.html b/emissions/templates/emissions/newsitem_form.html index 453406c..6cdeddc 100644 --- a/emissions/templates/emissions/newsitem_form.html +++ b/emissions/templates/emissions/newsitem_form.html @@ -2,11 +2,10 @@ {% block appbar %}

Actu

-Retourner à l'accueil +Retourner à l'accueil {% endblock %} - {% block extrascripts %} diff --git a/emissions/templates/emissions/soundfile_confirm_delete.html b/emissions/templates/emissions/soundfile_confirm_delete.html index 2d88331..20cf841 100644 --- a/emissions/templates/emissions/soundfile_confirm_delete.html +++ b/emissions/templates/emissions/soundfile_confirm_delete.html @@ -2,7 +2,7 @@ {% block appbar %}

{{ object.episode.emission.title }} — {{ object.episode.title }}

-Retourner à l'épisode +Retourner à l'épisode {% endblock %} {% block content %} -- GitLab