Revert to using join instead of to_sentence for now as to_sentence is

[rails.git] / app / views / site / _search.rhtml

diff --git a/app/views/site/_search.rhtml b/app/views/site/_search.rhtml
index 6ddcc851cd640bab7ac4495d3d18f45013f49e81..b57a1f984f0381308322d9e78ccfb23119000cef 100644 (file)
--- a/app/views/site/_search.rhtml
+++ b/app/views/site/_search.rhtml
@@ -31,23 +31,21 @@
 
 <% content_for "optionals" do %>
   <div class="optionalbox">
 
 <% content_for "optionals" do %>
   <div class="optionalbox">

-    <span class="oboxheader">Search</span>
-    <span class="whereami"><a href="javascript:describeLocation()">Where am I?</a></span>
+    <span class="oboxheader"><%= t 'site.search.search' %></span>
+    <span class="whereami"><a href="javascript:describeLocation()"><%= t 'site.search.where_am_i' %></a></span>

     <div class="search_form">
     <div id="search_field">
     <% form_remote_tag(:loading => "startSearch()",
                        :complete => "endSearch()",
                        :url => { :controller => :geocoder, :action => :search }) do %>
       <%= text_field_tag :query, h(params[:query]) %>
     <div class="search_form">
     <div id="search_field">
     <% form_remote_tag(:loading => "startSearch()",
                        :complete => "endSearch()",
                        :url => { :controller => :geocoder, :action => :search }) do %>
       <%= text_field_tag :query, h(params[:query]) %>

-      <%= submit_tag "Go" %>
+      <%= submit_tag t('site.search.submit_text') %>

     <% end %>
     </div>
     <% end %>
     </div>

-    <p id="search_active">Searching...</p>
+    <p id="search_active"><%= t 'site.search.searching' %></p>

     </div>
     <p class="search_help">
     </div>
     <p class="search_help">

-      examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ',
-      or 'post offices near Lünen'
-      <a href="http://wiki.openstreetmap.org/index.php/Search">more examples...</a>
+      <%= t 'site.search.search_help' %>

     </p>
   </div>
 <% end %>
     </p>
   </div>
 <% end %>