Merge branch 'master' into convert_roundabout_exits

[rails.git] / app / views / notifier / signup_confirm.html.erb

diff --git a/app/views/notifier/signup_confirm.html.erb b/app/views/notifier/signup_confirm.html.erb
index 6e7f7280e25e993b1f63e32b3340f04d017b300c..a0e0079fc537f92a1fa06c4fdb6ab235379634b5 100644 (file)
--- a/app/views/notifier/signup_confirm.html.erb
+++ b/app/views/notifier/signup_confirm.html.erb
@@ -1,11 +1,9 @@
-<% content_for :body do %>
-  <p style="margin: 0"><%= t("notifier.signup_confirm.greeting") %></p>
+<p><%= t(".greeting") %></p>

 
 

-  <p><%= t("notifier.signup_confirm.created", :site_url => SERVER_URL) %></p>
+<p><%= t(".created", :site_url => SERVER_URL) %></p>

 
 

-  <p><%= t("notifier.signup_confirm.confirm") %></p>
+<p><%= t(".confirm") %></p>

 
 

-  <p><%= link_to @url, @url, :style => "white-space: nowrap" %></p>
+<p><%= link_to @url, @url %></p>

 
 

-  <p><%= t("notifier.signup_confirm.welcome") %></p>
-<% end %>
+<p><%= t(".welcome") %></p>