X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8bd001f1282b7a33a71c0565504e160dbe567d5d..f75eb6fe9ef1e0a755c1a1810c5ca15ed58d9d08:/app/views/user_blocks/edit.html.erb?ds=inline diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb index a3bb9c682..7b2471eab 100644 --- a/app/views/user_blocks/edit.html.erb +++ b/app/views/user_blocks/edit.html.erb @@ -1,11 +1,11 @@ -<% @title = t '.title', :name => h(@user_block.user.display_name) %> +<% @title = t ".title", :name => @user_block.user.display_name %> <% content_for :heading do %> -

<%= raw t('.title', - :name => link_to(h(@user_block.user.display_name), - user_path(@user_block.user))) %>

+

<%= t(".heading_html", + :name => link_to(@user_block.user.display_name, + user_path(@user_block.user))) %>

<% end %> @@ -13,18 +13,18 @@ <%= f.error_messages %>

- <%= f.label :reason, t('.reason', :name => h(@user_block.user.display_name)) %>
+ <%= f.label :reason, t(".reason", :name => @user_block.user.display_name) %>
<%= richtext_area :user_block, :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>

- <%= label_tag 'user_block_period', t('.period') %>
- <%= 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") %>
+ <%= 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])) %>

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

- <%= f.submit t('.submit') %> + <%= f.submit %>

<% end %>