From: Tom Hughes <tom@compton.nu>
Date: Tue, 7 May 2013 17:59:12 +0000 (+0100)
Subject: Fixed some "lego" messages in plain text emails
X-Git-Tag: live~5010
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fecc643c4e02dba56aa2acf796f9fd3a79deb4f2

Fixed some "lego" messages in plain text emails
---

diff --git a/app/views/notifier/email_confirm.text.erb b/app/views/notifier/email_confirm.text.erb
index 176ef2238..db9ae0f93 100644
--- 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.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 => SERVER_URL, :new_address => @address) %>
 
 <%= t 'notifier.email_confirm_plain.click_the_link' %>
 
diff --git a/app/views/notifier/lost_password.text.erb b/app/views/notifier/lost_password.text.erb
index 89381801f..2b74e8e80 100644
--- 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' %>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 315cc4aa6..1241e1339 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1192,8 +1192,7 @@ en:
       subject: "[OpenStreetMap] Confirm your email address"
     email_confirm_plain:
       greeting: "Hi,"
-      hopefully_you_1: "Someone (hopefully you) would like to change their email address over at"
-      hopefully_you_2: "%{server_url} to %{new_address}."
+      hopefully_you: "Someone (hopefully you) would like to change their email address over at %{server_url} to %{new_address}."
       click_the_link: "If this is you, please click the link below to confirm the change."
     email_confirm_html:
       greeting: "Hi,"
@@ -1203,8 +1202,7 @@ en:
       subject: "[OpenStreetMap] Password reset request"
     lost_password_plain:
       greeting: "Hi,"
-      hopefully_you_1: "Someone (possibly you) has asked for the password to be reset on this"
-      hopefully_you_2: "email addresses openstreetmap.org account."
+      hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
       click_the_link: "If this is you, please click the link below to reset your password."
     lost_password_html:
       greeting: "Hi,"