X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ca06b3c7b1a742307e1f6d6b8f809bab2dd0d484..6c22bf4b9afb26af56430ec9f9e191502fb0ee60:/app/views/user_blocks/revoke.html.erb?ds=inline diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb index 321b145a3..9bd7df5ae 100644 --- a/app/views/user_blocks/revoke.html.erb +++ b/app/views/user_blocks/revoke.html.erb @@ -1,25 +1,33 @@ -

<%= t('user_block.revoke.heading', - :block_on => @user_block.user.display_name, - :block_by => @user_block.creator.display_name) %>

+<% @title = t(".title", + :block_on => h(@user_block.user.display_name), + :block_by => h(@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') %> +

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