kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adds the email address to the flash message after registeration. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11949 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-06-09 10:23:31 +00:00
parent 86cfa025ed
commit 52af9a1766
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/account_controller.rb
View File

@ -282,7 +282,7 @@ class AccountController < ApplicationController
token = Token.new(:user => user, :action => "register")
if user.save and token.save
Mailer.register(token).deliver
flash[:notice] = l(:notice_account_register_done)
flash[:notice] = l(:notice_account_register_done, :email => user.mail)
redirect_to signin_path
else
yield if block_given?

2
config/locales/en-GB.yml
View File

@ -152,7 +152,7 @@ en-GB:
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. To activate your account, click on the link that was emailed to you.
notice_account_register_done: Account was successfully created. An email containing the instructions to activate your account was sent to %{email}.
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.

2
config/locales/en.yml
View File

@ -148,7 +148,7 @@ en:
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. To activate your account, click on the link that was emailed to you.
notice_account_register_done: Account was successfully created. An email containing the instructions to activate your account was sent to %{email}.
notice_account_unknown_email: Unknown user.
notice_account_not_activated_yet: You haven't activated your account yet. If you want to receive a new activation email, please <a href="%{url}">click this link</a>.
notice_account_locked: Your account is locked.

2
config/locales/fr.yml
View File

@ -165,7 +165,7 @@ fr:
notice_account_invalid_creditentials: Identifiant ou mot de passe invalide.
notice_account_password_updated: Mot de passe mis à jour avec succès.
notice_account_wrong_password: Mot de passe incorrect
notice_account_register_done: Un message contenant les instructions pour activer votre compte vous a été envoyé.
notice_account_register_done: Un message contenant les instructions pour activer votre compte vous a été envoyé à l'adresse %{email}.
notice_account_unknown_email: Aucun compte ne correspond à cette adresse.
notice_account_not_activated_yet: Vous n'avez pas encore activé votre compte. Si vous voulez recevoir un nouveau message d'activation, veuillez <a href="%{url}">cliquer sur ce lien</a>.
notice_account_locked: Votre compte est verrouillé.