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

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

diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb
index e84adf2d48bae0d20188c14b20c772f0521167ef..d991adf398075c89cdc113d9ee621cedb72ab8ec 100644 (file)
--- a/app/views/site/edit.html.erb
+++ b/app/views/site/edit.html.erb
@@ -1,12 +1,12 @@
 <% content_for :content do %>
-  <% if STATUS == :database_offline or STATUS == :api_offline %>
-    <p><%= t 'layouts.osm_offline' %></p>
-  <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
-    <p><%= t 'layouts.osm_read_only' %></p>
+  <% if Settings.status == "database_offline" or Settings.status == "api_offline" %>
+    <p><%= t "layouts.osm_offline" %></p>
+  <% elsif Settings.status == "database_readonly" or Settings.status == "api_readonly" %>
+    <p><%= t "layouts.osm_read_only" %></p>
   <% elsif !current_user.data_public? %>
-    <p><%= t '.not_public' %></p>
-    <p><%= raw t '.not_public_description', :user_page => (link_to t('.user_page_link'), {:controller => 'user', :action => 'account', :display_name => current_user.display_name, :anchor => 'public'}) %></p>
-    <p><%= raw t 'site.edit.anon_edits', :link => link_to(t('.anon_edits_link_text'), t('.anon_edits_link')) %></p>
+    <p><%= t ".not_public" %></p>
+    <p><%= t ".not_public_description_html", :user_page => (link_to t(".user_page_link"), :controller => "users", :action => "account", :display_name => current_user.display_name, :anchor => "public") %></p>
+    <p><%= t ".anon_edits_html", :link => link_to(t(".anon_edits_link_text"), t(".anon_edits_link")) %></p>
   <% else %>
     <%= render :partial => preferred_editor %>
   <% end %>