]> git.openstreetmap.org Git - rails.git/commitdiff
Invite users to fill in their profile after confirming an account
authorTom Hughes <tom@compton.nu>
Mon, 4 Oct 2010 18:45:26 +0000 (19:45 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 4 Oct 2010 18:45:26 +0000 (19:45 +0100)
app/controllers/user_controller.rb
config/locales/en.yml

index 01c154705166d5a0d005282caf28ffe591492a1e..2ba373125a2d3de8fc3519ae4c1b90e42541298f 100644 (file)
@@ -256,15 +256,16 @@ class UserController < ApplicationController
         @user.save!
         referer = token.referer
         token.destroy
-        flash[:notice] = t 'user.confirm.success'
         session[:user] = @user.id
         unless referer.nil?
+          flash[:notice] = t('user.confirm.success')
           redirect_to referer
         else
+          flash[:notice] = t('user.confirm.success') + "<br /><br />" + t('user.confirm.before you start')
           redirect_to :action => 'account', :display_name => @user.display_name
         end
       else
-        flash[:error] = t 'user.confirm.failure'
+        flash[:error] = t('user.confirm.failure')
         redirect_to :action => 'login', :display_name => @user.display_name
       end
     end
index e2bcd1ef528d9f3f6950e9d516dc2d3869b5cd5b..573c5794b250f6ca42f810201c66c4996f846e2e 100644 (file)
@@ -1662,6 +1662,7 @@ en:
       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."
       failure: "A user account with this token has already been confirmed."
     confirm_email:
       heading: Confirm a change of email address