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

[rails.git] / app / views / user / logout.html.erb

diff --git a/app/views/user/logout.html.erb b/app/views/user/logout.html.erb
index bb67d15819fd7bb45a98097d8c219ae85e0f6edb..f0faae9c4b5be2df21f76241eef05fc34bfe9912 100644 (file)
--- a/app/views/user/logout.html.erb
+++ b/app/views/user/logout.html.erb
@@ -1,9 +1,9 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t 'user.logout.heading' %></h1>
+  <h1><%= t '.heading' %></h1>

 <% end %>
 
 <%= form_tag :action => "logout" do %>
   <%= hidden_field_tag("referer", h(params[:referer])) %>
 <% end %>
 
 <%= form_tag :action => "logout" do %>
   <%= hidden_field_tag("referer", h(params[:referer])) %>

-  <%= hidden_field_tag("session", request.session_options[:id]) %>
-  <%= submit_tag t('user.logout.logout_button') %>
+  <%= hidden_field_tag("session", session.id) %>
+  <%= submit_tag t('.logout_button') %>

 <% end %>
 <% end %>