mirror of
https://github.com/discourse/discourse.git
synced 2025-06-24 17:21:31 +08:00
FEATURE: forgot_password_strict setting also prevents reporting that an email address is taken during signup
This commit is contained in:
@ -16,6 +16,10 @@ class UserActivator
|
||||
@message = activator.activate
|
||||
end
|
||||
|
||||
def success_message
|
||||
activator.success_message
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def activator
|
||||
@ -38,6 +42,10 @@ end
|
||||
|
||||
class ApprovalActivator < UserActivator
|
||||
def activate
|
||||
success_message
|
||||
end
|
||||
|
||||
def success_message
|
||||
I18n.t("login.wait_approval")
|
||||
end
|
||||
end
|
||||
@ -52,6 +60,11 @@ class EmailActivator < UserActivator
|
||||
user_id: user.id,
|
||||
email_token: email_token.token
|
||||
)
|
||||
|
||||
success_message
|
||||
end
|
||||
|
||||
def success_message
|
||||
I18n.t("login.activate_email", email: Rack::Utils.escape_html(user.email))
|
||||
end
|
||||
end
|
||||
@ -62,6 +75,10 @@ class LoginActivator < UserActivator
|
||||
def activate
|
||||
log_on_user(user)
|
||||
user.enqueue_welcome_message('welcome_user')
|
||||
success_message
|
||||
end
|
||||
|
||||
def success_message
|
||||
I18n.t("login.active")
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user