X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b25a468e3c0aeb868f46ea758d4cf33ad7890bcb..f75eb6fe9ef1e0a755c1a1810c5ca15ed58d9d08:/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 0819357d3..ce14bf0d2 100644 --- 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)) %> -

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

+<% @title = t(".title", + :block_on => @user_block.user.display_name, + :block_by => @user_block.creator.display_name) %> + +<% content_for :heading do %> +

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

+<% end %> <% if @user_block.ends_at > Time.now %>

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

<%= form_for :revoke, :url => { :action => "revoke" } do |f| %> <%= f.error_messages %> -

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

+ <%= check_box_tag "confirm", "yes" %> + <%= label_tag "confirm", t(".confirm") %>

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

<% end %> <% else %>

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

<% end %>