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

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

diff --git a/app/views/user_blocks/new.html.erb b/app/views/user_blocks/new.html.erb
index bd941babcc10f98cf9bba79217653ba97d519b2c..c2832e348a5792a2f53c5f8beb97142ab0f8151a 100644 (file)
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -1,29 +1,28 @@
-<% @title = t '.title', :name => h(@user.display_name) %>
+<% @title = t ".title", :name => @user.display_name %>

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= raw t('.heading',
-                :name => link_to(
-                                 h(@user.display_name),
-                                 user_path(@user))) %></h1>
+  <h1><%= t(".heading_html",
+            :name => link_to(@user.display_name,
+                             user_path(@user))) %></h1>

 <% end %>
 <%= form_for(@user_block) do |f| %>
   <%= f.error_messages %>
 
   <p>
 <% end %>
 <%= form_for(@user_block) do |f| %>
   <%= f.error_messages %>
 
   <p>

-    <%= f.label :reason, t('.reason', :name => @user.display_name) %><br />
+    <%= f.label :reason, t(".reason", :name => @user.display_name) %><br />

     <%= richtext_area :user_block, :reason, :cols => 80, :rows => 20 %>
   </p>
   <p>
     <%= richtext_area :user_block, :reason, :cols => 80, :rows => 20 %>
   </p>
   <p>

-    <%= label_tag 'user_block_period', t('.period') %><br />
-    <%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_blocks.period', :count => h), h.to_s] }, params[:user_block_period] )) %>
+    <%= label_tag "user_block_period", t(".period") %><br />
+    <%= select_tag("user_block_period", options_for_select(UserBlock::PERIODS.collect { |h| [block_duration_in_words(h.hours), h.to_s] }, params[:user_block_period])) %>

   </p>
   <p>
     <%= f.check_box :needs_view %>
   </p>
   <p>
     <%= f.check_box :needs_view %>

-    <%= f.label :needs_view, t('.needs_view') %>
+    <%= f.label :needs_view, t(".needs_view") %>

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

-    <%= hidden_field_tag 'display_name', @user.display_name %>
-    <%= f.submit t('.submit') %>
+    <%= hidden_field_tag "display_name", @user.display_name %>
+    <%= f.submit %>

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

-<%= link_to t('.back'), user_blocks_path %>
+<%= link_to t(".back"), user_blocks_path %>