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

[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 557fef8303cb16cb34b6c5af1562bd72efd0066f..ea7d101d0e94fbccd2f0511f59d45805be99805e 100644 (file)
--- a/app/views/notifier/signup_confirm.html.erb
+++ b/app/views/notifier/signup_confirm.html.erb
@@ -1,9 +1,9 @@
-<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 => Settings.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>
+<p><%= t(".welcome") %></p>