Merge branch 'master' into notes

[rails.git] / app / views / user / suspended.html.erb

diff --git a/app/views/user/suspended.html.erb b/app/views/user/suspended.html.erb
index 27b8dc3f5c46ab3afbd5458c1965db1f7d29f7ae..674f8bcbb1d9bc059b740b0565c9d94851c07ba4 100644 (file)
--- a/app/views/user/suspended.html.erb
+++ b/app/views/user/suspended.html.erb
@@ -1,5 +1,7 @@
 <% @title = t "user.suspended.title" %>
 
-<h1><%= t "user.suspended.heading" %></h1>
+<% content_for :heading do %>
+  <h1><%= t "user.suspended.heading" %></h1>
+<% end %>
 
-<%= t "user.suspended.body", :webmaster => "webmaster@openstreetmap.org" %>
+<%= raw t "user.suspended.body", :webmaster => link_to(t("user.suspended.webmaster"), "mailto:webmaster@openstreetmap.org") %>