From: Tom Hughes <tom@compton.nu>
Date: Mon, 4 Oct 2010 18:45:26 +0000 (+0100)
Subject: Invite users to fill in their profile after confirming an account
X-Git-Tag: live~6258^2~2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/52e523cb0b75fe8597ba13659d88bafa5205ba62

Invite users to fill in their profile after confirming an account
---

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 01c154705..2ba373125 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -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
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e2bcd1ef5..573c5794b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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