summaryrefslogtreecommitdiffstats
path: root/app/controllers/sessions_controller.rb
diff options
context:
space:
mode:
authorJohan Sørensen <johan@johansorensen.com>2008-07-07 21:51:27 +0200
committerJohan Sørensen <johan@johansorensen.com>2008-07-07 21:51:27 +0200
commit96b735ad9f74e810509e8b3819e9090891adbcc3 (patch)
treeace7f4b8d6889c134092565045c4abf040b1fa27 /app/controllers/sessions_controller.rb
parent54227bb6ee07b3f1654b58dab769d24e82688ac8 (diff)
downloadgitorious-mainline-outdated-96b735ad9f74e810509e8b3819e9090891adbcc3.zip
gitorious-mainline-outdated-96b735ad9f74e810509e8b3819e9090891adbcc3.tar.gz
gitorious-mainline-outdated-96b735ad9f74e810509e8b3819e9090891adbcc3.tar.bz2
reword openid nickname collision error message just a tiny bit to avoid some confusion
Diffstat (limited to 'app/controllers/sessions_controller.rb')
-rw-r--r--app/controllers/sessions_controller.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index e08a835..16e510f 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -43,9 +43,10 @@ class SessionsController < ApplicationController
failed_login result.message, 'openid'
end
end
- rescue ActiveRecord::RecordInvalid => invalid
- flash[:error] = "This login (<strong>#{@user.login}</strong>) already exists, please <a href="+@user.identity_url+">choose a different persona or modify the current one</a>"
-
+ rescue ActiveRecord::RecordInvalid => invalid
+ flash[:error] = %Q{This login (<strong>#{@user.login}</strong>) already exists,
+ please <a href="#{@user.identity_url}"> choose a different persona/nickname
+ or modify the current one</a>}
redirect_to login_path(:method => 'openid')
end