From: Ævar Arnfjörð Bjarmason Date: Thu, 1 Oct 2009 19:59:02 +0000 (+0000) Subject: title/links for revoke page X-Git-Tag: live~6572^2~16 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e0ece007381036874d05423119f8a6cc8e934523?ds=sidebyside title/links for revoke page --- diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb index 321b145a3..9f142c802 100644 --- a/app/views/user_blocks/revoke.html.erb +++ b/app/views/user_blocks/revoke.html.erb @@ -1,6 +1,13 @@ -

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

+<% @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})) %>

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

diff --git a/config/locales/en.yml b/config/locales/en.yml index 10e372bf2..c9ea19d58 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1065,6 +1065,7 @@ en: title: "User blocks" heading: "List of user blocks" revoke: + title: "Revoking block on {{block_on}}" heading: "Revoking block on {{block_on}} by {{block_by}}" time_future: "This block will end in {{time}}." past: "This block ended {{time}} ago and cannot be revoked now."