Prefer using _html locale keys to the raw function

diff --git a/app/views/browse/_node_details.html.erb b/app/views/browse/_node_details.html.erb
index 7bbd750c9f0607a8ac7f1f6d9f22c5eba4026016..e237f6234dc232717fe3aa374c86a9b804d97e08 100644 (file)
--- 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 cfa03678f944b385f22816f93c0bdbd4c9de456c..57314817dd7b4d860ff1ac5d2c427212fda2e60f 100644 (file)
--- 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 4d07be8c90c6e288b0990994b5024aebc3a6a91a..1313cb250575e80fce986c556380dce7b8840602 100644 (file)
--- 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 f909f1e5cc338e4f3a243a1ed2c1496001533d16..1784f9b40c29640f225e4154fab9c4075b9ddc33 100644 (file)
--- 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"