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

[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 0819357d393693ba8ab669ec8df815f294de8cf2..0b6e2178877edae1e14b3de4b1c7e2a2a7b8f800 100644 (file)
--- a/app/views/user_blocks/revoke.html.erb
+++ b/app/views/user_blocks/revoke.html.erb
@@ -1,32 +1,33 @@
-<% @title = t('user_block.revoke.title',
-              :block_on => h(@user_block.user.display_name),
-              :block_by => h(@user_block.creator.display_name)) %>
-<h1><%= t('user_block.revoke.heading',
-          :block_on => link_to(
-                               h(@user_block.user.display_name),
-                               {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name}),
-          :block_by => link_to(
-                               h(@user_block.creator.display_name),
-                               {:controller => 'user', :action => 'view', :display_name => @user_block.creator.display_name})) %></h1>
+<% @title = t(".title",
+              :block_on => @user_block.user.display_name,
+              :block_by => @user_block.creator.display_name) %>
+
+<% content_for :heading do %>
+  <h1><%= t(".heading_html",
+            :block_on => link_to(@user_block.user.display_name,
+                                 user_path(@user_block.user)),
+            :block_by => link_to(@user_block.creator.display_name,
+                                 user_path(@user_block.creator))) %></h1>
+<% end %>

 
 <% if @user_block.ends_at > Time.now %>
 <p><b>
 
 <% 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>
 
 </b></p>
 

-<%= form_for :revoke, :url => { :action => "revoke" } do |f| %>
+<%= form_for :revoke, :url => { :action => "revoke" }, :html => { :class => "standard-form" } do |f| %>

   <%= f.error_messages %>
   <%= f.error_messages %>

-<p>  
-  <%= check_box_tag 'confirm', 'yes' %>
-  <%= label_tag 'confirm', t('user_block.revoke.confirm') %>
+<p>
+  <%= check_box_tag "confirm", "yes" %>
+  <%= label_tag "confirm", t(".confirm") %>

 </p>
 <p>
 </p>
 <p>

-  <%= submit_tag t('user_block.revoke.revoke') %>
+  <%= submit_tag t(".revoke") %>

 </p>
 <% end %>
 
 <% else %>
 <p>
 </p>
 <% end %>
 
 <% else %>
 <p>

-  <%= t('user_block.revoke.past', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
+  <%= t(".past", :time => time_ago_in_words(@user_block.ends_at, :scope => :'datetime.distance_in_words_ago')) %>

 </p>
 <% end %>
 </p>
 <% end %>