diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index b98c507f12..ad9ffc6f7d 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -660,9 +660,6 @@ en: title: "Brief title of this site, used in the title tag." site_description: "Describe this site in one sentence, used in the meta description tag." contact_email: "Email address of key contact for site. Important notices from discourse.org regarding critical updates may be sent to this address." - company_full_name: "DEPRECATED. Not used anymore and will be removed. The full name of the company that runs this site, used in legal documents like /tos and /privacy" - company_short_name: "DEPRECATED. Not used anymore and will be removed. The short name of the company that runs this site, used in legal documents like /tos and /privacy" - company_domain: "DEPRECATED. Not used anymore and will be removed. The domain name owned by the company that runs this site, used in legal documents like /tos and /privacy" queue_jobs: "DEVELOPER ONLY! WARNING! By default, queue jobs in sidekiq. If disabled, your site will be broken." crawl_images: "Retrieve images from remote URLs to insert the correct width and height dimensions." download_remote_images_to_local: "Convert remote images to local images by downloading them; this prevents broken images." diff --git a/config/site_settings.yml b/config/site_settings.yml index 97bf9a60af..325ba9b41f 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -808,10 +808,6 @@ uncategorized: disable_edit_notifications: false - company_full_name: 'My Unconfigured Forum Ltd.' - company_short_name: 'Unconfigured Forum' - company_domain: 'www.example.com' - vacuum_db_days: 90 last_vacuum: default: 0 diff --git a/db/fixtures/999_topics.rb b/db/fixtures/999_topics.rb index cf46ccc6e1..1ab472c300 100644 --- a/db/fixtures/999_topics.rb +++ b/db/fixtures/999_topics.rb @@ -27,9 +27,9 @@ unless Rails.env.test? end create_static_page_topic('tos_topic_id', 'tos_topic.title', "tos_topic.body", nil, staff, "terms of service", { - company_domain: SiteSetting.company_domain, - company_full_name: SiteSetting.company_full_name, - company_name: SiteSetting.company_short_name + company_domain: "company_domain", + company_full_name: "company_full_name", + company_name: "company_short_name" }) create_static_page_topic('guidelines_topic_id', 'guidelines_topic.title', "guidelines_topic.body",