From 98bac3b57dbc824604e51aaa4543b2ac3382f838 Mon Sep 17 00:00:00 2001 From: Erik Ordway Date: Wed, 12 Feb 2014 08:38:19 -0800 Subject: [PATCH] Purge settings and .en.yml translations. --- config/locales/client.en.yml | 3 --- config/locales/server.en.yml | 5 ----- config/site_settings.yml | 5 ----- 3 files changed, 13 deletions(-) diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index e94c3ffa066..5eb7de2b16a 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -478,9 +478,6 @@ en: facebook: title: "with Facebook" message: "Authenticating with Facebook (make sure pop up blockers are not enabled)" - cas: - title: "Log In with CAS" - message: "Authenticating with CAS (make sure pop up blockers are not enabled)" yahoo: title: "with Yahoo" message: "Authenticating with Yahoo (make sure pop up blockers are not enabled)" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 0987b6a3f7f..c60e69f696e 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -466,7 +466,6 @@ en: queue_size_warning: 'The number of queued jobs is %{queue_size}, which is high. This could indicate a problem with the Sidekiq process(es), or you may need to add more Sidekiq workers.' memory_warning: 'Your server is running with less than 1 GB of total memory. At least 1 GB of memory is recommended.' facebook_config_warning: 'The server is configured to allow signup and log in with Facebook (enable_facebook_logins), but the app id and app secret values are not set. Go to the Site Settings and update the settings. See this guide to learn more.' - cas_config_warning: 'The server is configured to allow signup and log in with CAS (enable_cas_logins), but the hostname and domain name values are not set.' twitter_config_warning: 'The server is configured to allow signup and log in with Twitter (enable_twitter_logins), but the key and secret values are not set. Go to the Site Settings and update the settings. See this guide to learn more.' github_config_warning: 'The server is configured to allow signup and log in with GitHub (enable_github_logins), but the client id and secret values are not set. Go to the Site Settings and update the settings. See this guide to learn more.' s3_config_warning: 'The server is configured to upload files to s3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key or s3_upload_bucket. Go to the Site Settings and update the settings. See "How to set up image uploads to S3?" to learn more.' @@ -659,10 +658,6 @@ en: facebook_app_id: "App id for Facebook authentication, registered at https://developers.facebook.com/apps" facebook_app_secret: "App secret for Facebook authentication, registered at https://developers.facebook.com/apps" - enable_cas_logins: "Enable CAS authentication" - cas_hostname: "Hostname for cas server" - cas_domainname: "Domain name generated email addresses for cas server" - enable_github_logins: "Enable Github authentication, requires github_client_id and github_client_secret" github_client_id: "Client id for Github authentication, registered at https://github.com/settings/applications" github_client_secret: "Client secret for Github authentication, registered at https://github.com/settings/applications" diff --git a/config/site_settings.yml b/config/site_settings.yml index eed6fa01e35..33c6190b1e2 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -103,11 +103,6 @@ users: default: true facebook_app_id: '' facebook_app_secret: '' - enable_cas_logins: - client: true - default: false - cas_hostname: '' - cas_domainname: '' enable_github_logins: client: true default: false