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

[rails.git] / app / views / geocoder / search.html.erb

diff --git a/app/views/geocoder/search.html.erb b/app/views/geocoder/search.html.erb
index a44c5564309db4bf9b3b520ef9569814902f2c47..13144d568eda6306a3f0345278669f9c2fa3f6a0 100644 (file)
--- a/app/views/geocoder/search.html.erb
+++ b/app/views/geocoder/search.html.erb
@@ -1,9 +1,11 @@
+<% set_title(@params[:query]) %>
+

 <h2>
     <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
     <%= t("site.sidebar.search_results") %>
 </h2>
 <% @sources.each do |source| %>
 <h2>
     <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
     <%= t("site.sidebar.search_results") %>
 </h2>
 <% @sources.each do |source| %>

-  <h4 class="inner12"><%= raw(t(".title.#{source}")) %></h4>
+  <h4 class="inner12"><%= t(".title.#{source}_html") %></h4>

   <div class="search_results_entry" data-href="<%= url_for @params.merge(:action => "search_#{source}") %>">
     <%= image_tag "searching.gif", :class => "loader" %>
   </div>
   <div class="search_results_entry" data-href="<%= url_for @params.merge(:action => "search_#{source}") %>">
     <%= image_tag "searching.gif", :class => "loader" %>
   </div>