From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Thu, 1 Oct 2009 19:18:23 +0000 (+0000)
Subject: Set title on /blocks/:id and link to usernames
X-Git-Tag: live~6604^2~20
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1a2ccfbb8fd0d5432fe09473af59ec0a1d3457c5?ds=sidebyside

Set title on /blocks/:id and link to usernames
---

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index a1123e21e..43b69d13c 100644
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -1,7 +1,13 @@
-<h1><%= t('user_block.show.heading', 
-	:block_on => @user_block.user.display_name, 
-        :block_by => @user_block.creator.display_name) %></h1>
-
+<% @title = t('user_block.show.title',
+              :block_on => @user_block.user.display_name,
+              :block_by => @user_block.creator.display_name) %>
+<h1><%= t('user_block.show.title',
+          :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})) %></h1>
 <% if @user_block.revoker %>
 <p>
   <b><%= t'user_block.show.revoker' %></b>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f44b2d34d..fd6289962 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1096,7 +1096,8 @@ en:
       heading: "List of blocks by {{name}}"
       empty: "{{name}} has not been blocked yet."
     show:
-      heading: "Block on {{block_on}} by {{block_by}}"
+      title: "{{block_on}} blocked by {{block_by}}"
+      heading: "{{block_on}} blocked by {{block_by}}"
       time_future: "Ends in {{time}}"
       time_past: "Ended {{time}} ago"
       status: "Status"