From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 12 Apr 2016 10:00:04 +0000 (+0200)
Subject: fix event by date
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d5b40b26393e618bb3222549077aa45c9ebe785f;p=mezzo.git

fix event by date
---

diff --git a/app/locale/fr/LC_MESSAGES/django.mo b/app/locale/fr/LC_MESSAGES/django.mo
index c9a1f275..18082f61 100644
Binary files a/app/locale/fr/LC_MESSAGES/django.mo and b/app/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/app/locale/fr/LC_MESSAGES/django.po b/app/locale/fr/LC_MESSAGES/django.po
index eb0458c7..eda8df86 100644
--- a/app/locale/fr/LC_MESSAGES/django.po
+++ b/app/locale/fr/LC_MESSAGES/django.po
@@ -339,15 +339,15 @@ msgstr ""
 
 #: templates/agenda/event_list.html:51
 msgid "Viewing events for the location"
-msgstr ""
+msgstr "Les événements du lieu"
 
 #: templates/agenda/event_list.html:53
 msgid "Viewing events from"
-msgstr ""
+msgstr "Les événements du"
 
 #: templates/agenda/event_list.html:56
 msgid "Viewing events by"
-msgstr ""
+msgstr "Les événements par"
 
 #: templates/agenda/event_location_list.html:4
 #: templates/agenda/event_location_list.html:22
@@ -421,11 +421,11 @@ msgstr ""
 
 #: templates/blog/blog_post_list.html:52
 msgid "Viewing posts for the category"
-msgstr ""
+msgstr "Les articles de la catégorie"
 
 #: templates/blog/blog_post_list.html:54
 msgid "Viewing posts from"
-msgstr ""
+msgstr "Les articles postés depuis"
 
 #: templates/blog/blog_post_list.html:57
 msgid "Viewing posts by"
diff --git a/app/templates/agenda/event_list.html b/app/templates/agenda/event_list.html
index e92ecb72..596a8e7c 100644
--- a/app/templates/agenda/event_list.html
+++ b/app/templates/agenda/event_list.html
@@ -47,15 +47,18 @@
     <p>
     {% if tag %}
         {% trans "Viewing events tagged" %} {{ tag }}
-    {% else %}{% if location %}
+    {% elif location %}
         {% trans "Viewing events for the location" %} {{ location }}
-    {% else %}{% if year or month %}
-        {% trans "Viewing events from" %} {% if month %}{{ month }}, {% endif %}
-        {{ year }}
-    {% else %}{% if author %}
+    {% elif year or month %}
+      {% if not day %}
+         {% trans "Viewing events from" %} {% if month %}{{ month }}, {% endif %}{{ year }}
+      {% else %}
+         {% trans "Viewing events from" %} {{ day_date }}
+      {% endif %}
+    {% elif author %}
         {% trans "Viewing events by" %}
         {{ author.get_full_name|default:author.username }}
-    {% endif %}{% endif %}{% endif %}{% endif %}
+    {% endif %}
     {% endblock %}
     </p>
 {% else %}