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

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

diff --git a/app/views/browse/history.html.erb b/app/views/browse/history.html.erb
index 5f5dd4db3274b789890cac68a562ad72cfd3e191..faa88359e6b9ced2911915dd7b37a0437b9dfb4c 100644 (file)
--- a/app/views/browse/history.html.erb
+++ b/app/views/browse/history.html.erb
@@ -1,14 +1,14 @@
-<% set_title(t("browse.#{@type}.history_title", :name => printable_name(@feature))) %>
+<% set_title(t("browse.#{@type}.history_title_html", :name => printable_name(@feature))) %>

 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>

-  <%= raw t("browse.#{@type}.history_title", :name => printable_name(@feature)) %>
+  <%= t("browse.#{@type}.history_title_html", :name => printable_name(@feature)) %>

 </h2>
 
 <%= render :partial => @type, :collection => @feature.send("old_#{@type}s").reverse %>
 
 <div class='secondary-actions'>
 </h2>
 
 <%= render :partial => @type, :collection => @feature.send("old_#{@type}s").reverse %>
 
 <div class='secondary-actions'>

-  <%= link_to(t('browse.download_xml'), :controller => "old_#{@type}", :action => "history") %>
+  <%= link_to(t("browse.download_xml"), :controller => "api/old_#{@type.pluralize}", :action => "history") %>

   &middot;
   &middot;

-  <%= link_to(t('browse.view_details'), :action => @type) %>
+  <%= link_to(t("browse.view_details"), :action => @type) %>

 </div>
 </div>