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

Hook up user confirmation page

Browse source
This commit is contained in:
John Firebaugh 2013-08-01 12:38:15 -07:00
parent c5fc21e6a6
commit 2a3bc0a387
10 changed files with 115 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

22
config/locales/en.yml
View file

@ -1148,13 +1148,6 @@ en:
to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
procedure</a> or file directly at our
<a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
verify_page:
title: Congratulations!
introduction_html: |
We sent a confirmation email to %{email}. <span class='deemphasize'>Confirm your account
by clicking on the link in the email and you'll be able to start mapping.</span>
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."
welcome_page:
title: Welcome!
introduction_html: |
@ -1736,8 +1729,6 @@ en:
</li>
</ul>
continue: Sign Up
flash welcome: "Thanks for signing up. We've sent a welcome message to %{email} with some hints on getting started."
flash create success message: "Thanks for signing up. We've sent a confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />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."
terms accepted: "Thanks for accepting the new contributor terms!"
terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."
terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
@ -1881,14 +1872,19 @@ en:
flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
flash update success: "User information updated successfully."
confirm:
heading: Confirm a user account
heading: Check your email!
introduction_1: |
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
success: "Confirmed your account, thanks for signing up!"
before you start: "We know you're probably in a hurry to start mapping, but before you do you might like to fill in some more information about yourself in the form below."
already active: "This account has already been confirmed."
unknown token: "That token doesn't seem to exist."
reconfirm: "If it's been a while since you signed up you might need to <a href=\"%{reconfirm}\">send yourself a new confirmation email</a>."
reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
confirm_resend:
success: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />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."
failure: "User %{name} not found."

1
config/routes.rb
View file

@ -126,7 +126,6 @@ OpenStreetMap::Application.routes.draw do
match '/copyright/:copyright_locale' => 'site#copyright', :via => :get
match '/copyright' => 'site#copyright', :via => :get
match '/welcome' => 'site#welcome', :via => :get, :as => :welcome
match '/verifysignup' => 'site#verifysignup', :via => :get, :as => :verifysignup
match '/history' => 'changeset#list', :via => :get
match '/history/feed' => 'changeset#feed', :via => :get, :format => :atom
match '/export' => 'site#index', :export => true, :via => :get