From 5e6d4778a875c16af1f923738344314cc9b46663 Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Tue, 27 Mar 2018 23:30:21 +0200
Subject: [PATCH] Attempt to remove all timezone info from ics and rss feeds

---
 app/views/events/index.ics.erb     | 5 ++---
 app/views/events/index.rss.builder | 2 +-
 app/views/events/index.xml.builder | 4 ++--
 app/views/events/show.ics.erb      | 5 ++---
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/views/events/index.ics.erb b/app/views/events/index.ics.erb
index 0b6208a8..4fe2b215 100644
--- a/app/views/events/index.ics.erb
+++ b/app/views/events/index.ics.erb
@@ -3,11 +3,10 @@ VERSION:2.0
 PRODID:-//AgendaDuLibre.org
 X-WR-CALNAME:<%= t('title', scope: [:layouts, :application]).gsub(/'/, '’') %>
 X-WR-CALDESC:<%= t 'subtitle', scope: [:layouts, :application] %>
-X-WR-TIMEZONE:<%= Time.now.zone %>
 <% @events.find_each do |event| %>
 BEGIN:VEVENT
-DTSTART;TZID=<%= Time.now.zone %>:<%= event.start_time.strftime '%Y%m%dT%H%M%S' %>
-DTEND;TZID=<%= Time.now.zone %>:<%= event.end_time.strftime '%Y%m%dT%H%M%S' %>
+DTSTART;<%= event.start_time.strftime '%Y%m%dT%H%M%S' %>
+DTEND;<%= event.end_time.strftime '%Y%m%dT%H%M%S' %>
 UID:<%= event.id %>@agendadulibre.org
 SUMMARY:<%= event.title.gsub(',', '\,').gsub(';', '\;') %>
 URL:<%= event_url event %>
diff --git a/app/views/events/index.rss.builder b/app/views/events/index.rss.builder
index 5d6d3bd0..2a52496b 100644
--- a/app/views/events/index.rss.builder
+++ b/app/views/events/index.rss.builder
@@ -1,7 +1,7 @@
 def meta(xml, event)
   domain = root_url.gsub(/www/, '').gsub(/http.?:../, '').gsub(/:.*/, '')
   xml.dc :identifier, "#{event.id}@#{domain}"
-  xml.dc :date, event.start_time.iso8601
+  xml.dc :date, l(event.start_time, format: :xml)
 
   return unless event.latitude || event.longitude
   xml.georss :point, event.latitude, ' ', event.longitude
diff --git a/app/views/events/index.xml.builder b/app/views/events/index.xml.builder
index 833b625b..878452b4 100644
--- a/app/views/events/index.xml.builder
+++ b/app/views/events/index.xml.builder
@@ -4,8 +4,8 @@ xml.events do
   @events.find_each do |event|
     xml.event do
       xml.title event.title
-      xml.tag! 'start-time', l(event.start_time, format: 'xml')
-      xml.tag! 'end-time', l(event.end_time, format: 'xml')
+      xml.tag! 'start-time', l(event.start_time, format: :xml)
+      xml.tag! 'end-time', l(event.end_time, format: :xml)
       xml.place_name event.place_name
       xml.address event.address
       xml.city event.city
diff --git a/app/views/events/show.ics.erb b/app/views/events/show.ics.erb
index f1af84f3..4286b2af 100644
--- a/app/views/events/show.ics.erb
+++ b/app/views/events/show.ics.erb
@@ -3,11 +3,10 @@ VERSION:2.0
 PRODID:-//AgendaDuLibre.org
 X-WR-CALNAME:<%= t('title', scope: [:layouts, :application]).gsub(/'/, '’') %>
 X-WR-CALDESC:<%= t 'subtitle', scope: [:layouts, :application] %>
-X-WR-TIMEZONE:<%= Time.now.zone %>
 <% event = @event %>
 BEGIN:VEVENT
-DTSTART;TZID=<%= Time.now.zone %>:<%= event.start_time.strftime '%Y%m%dT%H%M%S' %>
-DTEND;TZID=<%= Time.now.zone %>:<%= event.end_time.strftime '%Y%m%dT%H%M%S' %>
+DTSTART;<%= event.start_time.strftime '%Y%m%dT%H%M%S' %>
+DTEND;<%= event.end_time.strftime '%Y%m%dT%H%M%S' %>
 UID:<%= event.id %>@agendadulibre.org
 SUMMARY:<%= event.title %>
 URL:<%= event_url event %>