merging master into html-mail-fixes

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

diff --git a/app/views/notifier/lost_password.text.erb b/app/views/notifier/lost_password.text.erb
index 89381801f8d2beb24ee4e7162241253eaba60826..2b74e8e80f5a64f9e4cb8dee4b91de487634bdd7 100644 (file)
--- a/app/views/notifier/lost_password.text.erb
+++ b/app/views/notifier/lost_password.text.erb
@@ -1,7 +1,6 @@
 <%= t 'notifier.lost_password_plain.greeting' %>
 
-<%= t 'notifier.lost_password_plain.hopefully_you_1' %>
-<%= t 'notifier.lost_password_plain.hopefully_you_2' %>
+<%= word_wrap(t 'notifier.lost_password_plain.hopefully_you') %>
 
 <%= t 'notifier.lost_password_plain.click_the_link' %>