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

[rails.git] / app / views / user_blocks / revoke.html.erb

diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb
index 321b145a3907ca39c66911b06f555f42f9a470c8..c7eee67038a4292b21705e801bbdd7a6d32c0f52 100644 (file)
--- a/app/views/user_blocks/revoke.html.erb
+++ b/app/views/user_blocks/revoke.html.erb
@@ -1,25 +1,35 @@
-<h1><%= t('user_block.revoke.heading', 
-       :block_on => @user_block.user.display_name, 
-        :block_by => @user_block.creator.display_name) %></h1>
+<% @title = t('.title',
+              :block_on => h(@user_block.user.display_name),
+              :block_by => h(@user_block.creator.display_name)) %>
+
+<% content_for :heading do %>
+  <h1><%= raw t('.heading',
+                :block_on => link_to(
+                                     h(@user_block.user.display_name),
+                                     user_path(@user_block.user)),
+                :block_by => link_to(
+                                     h(@user_block.creator.display_name),
+                                     user_path(@user_block.creator))) %></h1>
+<% end %>
 
 <% if @user_block.ends_at > Time.now %>
 <p><b>
-  <%= t('user_block.revoke.time_future', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
+  <%= t('.time_future', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
 </b></p>
 
-<% form_for :revoke, :url => { :action => "revoke" } do |f| %>
+<%= form_for :revoke, :url => { :action => "revoke" } do |f| %>
   <%= f.error_messages %>
-<p>  
+<p>
   <%= check_box_tag 'confirm', 'yes' %>
-  <%= label_tag 'confirm', t('user_block.revoke.confirm') %>
+  <%= label_tag 'confirm', t('.confirm') %>
 </p>
 <p>
-  <%= submit_tag t('user_block.revoke.revoke') %>
+  <%= submit_tag t('.revoke') %>
 </p>
 <% end %>
 
 <% else %>
 <p>
-  <%= t('user_block.revoke.past', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
+  <%= t('.past', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
 </p>
 <% end %>