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

[rails.git] / app / views / notifier / email_confirm.text.erb

diff --git a/app/views/notifier/email_confirm.text.erb b/app/views/notifier/email_confirm.text.erb
index 176ef2238ab5c190485293d9a2bf27f659df182a..7c4f0a5abbbe3718e131cb4a4632b4bab688540a 100644 (file)
--- a/app/views/notifier/email_confirm.text.erb
+++ b/app/views/notifier/email_confirm.text.erb
@@ -1,7 +1,6 @@
 <%= t 'notifier.email_confirm_plain.greeting' %>
 
 <%= t 'notifier.email_confirm_plain.greeting' %>
 

-<%= t 'notifier.email_confirm_plain.hopefully_you_1' %>
-<%= t 'notifier.email_confirm_plain.hopefully_you_2', :server_url => SERVER_URL, :new_address => @address %>
+<%= word_wrap(t 'notifier.email_confirm_plain.hopefully_you', :server_url => Settings.server_url, :new_address => @address) %>

 
 <%= t 'notifier.email_confirm_plain.click_the_link' %>
 
 
 <%= t 'notifier.email_confirm_plain.click_the_link' %>