Merge remote-tracking branch 'upstream/pull/1704'

[rails.git] / app / views / changeset / timeout.atom.builder

diff --git a/app/views/changeset/timeout.atom.builder b/app/views/changeset/timeout.atom.builder
index a4faeb34b1ed93f0ee164acfcd0bb14ece71f182..c878905e6ed17d63ac9c33713f53232949cc38a5 100644 (file)
--- a/app/views/changeset/timeout.atom.builder
+++ b/app/views/changeset/timeout.atom.builder
@@ -1,12 +1,12 @@
 atom_feed(:language => I18n.locale, :schema_date => 2009,
 atom_feed(:language => I18n.locale, :schema_date => 2009,

-          :id => url_for(params.merge({ :only_path => false })),
-          :root_url => url_for(params.merge({ :only_path => false, :format => nil })),
+          :id => url_for(params.merge(:only_path => false)),
+          :root_url => url_for(params.merge(:only_path => false, :format => nil)),

           "xmlns:georss" => "http://www.georss.org/georss") do |feed|
   feed.title @title
 
           "xmlns:georss" => "http://www.georss.org/georss") do |feed|
   feed.title @title
 

-  feed.subtitle :type => 'xhtml' do |xhtml|
+  feed.subtitle :type => "xhtml" do |xhtml|

     xhtml.p do |p|
     xhtml.p do |p|

-      p << t('changeset.timeout.sorry')
+      p << t("changeset.timeout.sorry")

     end
   end
 end
     end
   end
 end