X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7b384f03ab1d34fd3ebcc5ae3add25b3b5591e2e..05514ced0c121c1e936bec0e301faa4a04cc3a30:/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 9f142c802..c7eee6703 100644 --- a/app/views/user_blocks/revoke.html.erb +++ b/app/views/user_blocks/revoke.html.erb @@ -1,32 +1,35 @@ -<% @title = t('user_block.revoke.title', +<% @title = t('.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})) %>

+ +<% content_for :heading do %> +

<%= raw t('.heading', + :block_on => link_to( + h(@user_block.user.display_name), + user_path(@user_block.user)), + :block_by => link_to( + h(@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| %> +<%= form_for :revoke, :url => { :action => "revoke" } do |f| %> <%= f.error_messages %> -

+

<%= check_box_tag 'confirm', 'yes' %> - <%= label_tag 'confirm', t('user_block.revoke.confirm') %> + <%= 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 => distance_of_time_in_words_to_now(@user_block.ends_at)) %>

<% end %>