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

[rails.git] / app / views / users / blocked.html.erb

diff --git a/app/views/users/blocked.html.erb b/app/views/users/blocked.html.erb
index 93b4972d512809165efc12590f54d1e15796e4d9..5e6505cac16788e3f7d0eb2766bc0c320da988c9 100644 (file)
--- a/app/views/users/blocked.html.erb
+++ b/app/views/users/blocked.html.erb
@@ -1,10 +1,10 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t 'user.new.title' %></h1>
+  <h1><%= t "users.new.title" %></h1>

   <div class='header-illustration new-user-main'></div>
   <div class='header-illustration new-user-arm'></div>
 <% end %>
 
 <div class="message">
   <div class='header-illustration new-user-main'></div>
   <div class='header-illustration new-user-arm'></div>
 <% end %>
 
 <div class="message">

-  <h1><%= t 'user.new.no_auto_account_create' %></h1>
-  <h2><%= raw t 'user.new.contact_webmaster', :webmaster => "mailto:#{SUPPORT_EMAIL}" %></h2>
+  <h1><%= t "users.new.no_auto_account_create" %></h1>
+  <h2><%= t "users.new.contact_webmaster_html", :webmaster => "mailto:#{Settings.support_email}" %></h2>

 </div>
 </div>