merge 15807:16012 from rails_port

[rails.git] / app / views / layouts / site.html.erb

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 37d2b1962296967b693d30234b6d8ac1f2610a8c..241bf1817eba764da60c046460a08f938675aeb6 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -81,7 +81,7 @@
           <%= t 'layouts.intro_1' %>
         </p>
         <p>
           <%= t 'layouts.intro_1' %>
         </p>
         <p>

-          <%= t 'layouts.intro_2' %>.
+          <%= t 'layouts.intro_2' %>

         </p>
         <p>
         <%= t 'layouts.intro_3', 
         </p>
         <p>
         <%= t 'layouts.intro_3', 


@@ -93,11 +93,12 @@
 
       <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
       <div id="alert">
 
       <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
       <div id="alert">

-        <%= t 'layouts.offline' %>
+        <%= t 'layouts.osm_offline' %>

       </div>
       <% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
       <div id="alert">
       </div>
       <% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
       <div id="alert">

-        <%= t 'layouts.read_only' %>
+        <%= t 'layouts.osm_read_only' %>
+      </div>

       <% end %>
 
       <% if false %>
       <% end %>
 
       <% if false %>