From ec1667fc093976cb9a69e5aba675ee4281d7ff64 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 5 Apr 2012 14:08:31 +0100
Subject: [PATCH] Prefer using _html locale keys to the raw function

---
 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                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/browse/_node_details.html.erb b/app/views/browse/_node_details.html.erb
index 7bbd750c9..e237f6234 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(t('browse.redacted.redaction', :id => node_details.redaction.id), node_details.redaction), :version => node_details.version %></p>
+<p><%= t 'browse.redacted.message_html', :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 cfa03678f..57314817d 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(t('browse.redacted.redaction', :id => relation_details.redaction.id), relation_details.redaction), :version => relation_details.version %></p>
+<p><%= t 'browse.redacted.message_html', :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 4d07be8c9..1313cb250 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(t('browse.redacted.redaction', :id => way_details.redaction.id), way_details.redaction), :version => way_details.version %></p>
+<p><%= t 'browse.redacted.message_html', :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 f909f1e5c..1784f9b40 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -197,7 +197,7 @@ en:
       of: "of"
     redacted:
       redaction: "Redaction %{id}"
-      message: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details."
+      message_html: "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.39.5