Provide both HTML and plain text versions of account confirmation and

password reset emails to try and avoid problems with link truncation.

diff --git a/app/views/notifier/lost_password.text.html.rhtml b/app/views/notifier/lost_password.text.html.rhtml
new file mode 100644 (file)
index 0000000..341240e
--- /dev/null
+++ b/app/views/notifier/lost_password.text.html.rhtml
@@ -0,0 +1,8 @@
+<p>Hi,</p>
+
+<p>Someone (possibly you) has asked for the password to be reset on this
+   email addresses openstreetmap.org account.</p>
+
+<p>If this is you, please click the link below to reset your password.</p>
+
+<p><a href="<%= @url %>"><%= @url %></a></p>

diff --git a/app/views/notifier/lost_password.rhtml b/app/views/notifier/lost_password.text.plain.rhtml
similarity index 100%
rename from app/views/notifier/lost_password.rhtml
rename to app/views/notifier/lost_password.text.plain.rhtml

diff --git a/app/views/notifier/reset_password.text.html.rhtml b/app/views/notifier/reset_password.text.html.rhtml
new file mode 100644 (file)
index 0000000..a99ca37
--- /dev/null
+++ b/app/views/notifier/reset_password.text.html.rhtml
@@ -0,0 +1,3 @@
+<p>Hi,</p>
+
+<p>Your password has been reset to <%= @pass %></p>

diff --git a/app/views/notifier/reset_password.rhtml b/app/views/notifier/reset_password.text.plain.rhtml
similarity index 100%
rename from app/views/notifier/reset_password.rhtml
rename to app/views/notifier/reset_password.text.plain.rhtml

diff --git a/app/views/notifier/signup_confirm.text.html.rhtml b/app/views/notifier/signup_confirm.text.html.rhtml
new file mode 100644 (file)
index 0000000..2272b01
--- /dev/null
+++ b/app/views/notifier/signup_confirm.text.html.rhtml
@@ -0,0 +1,8 @@
+<p>Hi,</p>
+
+<p>Someone (hopefully you) would like to create an account over at
+   <%= SERVER_URL %>.</p>
+
+<p>If this is you, please click the link below to confirm that account.</p>
+
+<p><a href="><%= @url %>"><%= @url %></a></p>

diff --git a/app/views/notifier/signup_confirm.rhtml b/app/views/notifier/signup_confirm.text.plain.rhtml
similarity index 100%
rename from app/views/notifier/signup_confirm.rhtml
rename to app/views/notifier/signup_confirm.text.plain.rhtml