Remove "antispam alert"

The advanced users whom this affects will be aware of
the problem. It can only confuse the other 99%.

diff --git a/app/views/user/confirm.html.erb b/app/views/user/confirm.html.erb
index f8147ac783ac3c1f6fa698dcd1b43361e51b9a9d..31f29eb6428e72dfa1c8a3fcb19fb2e785b0f055 100644 (file)
--- a/app/views/user/confirm.html.erb
+++ b/app/views/user/confirm.html.erb
@@ -27,7 +27,6 @@
     </span>
   </h1>
 
     </span>
   </h1>
 

-  <p class='deemphasize'><%= t "user.confirm.antispam_alert_html" %></p>

   <p class='deemphasize'><%= t "user.confirm.reconfirm_html",
                                :reconfirm => url_for(:action => 'confirm_resend')%></p>
 <% end %>
   <p class='deemphasize'><%= t "user.confirm.reconfirm_html",
                                :reconfirm => url_for(:action => 'confirm_resend')%></p>
 <% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b750386512f359759a02a7f8dbbde78c898936ba..212ef633e75feec57de9a6cf881e2b3a3356daed 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1877,9 +1877,6 @@ en:
         We sent you a confirmation email.
       introduction_2: |
         Confirm your account by clicking on the link in the email and you'll be able to start mapping.
         We sent you a confirmation email.
       introduction_2: |
         Confirm your account by clicking on the link in the email and you'll be able to start mapping.

-      antispam_alert_html: |
-        If you use an antispam system which sends confirmation requests then please make sure you
-        whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests.

       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm
       already active: "This account has already been confirmed."
       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm
       already active: "This account has already been confirmed."