summaryrefslogtreecommitdiffstats
path: root/app/controllers/account_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2007-01-27 23:22:58 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2007-01-27 23:22:58 +0000
commit90c7cf9763bd02bc832dc20be757e9e2c6b9b616 (patch)
tree970f35c218cbeb962efd7d6c2bd1dddfe6a3b1c3 /app/controllers/account_controller.rb
parent3dc9ceaadf4195db59d4381cd6f4d8b22b5a8bbc (diff)
downloadredmine-90c7cf9763bd02bc832dc20be757e9e2c6b9b616.tar.gz
redmine-90c7cf9763bd02bc832dc20be757e9e2c6b9b616.zip
proper language setting for mail notifications
git-svn-id: http://redmine.rubyforge.org/svn/trunk@200 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/account_controller.rb')
-rw-r--r--app/controllers/account_controller.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 9cca8d2c7..3712ef7e1 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -82,8 +82,6 @@ class AccountController < ApplicationController
# create a new token for password recovery
token = Token.new(:user => user, :action => "recovery")
if token.save
- # send token to user via email
- Mailer.set_language_if_valid(user.language)
Mailer.deliver_lost_password(token)
flash[:notice] = l(:notice_account_lost_email_sent)
redirect_to :action => 'login'
@@ -122,7 +120,6 @@ class AccountController < ApplicationController
@user.custom_values = @custom_values
token = Token.new(:user => @user, :action => "register")
if @user.save and token.save
- Mailer.set_language_if_valid(@user.language)
Mailer.deliver_register(token)
flash[:notice] = l(:notice_account_register_done)
redirect_to :controller => 'welcome' and return