cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prefer using _html locale keys to the raw function

Browse source
This commit is contained in:
Tom Hughes 2012-04-05 14:08:31 +01:00
parent 0093db5ffb
commit ec1667fc09
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/browse/_node_details.html.erb
View file

@ -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 %>">

2
app/views/browse/_relation_details.html.erb
View file

@ -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 %>">

2
app/views/browse/_way_details.html.erb
View file

@ -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 %>">

2
config/locales/en.yml
View file

@ -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"