diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 38e5b0c7e3e..429f04f633a 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1736,6 +1736,7 @@ en: default_locale: "The default language of this Discourse instance. You can replace the text of system generated categories and topics at Customize / Text." allow_user_locale: "Allow users to choose their own language interface preference" set_locale_from_accept_language_header: "set interface language for anonymous users from their web browser's language headers" + set_locale_from_cookie: "Allows setting an anonymous user's locale via the 'locale' browser cookie" support_mixed_text_direction: "Support mixed left-to-right and right-to-left text directions." min_post_length: "Minimum allowed post length in characters (excluding personal messages)" min_first_post_length: "Minimum allowed first post (topic body) length (excluding personal messages)" diff --git a/config/site_settings.yml b/config/site_settings.yml index 4937b6aee41..f636835e720 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -152,7 +152,6 @@ basic: validator: "AllowUserLocaleEnabledValidator" set_locale_from_cookie: default: false - hidden: true client: true validator: "AllowUserLocaleEnabledValidator" support_mixed_text_direction: diff --git a/spec/requests/admin/config/site_settings_controller_spec.rb b/spec/requests/admin/config/site_settings_controller_spec.rb index 67f9a2515a7..5523b924579 100644 --- a/spec/requests/admin/config/site_settings_controller_spec.rb +++ b/spec/requests/admin/config/site_settings_controller_spec.rb @@ -47,11 +47,9 @@ RSpec.describe Admin::SiteSettingsController do Admin::Config::SiteSettingsController::ADMIN_CONFIG_AREA_ALLOWLISTED_HIDDEN_SETTINGS.first.to_s end, ).to be_present - get "/admin/config/site_settings.json", params: { filter_names: ["set_locale_from_cookie"] } + get "/admin/config/site_settings.json", params: { filter_names: ["max_category_nesting"] } expect( - response.parsed_body["site_settings"].find do |s| - s["setting"] == "set_locale_from_cookie" - end, + response.parsed_body["site_settings"].find { |s| s["setting"] == "max_category_nesting" }, ).to be_nil end diff --git a/spec/requests/admin/site_settings_controller_spec.rb b/spec/requests/admin/site_settings_controller_spec.rb index f3a1e95d2b3..c1c99d70724 100644 --- a/spec/requests/admin/site_settings_controller_spec.rb +++ b/spec/requests/admin/site_settings_controller_spec.rb @@ -25,9 +25,7 @@ RSpec.describe Admin::SiteSettingsController do get "/admin/site_settings.json" expect(response.status).to eq(200) expect( - response.parsed_body["site_settings"].find do |s| - s["setting"] == "set_locale_from_cookie" - end, + response.parsed_body["site_settings"].find { |s| s["setting"] == "max_category_nesting" }, ).to be_nil end end