From: Ævar Arnfjörð Bjarmason Date: Thu, 1 Oct 2009 20:18:24 +0000 (+0000) Subject: * for /blocks/new/* X-Git-Tag: live~6564^2~12 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7dbf68aa52f061b6575d42e2a0bec577da6ec827 * <title> for /blocks/new/* * use h() to escape usernames --- diff --git a/app/views/user_blocks/new.html.erb b/app/views/user_blocks/new.html.erb index 470d60e8f..cea6e14ac 100644 --- a/app/views/user_blocks/new.html.erb +++ b/app/views/user_blocks/new.html.erb @@ -1,4 +1,8 @@ -<h1><%= t('user_block.new.title', :name => h(@this_user.display_name)) %></h1> +<% @title = t 'user_block.new.title', :name => h(@this_user.display_name) %> +<h1><%= t('user_block.new.heading', + :name => link_to( + h(@this_user.display_name), + {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %></h1> <% form_for(@user_block) do |f| %> <%= f.error_messages %> diff --git a/config/locales/en.yml b/config/locales/en.yml index c9ea19d58..874f44f1a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1034,12 +1034,13 @@ en: sorry: "Sorry, the user block with ID {{id}} could not be found." back: "Back to index" new: + title: "Creating block on {{name}}" + heading: "Creating block on {{name}}" reason: "The reason why {{name}} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms." period: "How long, starting now, the user will be blocked from the API for." submit: "Create block" tried_contacting: "I have contacted the user and asked them to stop." tried_waiting: "I have given a reasonable amount of time for the user to respond to those communications." - title: "Creating block on {{name}}" needs_view: "Does the user need to log in before this block will be cleared?" edit: title: "Editing block on {{name}}"