merge upstream

aircox/locale/fr/LC_MESSAGES/django.po

@@ -998,7 +998,7 @@ msgstr "Plus d'infos"
 
 #: aircox/templates/aircox/widgets/carousel.html:25
 msgid "Show all"
-msgstr "Afficher tout"
+msgstr "Tout Afficher"
 
 #: aircox/templates/aircox/widgets/comment.html:37
 #: aircox/templates/aircox/widgets/comment.html:38
@@ -1105,8 +1105,6 @@ msgid "articles/"
 msgstr "articles/"
 
 #: aircox/urls.py:49
-#, fuzzy
-#| msgid "articles/<slug:slug>/"
 msgid "articles/c/<slug:category_slug>/"
 msgstr "articles/<slug:slug>/"
 
@@ -1115,16 +1113,16 @@ msgid "articles/<slug:slug>/"
 msgstr "articles/<slug:slug>/"
 
 #: aircox/urls.py:57
-msgid "episodes/"
-msgstr "episodes/"
+msgid "programs/episodes/"
+msgstr "emissions/episodes/"
 
 #: aircox/urls.py:58
-msgid "episodes/c/<slug:category_slug>/"
-msgstr "episodes/c/<slug:category_slug>/"
+msgid "programs/episodes/c/<slug:category_slug>/"
+msgstr "emissions/episodes/c/<slug:category_slug>/"
 
 #: aircox/urls.py:60
-msgid "episodes/<slug:slug>/"
-msgstr "episodes/<slug:slug>/"
+msgid "programs/episodes/<slug:slug>/"
+msgstr "emissions/episodes/<slug:slug>/"
 
 #: aircox/urls.py:64
 msgid "podcasts/"
@@ -1189,9 +1187,7 @@ msgid "programs/<slug:parent_slug>/diffusions/"
 msgstr "emissions/<slug:parent_slug>/diffusions/"
 
 #: aircox/urls.py:119
-#, fuzzy
-#| msgid "programs/<slug:parent_slug>/publications/"
-msgid "program/<slug:parent_slug>/publications"
+msgid "programs/<slug:parent_slug>/publications"
 msgstr "emissions/<slug:parent_slug>/publications/"
 
 #: aircox/views/page.py:69

aircox/urls.py

@@ -53,16 +53,6 @@ urls = [
         views.ArticleDetailView.as_view(),
         name="article-detail",
     ),
-    # ---- episodes
-    path(_("episodes/"), views.EpisodeListView.as_view(), name="episode-list"),
-    path(_("episodes/c/<slug:category_slug>/"), views.EpisodeListView.as_view(), name="episode-list"),
-    path(
-        _("episodes/<slug:slug>/"),
-        views.EpisodeDetailView.as_view(),
-        name="episode-detail",
-    ),
-    path(_("podcasts/"), views.PodcastListView.as_view(), name="podcast-list"),
-    path(_("podcasts/c/<slug:category_slug>/"), views.PodcastListView.as_view(), name="podcast-list"),
     # ---- timetable
     path(_("timetable/"), views.TimeTableView.as_view(), name="timetable-list"),
     path(
@@ -105,18 +95,29 @@ urls = [
         views.ProgramDetailView.as_view(),
         name="program-detail",
     ),
-    path(_("programs/<slug:parent_slug>/articles/"), views.ArticleListView.as_view(), name="article-list"),
-    path(_("programs/<slug:parent_slug>/podcasts/"), views.PodcastListView.as_view(), name="podcast-list"),
-    path(_("programs/<slug:parent_slug>/episodes/"), views.EpisodeListView.as_view(), name="episode-list"),
-    path(_("programs/<slug:parent_slug>/diffusions/"), views.DiffusionListView.as_view(), name="diffusion-list"),
+    path(_("programs/<slug:parent_slug>/articles"), views.ArticleListView.as_view(), name="article-list"),
+    path(_("programs/<slug:parent_slug>/podcasts"), views.PodcastListView.as_view(), name="podcast-list"),
+    path(_("programs/<slug:parent_slug>/episodes"), views.EpisodeListView.as_view(), name="episode-list"),
+    path(_("programs/<slug:parent_slug>/diffusions"), views.DiffusionListView.as_view(), name="diffusion-list"),
+    path(
+        _("programs/<slug:parent_slug>/publications"),
+        views.PageListView.as_view(model=models.Page, attach_to_value=models.StaticPage.Target.PAGES),
+        name="page-list",
+    ),
+    # ---- episodes
+    path(_("programs/episodes/"), views.EpisodeListView.as_view(), name="episode-list"),
+    path(_("programs/episodes/c/<slug:category_slug>"), views.EpisodeListView.as_view(), name="episode-list"),
+    path(
+        _("programs/episodes/<slug:slug>/"),
+        views.EpisodeDetailView.as_view(),
+        name="episode-detail",
+    ),
+    path(_("podcasts/"), views.PodcastListView.as_view(), name="podcast-list"),
+    path(_("podcasts/c/<slug:category_slug>/"), views.PodcastListView.as_view(), name="podcast-list"),
+    # ---- others
     path(
         "errors/no-station",
         views.errors.NoStationErrorView.as_view(),
         name="errors-no-station",
     ),
-    path(
-        _("program/<slug:parent_slug>/publications"),
-        views.PageListView.as_view(model=models.Page, attach_to_value=models.StaticPage.Target.PAGES),
-        name="page-list",
-    ),
 ]

assets/src/assets/public.scss

@@ -235,6 +235,7 @@
 .breadcrumbs {
     text-align: right;
     padding: v.$mp-3 0rem;
+    font-size: v.$text-size-smaller;
     padding-bottom: 0;
     margin-bottom: 0;
 

assets/src/public.js

@@ -0,0 +1,7 @@
+import "./assets/public.scss"
+import './index.js'
+import App from './app.js'
+
+export default App
+
+window.App = App