From d65d99f9edc55770f925369f0baa55ac4664779e Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Sun, 18 Feb 2024 12:52:37 +0100
Subject: [PATCH] =?UTF-8?q?On=20corrige=20un=20affichage=20d=C3=A9fectueux?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../single-event/event-in-flat-list-inc.html           | 10 +++++++---
 .../single-event/event-in-list-by-day-inc.html         |  5 ++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html
index 1dbe12b..f389626 100644
--- a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html
@@ -17,9 +17,13 @@
         <p class="subentry-search">
         {% picto_from_name "repeat" %}
         <!-- TODO: see https://forge.chapril.org/jmtrivial/agenda_culturel/issues/65 -->
-        depuis le {{ event.recurrences.dtstart.date }}{% for r in event.recurrences.rrules %},
-        {{ r.to_text }}
-        {% endfor %}
+        {% for r in event.recurrences.rrules %}
+        {{ r.to_text }}{% if not forloop.first %}, {% endif %}{% endfor %}, depuis le 
+        {% if event.recurrences.dtstart.date %}
+        {{ event.recurrences.dtstart.date }}
+        {% else %}
+        {{ event.start_day }}
+        {% endif %}
         </p>
     {% endif %}
     <p class="subentry-search">
diff --git a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-by-day-inc.html b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-by-day-inc.html
index 67c68bf..f869294 100644
--- a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-by-day-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-by-day-inc.html
@@ -72,9 +72,8 @@
             <p class="footer">
             {% picto_from_name "repeat" %}
             <!-- TODO: see https://forge.chapril.org/jmtrivial/agenda_culturel/issues/65 -->
-            depuis le {{ event.recurrences.dtstart.date }}{% for r in event.recurrences.rrules %},
-            {{ r.to_text }}
-            {% endfor %}
+            {% for r in event.recurrences.rrules %}
+            {{ r.to_text }}{% if not forloop.first %}, {% endif %}{% endfor %}, depuis le {{ event.recurrences.dtstart.date }}
             </p>
             {% endif %}
             </div>