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

[rails.git] / app / views / user_mailer / email_confirm.html.erb

diff --git a/app/views/user_mailer/email_confirm.html.erb b/app/views/user_mailer/email_confirm.html.erb
index 3848b192bd0858cbac0acb1a78b898282f146f32..d972e9f64a06d23d350f1d0635de41de54ca8d58 100644 (file)
--- a/app/views/user_mailer/email_confirm.html.erb
+++ b/app/views/user_mailer/email_confirm.html.erb
@@ -1,7 +1,7 @@
-<p><%= t "user_mailer.email_confirm_html.greeting" %></p>
+<p><%= t ".greeting" %></p>

 
 

-<p><%= t "user_mailer.email_confirm_html.hopefully_you", :server_url => Settings.server_url, :new_address => @address %></p>
+<p><%= t ".hopefully_you", :server_url => Settings.server_url, :new_address => @address %></p>

 
 

-<p><%= t "user_mailer.email_confirm_html.click_the_link" %></p>
+<p><%= t ".click_the_link" %></p>

 
 <p><a href="<%= @url %>"><%= @url %></a></p>
 
 <p><a href="<%= @url %>"><%= @url %></a></p>