Merge remote-tracking branch 'upstream/pull/2431'

[rails.git] / app / views / browse / feature.html.erb

diff --git a/app/views/browse/feature.html.erb b/app/views/browse/feature.html.erb
index d21d8d0c2b3d513d0b13af3d792fb87e62cef75a..75e54f0b2c89c1aa4962808841b9e57bfbdc5f4e 100644 (file)
--- a/app/views/browse/feature.html.erb
+++ b/app/views/browse/feature.html.erb
@@ -1,14 +1,14 @@
-<% set_title(t("browse.#{@type}.title", :name => printable_name(@feature))) %>
+<% set_title(t("browse.#{@type}.title_html", :name => printable_name(@feature))) %>
 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= raw t("browse.#{@type}.title", :name => printable_name(@feature)) %>
+  <%= t("browse.#{@type}.title_html", :name => printable_name(@feature)) %>
 </h2>
 
 <%= render :partial => @type, :object => @feature %>
 
 <div class='secondary-actions'>
-  <%= link_to(t('browse.download_xml'), :controller => "api/#{@type.pluralize}", :action => :show) %>
+  <%= link_to(t("browse.download_xml"), :controller => "api/#{@type.pluralize}", :action => :show) %>
   &middot;
-  <%= link_to(t('browse.view_history'), :action => "#{@type}_history") %>
+  <%= link_to(t("browse.view_history"), :action => "#{@type}_history") %>
 </div>