cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some "lego" messages in plain text emails

Browse source
This commit is contained in:
Tom Hughes 2013-05-07 18:59:12 +01:00
parent 2b99d77962
commit fecc643c4e
3 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/views/notifier/email_confirm.text.erb
View file

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

3
app/views/notifier/lost_password.text.erb
View file

@ -1,7 +1,6 @@
<%= t 'notifier.lost_password_plain.greeting' %> <%= t 'notifier.lost_password_plain.greeting' %>
<%= t 'notifier.lost_password_plain.hopefully_you_1' %> <%= word_wrap(t 'notifier.lost_password_plain.hopefully_you') %>
<%= t 'notifier.lost_password_plain.hopefully_you_2' %>
<%= t 'notifier.lost_password_plain.click_the_link' %> <%= t 'notifier.lost_password_plain.click_the_link' %>

6
config/locales/en.yml
View file

@ -1192,8 +1192,7 @@ en:
subject: "[OpenStreetMap] Confirm your email address" subject: "[OpenStreetMap] Confirm your email address"
email_confirm_plain: email_confirm_plain:
greeting: "Hi," greeting: "Hi,"
hopefully_you_1: "Someone (hopefully you) would like to change their email address over at" hopefully_you: "Someone (hopefully you) would like to change their email address over at %{server_url} to %{new_address}."
hopefully_you_2: "%{server_url} to %{new_address}."
click_the_link: "If this is you, please click the link below to confirm the change." click_the_link: "If this is you, please click the link below to confirm the change."
email_confirm_html: email_confirm_html:
greeting: "Hi," greeting: "Hi,"
@ -1203,8 +1202,7 @@ en:
subject: "[OpenStreetMap] Password reset request" subject: "[OpenStreetMap] Password reset request"
lost_password_plain: lost_password_plain:
greeting: "Hi," greeting: "Hi,"
hopefully_you_1: "Someone (possibly you) has asked for the password to be reset on this" hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
hopefully_you_2: "email addresses openstreetmap.org account."
click_the_link: "If this is you, please click the link below to reset your password." click_the_link: "If this is you, please click the link below to reset your password."
lost_password_html: lost_password_html:
greeting: "Hi," greeting: "Hi,"