diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-08-02 17:54:35 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-08-02 17:54:35 +0000 |
| commit | acebceb1d74b77b2196d569eb03b151149b1b56e (patch) | |
| tree | 0d650f8f29e38c7dc9ff785ddcf380901fc3dae6 | |
| parent | 2d5ac54d2eb9f49b8a2f65b4469aa6d95a1e85d6 (diff) | |
| download | redmine-acebceb1d74b77b2196d569eb03b151149b1b56e.tar.gz redmine-acebceb1d74b77b2196d569eb03b151149b1b56e.zip | |
Applied 'register notice' patch by Matt Jones.
The user is now redirected to the login screen after having registered.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@601 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/account_controller.rb | 2 | ||||
| -rw-r--r-- | lang/en.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 842247158..0b70972f5 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -135,7 +135,7 @@ class AccountController < ApplicationController if @user.save and token.save Mailer.deliver_register(token) flash[:notice] = l(:notice_account_register_done) - redirect_to :controller => 'welcome' and return + redirect_to :controller => 'account', :action => 'login' end end end diff --git a/lang/en.yml b/lang/en.yml index f6c89d232..16647afae 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -56,7 +56,7 @@ notice_account_updated: Account was successfully updated. notice_account_invalid_creditentials: Invalid user or password notice_account_password_updated: Password was successfully updated. notice_account_wrong_password: Wrong password -notice_account_register_done: Account was successfully created. +notice_account_register_done: Account was successfully created. To activate your account, click on the link that was emailed to you. notice_account_unknown_email: Unknown user. notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password. notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you. |