github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-19 09:12:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: renames forgot_password_verbose, forgot_password_strict

Browse Source
This commit is contained in:
Sam 2014-09-11 15:53:29 +10:00
parent 42104685f7
commit 45e8337a29
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/session_controller.rb
View File

@ -110,7 +110,7 @@ class SessionController < ApplicationController
end end
json = { result: "ok" } json = { result: "ok" }
if SiteSetting.forgot_password_verbose unless SiteSetting.forgot_password_strict
json[:user_found] = user.present? json[:user_found] = user.present?
end end

2
config/locales/server.en.yml
View File

@ -749,7 +749,7 @@ en:
allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines." allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines."
email_domains_blacklist: "A list of email domains that users are not allowed to register accounts with. Example: mailinator.com trashmail.net" email_domains_blacklist: "A list of email domains that users are not allowed to register accounts with. Example: mailinator.com trashmail.net"
email_domains_whitelist: "A list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!" email_domains_whitelist: "A list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!"
forgot_password_verbose: "Inform users of an account's existance when they use the forgot password dialog." forgot_password_strict: "Don't inform users of an account's existance when they use the forgot password dialog."
version_checks: "Ping the Discourse Hub for version updates and show new version messages on the /admin dashboard" version_checks: "Ping the Discourse Hub for version updates and show new version messages on the /admin dashboard"
new_version_emails: "Send an email to the contact_email address when a new version of Discourse is available." new_version_emails: "Send an email to the contact_email address when a new version of Discourse is available."

2
config/site_settings.yml
View File

@ -239,7 +239,7 @@ login:
email_domains_whitelist: email_domains_whitelist:
default: '' default: ''
type: list type: list
forgot_password_verbose: true forgot_password_strict: false
users: users:
min_username_length: min_username_length: