From ac0603d055759a1448a05607e12006c69a39e0d3 Mon Sep 17 00:00:00 2001
From: Matt Amos <zerebubuth@gmail.com>
Date: Mon, 2 Apr 2012 12:48:52 +0100
Subject: [PATCH 1/1] Fixed redaction link in browse/history page

---
 app/views/browse/_node_details.html.erb     | 2 +-
 app/views/browse/_relation_details.html.erb | 2 +-
 app/views/browse/_way_details.html.erb      | 2 +-
 config/locales/en.yml                       | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/browse/_node_details.html.erb b/app/views/browse/_node_details.html.erb
index 45b830f04..7bbd750c9 100644
--- a/app/views/browse/_node_details.html.erb
+++ b/app/views/browse/_node_details.html.erb
@@ -1,5 +1,5 @@
 <% if node_details.redacted? %>
-<p><%= raw t 'browse.redacted.message', :type => t('browse.redacted.type.node'), :redaction_link => link_to(node_details.redaction) %></p>
+<p><%= raw t 'browse.redacted.message', :type => t('browse.redacted.type.node'), :redaction_link => link_to(t('browse.redacted.redaction', :id => node_details.redaction.id), node_details.redaction), :version => node_details.version %></p>
 <% else %>
 <table class="browse_details" id="<%= node_details.version %>">
 
diff --git a/app/views/browse/_relation_details.html.erb b/app/views/browse/_relation_details.html.erb
index 25b5f0fca..cfa03678f 100644
--- a/app/views/browse/_relation_details.html.erb
+++ b/app/views/browse/_relation_details.html.erb
@@ -1,5 +1,5 @@
 <% if relation_details.redacted? %>
-<p><%= raw t 'browse.redacted.message', :type => t('browse.redacted.type.relation'), :redaction_link => link_to(relation_details.redaction) %></p>
+<p><%= raw t 'browse.redacted.message', :type => t('browse.redacted.type.relation'), :redaction_link => link_to(t('browse.redacted.redaction', :id => relation_details.redaction.id), relation_details.redaction), :version => relation_details.version %></p>
 <% else %>
 <table class="browse_details" id="<%= relation_details.version %>">
 
diff --git a/app/views/browse/_way_details.html.erb b/app/views/browse/_way_details.html.erb
index 7a3a2a146..4d07be8c9 100644
--- a/app/views/browse/_way_details.html.erb
+++ b/app/views/browse/_way_details.html.erb
@@ -1,5 +1,5 @@
 <% if way_details.redacted? %>
-<p><%= raw t 'browse.redacted.message', :type => t('browse.redacted.type.way'), :redaction_link => link_to(way_details.redaction) %></p>
+<p><%= raw t 'browse.redacted.message', :type => t('browse.redacted.type.way'), :redaction_link => link_to(t('browse.redacted.redaction', :id => way_details.redaction.id), way_details.redaction), :version => way_details.version %></p>
 <% else %>
 <table class="browse_details" id="<%= way_details.version %>">
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 32ce54e6f..f909f1e5c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -196,7 +196,8 @@ en:
       showing_page: "Showing page"
       of: "of"
     redacted:
-      message: "This %{type} version cannot be shown as it has been redacted. Please see %{redaction_link} for details."
+      redaction: "Redaction %{id}"
+      message: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details."
       type:
         node: "node"
         way: "way"
-- 
2.43.2