X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3244635aa11878135a014cf2c9ec9177f8e9d0ba..7c89e7c0b418c5c4d9692b5e153946571a6ea994:/app/views/user_blocks/edit.html.erb?ds=sidebyside diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb index 387335d9d..88d7e4f23 100644 --- a/app/views/user_blocks/edit.html.erb +++ b/app/views/user_blocks/edit.html.erb @@ -1,28 +1,30 @@ -<% @title = t 'user_block.edit.title', :name => h(@user_block.user.display_name) %> -

<%= 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})) %>

+<% @title = t ".title", :name => h(@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))) %>

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

- <%= f.label :reason, t('user_block.edit.reason', :name => h(@user_block.user.display_name)) %>
- <%= f.text_area :reason, :cols => 80, :rows => 5 %> + <%= f.label :reason, t(".reason", :name => h(@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 %> - -<%= link_to t('user_block.edit.show'), @user_block %> | -<%= link_to t('user_block.edit.back'), user_blocks_path %>