From a3c9c4e0bb144e898f3c890638844343f8f92ed4 Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Fri, 8 Aug 2014 00:33:39 +0200
Subject: [PATCH] Rapide correction sur les flux rss et ical

---
 app/controllers/events_controller.rb | 11 +++++++++--
 config/locales/fr.yml                |  5 +++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 59e6bdee..6f7ba92c 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -8,9 +8,16 @@ class EventsController < ApplicationController
 
   def index
     respond_to do |format|
-      format.html
+      format.html do
+        if params[:year]
+          # Whole year calendar
+          @events = @events.year params[:year].to_i
+        else
+          @events = @events.month params[:start_date].try(:to_date) || Date.today
+        end
+      end
       format.rss do
-        @events = @events.future_30.includes :related_city
+        @events = @events.future.includes :related_city
         @events = @events.limit params[:daylimit] if params[:daylimit]
       end
       format.ics { @events = @events.last_year.order :id }
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 8ca0fc77..8d5aea18 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -126,6 +126,11 @@ fr:
       actions: Actions
       edit: Éditer événement
       cancel: Annuler événement
+      html:
+        at: À
+        dateAndPlace: Date et lieu
+        description: Description
+        infos: Informations
     new:
       title: Soumettre un événement
     create: