Rapide correction sur les flux rss et ical
This commit is contained in:
parent
b35255d363
commit
a3c9c4e0bb
|
@ -8,9 +8,16 @@ class EventsController < ApplicationController
|
||||||
|
|
||||||
def index
|
def index
|
||||||
respond_to do |format|
|
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
|
format.rss do
|
||||||
@events = @events.future_30.includes :related_city
|
@events = @events.future.includes :related_city
|
||||||
@events = @events.limit params[:daylimit] if params[:daylimit]
|
@events = @events.limit params[:daylimit] if params[:daylimit]
|
||||||
end
|
end
|
||||||
format.ics { @events = @events.last_year.order :id }
|
format.ics { @events = @events.last_year.order :id }
|
||||||
|
|
|
@ -126,6 +126,11 @@ fr:
|
||||||
actions: Actions
|
actions: Actions
|
||||||
edit: Éditer événement
|
edit: Éditer événement
|
||||||
cancel: Annuler événement
|
cancel: Annuler événement
|
||||||
|
html:
|
||||||
|
at: À
|
||||||
|
dateAndPlace: Date et lieu
|
||||||
|
description: Description
|
||||||
|
infos: Informations
|
||||||
new:
|
new:
|
||||||
title: Soumettre un événement
|
title: Soumettre un événement
|
||||||
create:
|
create:
|
||||||
|
|
Loading…
Reference in New Issue