Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add flash message after an account has been successfully activated #4510

Merged
merged 3 commits into from Jul 25, 2018
Merged

add flash message after an account has been successfully activated #4510

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80c4a59
add flash message after ann account has been successfully activated
adelowo Jul 24, 2018
796cdbb
added new locale text
adelowo Jul 24, 2018
55bb876
Merge branch 'master' into inform_user_of_his_account_being_activated
jonasfranz Jul 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Expand Up @@ -203,6 +203,7 @@ sign_up_now = Need an account? Register now.
confirmation_mail_sent_prompt = A new confirmation email has been sent to <b>%s</b>. Please check your inbox within the next %s to complete the registration process.
reset_password_mail_sent_prompt = A confirmation email has been sent to <b>%s</b>. Please check your inbox within the next %s to complete the password reset process.
active_your_account = Activate Your Account
account_activated = Account has been activated
prohibit_login = Sign In Prohibited
prohibit_login_desc = Your account is prohibited to sign in, please contact your site administrator.
resent_limit_prompt = You have already requested an activation email recently. Please wait 3 minutes and try again.
Expand Down
1 change: 1 addition & 0 deletions routers/user/auth.go
View file
Open in desktop
Expand Up @@ -1035,6 +1035,7 @@ func Activate(ctx *context.Context) {

ctx.Session.Set("uid", user.ID)
ctx.Session.Set("uname", user.Name)
ctx.Flash.Success(ctx.Tr("auth.account_activated"))
ctx.Redirect(setting.AppSubURL + "/")
return
}
Expand Down