Make it a bit clear when you try and login with openID and your openID isn't associat...

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 00dbcafb6ac44d5ba6211ca38c6467077fdd1d5f..cc12cc9e74ca2f3d69540cd39911b014cb3533ca 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -322,6 +322,10 @@ class UserController < ApplicationController
     @nickname = params['nickname']
     @email = params['email']
     @openID = params['openid']
+       
+    if !params['openid'].nil?
+         flash.now[:notice] = t 'user.new.openID association'
+       end
   end
 
   def login

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8a8d3cdaa2e0c7fba147f3d7dac2a681a35b07dd..2d4a634ad64fd7a02e2f0f22977b458fd3bc45a8 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1575,6 +1575,7 @@ en:
       confirm password: "Confirm Password:"
       openID: "OpenID:"
       openID description: '(Optional) If you have an <a href="http://wiki.openstreetmap.org/wiki/openID">OpenID</a> you can associate it with this account to login'
+      openID association: 'Your OpenID is not associated with a OpenStreetMap account yet.<br><ul><li>If you are new to OpenStreetMap, please create a new account.<li>If you already have an account, you can normally login to your account and then associate the account with your openID in your user settings</ul> '
       signup: Signup
       flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)<br /><br />Please note that you will not be able to login until you've received and confirmed your email address.<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."
     no_such_user: