From d5b40b26393e618bb3222549077aa45c9ebe785f Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 12 Apr 2016 12:00:04 +0200
Subject: [PATCH] fix event by date

---
 app/locale/fr/LC_MESSAGES/django.mo  | Bin 2765 -> 3113 bytes
 app/locale/fr/LC_MESSAGES/django.po  |  10 +++++-----
 app/templates/agenda/event_list.html |  15 +++++++++------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/locale/fr/LC_MESSAGES/django.mo b/app/locale/fr/LC_MESSAGES/django.mo
index c9a1f275287087ba34f003f6ebbcc6dcb5edd1a7..18082f619cc63e3e3fa8f6b1c7fbd1e0b81f9a70 100644
GIT binary patch
delta 1481
zcmZwHO-PhM9LMp|Hs5v2*3z_mtjshmd)-qIK|~Z0L0<OKs!#gJx{vIxRunvkt`R{b
zM0Dx4kYtF_Aqv?JLD?mtLlOm1)FGln5`^^qZL>w$;LK;<pa0DBth065`rvhK=$au#
z$xY<BB4ZBYrDYVP$&fLs-o<L1#xl%dDL%8#S?95w{&(o$XIze9iW00tt#87W#ssF7
z%0@b($XpXcZE(sugcY<iSc8G}GKOj2L<KT|S~raf^pSPe`pWtd703eC@O-mKg-A>_
zy(_R8HKChgEk;ofI$`^JQS&`)#`CxeZ{T{ogSGe^b<($}06(Du{E9lz5B2kWQ_84L
z9=1kMCul%oGi|5<x@`YG)J8|__(^LF+0(>vh}SrX3g88W0-Q&+zgWLxz#LP|ZrZSd
zq7oyx86DJyhp-BdA%7-Du^L_6g%?o!Oriq5Z+(cmiN~k|yhN@0fC^}_ocpJ4YPk=c
zxC!g91GQj3M({XlBNzEIXKni;YW_HC-fh%=GuVMoQRClG0akH3&5K|?wpVihisS$t
z>#zqKF@w6QE7t4C9_E&9PuTW7)D6v`Uf~l|ptGo(c!T<;-lIO=1=K-HxK6E$1XMJ!
z5fxzz^6K(QuRtG|`t@Ncz+$oj=^$?>D@gr3_0!cpg_M7YZRkeyAv<IpZVg$d=TRo;
zrf4DSJ#HfF+8fA))Ja8GNZ@8CS+}JV7E&t}y;CKfR7t;%wtVf^b?bl2R`Le2Zb7M?
z%#H2MHwwjWThaf6E^=XX2lXv>Y#Z*GIv9FT6!duR8812DxMOZIlXiN~nSXjt`za?g
z=sF3%FP`!I<dX4}Km5CI#80zHVF?S|0YCL;OFOI;@l?j^OSn^IC7q$*sGD|j*|A(U
z=?>?^7>TFMlFt57C*irH{~O5n*)7vfKhee=o}SC{c+dTNR6*pjnl&=&r4`84XvO$X
D9Amgw

delta 1120
zcmZA0Pe@cj9KiA4+NQah+LnJaGpn`CvexYo7zEK@*h8nF2s$J|Nfgz|U=cE+OF<Mx
z-6EpMlTjXuPC<vlj-3RdQyx7e(V_2m86kSS-+bQ8do%N!dGEdK_}W^T%V!@1N0I0z
zUS}c>;>ZdLj-%NKFOT7BEaNIXjdge~IhMSJ^|ar>Uc7}X@dei66x#m{u8F9`2QD_#
zFpHeANZ|lW$r^g+s5fF0wkHeNOnon!$RV^}8BO$Lax{50Ie{i}7n_(r9&$k@@f=(5
zU3%a%c2S>2C;FM%f1@kNFp3lB(24VCqTQ*zA6?K;vV<nK4;dnkU^DYaIo&ve4s<a+
za6LJWoH0Rhf!A{zO<<AP*Ww?v-a?_B6eiY(jyHe}Si%AxK*u|el}0Wuap8mG*oKoh
zj8D;lzM&a^PtIYU`VVwxexd#97{r8n(D8~Cu6P7n@i_YYSzL#g>)C$?nxw(4dxX}X
zp&j0)2frX^%u@{D0(!rVP9`{r<PfFge&me9seU5WPoXOxMPJQWj{SGSD>S&mo9H)i
z2mRQdpeuNVcAP<<`-o2b33(&cG28+Fly;&>_&2%AUZR7rzezi;iy0*R{=!$Vn=m8B
ztF92LTcyiK-}1$Onn(}f$GVN^Cp>l%1)`Ji58FbR{074BVHZ&*Vxt9ze?bi~MED-v
l3Ac3*;V!HvwiEvzo2YChcGx&Qm3^O?p06Fw-oMxI_%Ax;Nnrp0

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 %}
-- 
2.39.5