From 680f057d8b0d20149c595ee4e6c3aad71dc888fe Mon Sep 17 00:00:00 2001 From: riking Date: Sat, 5 Jul 2014 12:55:48 -0700 Subject: [PATCH] Add notes about invites to SSO and local login settings --- config/locales/server.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index f4b4c33ca5b..207d4ba42df 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -733,14 +733,14 @@ en: min_password_length: "Minimum password length." block_common_passwords: "Don't allow passwords that are in the 10000 most common passwords." - enable_sso: "Enable single sign on via an external site" + enable_sso: "Enable single sign on via an external site (Note: Disables invites)" sso_url: "URL of single sign on endpoint" sso_secret: "Secret string used to encrypt/decrypt SSO information, be sure it is 10 chars or longer" sso_overrides_email: "Overrides local email with external site email from SSO payload (WARNING: discrepancies can occur due to normalization of local emails)" sso_overrides_username: "Overrides local username with external site username from SSO payload (WARNING: discrepancies can occur due to differences in username length/requirements)" sso_overrides_name: "Overrides local name with external site name from SSO payload (WARNING: discrepancies can occur due to normalization of local names)" - enable_local_logins: "Enable traditional, local username and password authentication" + enable_local_logins: "Enable traditional, local username and password authentication. (Note: Required for invites)" enable_google_logins: "(deprecated) Enable Google authentication. This is the OpenID method of authentication which Google has deprecated. New installs will NOT work with this. Use Google Oauth2 instead. Existing installs must move to Google Oauth2 by April 20, 2015." enable_yahoo_logins: "Enable Yahoo authentication"