X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/15b104f4ff4614aa78c01180b6a9b89dd5a1400f..9568c7fee85a615830ba78639b2ee8440da60668:/app/views/user_blocks/edit.html.erb diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb index 0eee8a6f6..6d06eeb87 100644 --- a/app/views/user_blocks/edit.html.erb +++ b/app/views/user_blocks/edit.html.erb @@ -1,31 +1,30 @@ -<% @title = t 'user_block.edit.title', :name => h(@user_block.user.display_name) %> +<% @title = t ".title", :name => @user_block.user.display_name %> <% content_for :heading do %> -

<%= raw t('user_block.edit.title', - :name => link_to( - h(@user_block.user.display_name), - {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name})) %>

+

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

<% end %> -<%= form_for(@user_block) do |f| %> +<%= form_for(@user_block, :html => { :class => "standard-form" }) do |f| %> <%= f.error_messages %>

- <%= f.label :reason, t('user_block.edit.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('user_block.edit.period') %>
- <%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_block.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('user_block.edit.needs_view') %> + <%= f.label :needs_view, t(".needs_view") %>

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

<% end %>