A platform for community discussion. Free, open, simple.
DEV: Rearranging settings for content localization (#42430)
Natalie Tayc2cc49cb9a7c
diff --git a/config/locales/server.en.yml b/config/locales/server.en.ymlindex 447590007bd..6c93957b2e5 100644--- a/config/locales/server.en.yml+++ b/config/locales/server.en.yml@@ -2950,7 +2950,7 @@ en:content_localization_language_switcher: "Show a language switcher in the header, allowing visitors to switch between translated versions of Discourse and user-contributed content. Uses languages defined in {{setting:content_localization_supported_locales}}"content_localization_crawler_param: "Serve localized content to web crawlers when {{setting:content_localization_enabled}} and {{setting:set_locale_from_param}} is enabled. The list of supported locales is defined in {{setting:content_localization_supported_locales}}."content_localization_use_default_locale_when_unsupported: "Serve localized content in the site's default locale to users whose preferred language is not listed in 'content localization supported locales'."- content_localization_allow_author_localization: "Allow authors update localizations of their own topics and posts via the post menu."+ content_localization_allow_author_localization: "Allow authors to update localizations of their own topics and posts via the post menu."nested_replies_enabled: "Enable the nested replies view for topics."nested_replies_default: "Use nested replies as the default view for all topics."nested_replies_hot_sort_enabled: "Allow people to sort nested replies by a demand-driven hot score. Hot scores are calculated in the background only for topics where hot sorting is requested."diff --git a/config/site_settings.yml b/config/site_settings.ymlindex cf8a7d63e44..dfa6cdab11f 100644--- a/config/site_settings.yml+++ b/config/site_settings.yml@@ -222,31 +222,6 @@ basic:client: truedefault: falsearea: "localization"- allow_user_locale:- client: true- default: true- area: "localization"- set_locale_from_accept_language_header:- default: false- client: true- validator: "AllowUserLocaleEnabledValidator"- area: "localization"- depends_on:- - "allow_user_locale"- set_locale_from_cookie:- default: false- client: true- validator: "AllowUserLocaleEnabledValidator"- area: "localization"- depends_on:- - "allow_user_locale"- set_locale_from_param:- default: false- client: true- validator: "AllowUserLocaleEnabledValidator"- area: "localization"- depends_on:- - "allow_user_locale"support_mixed_text_direction:client: truedefault: false@@ -1932,21 +1907,13 @@ posting:hidden: truecontent_localization:- content_localization_enabled:- client: true- default: false- area: "localization"- content_localization_allowed_groups:- type: group_list- list_type: compact- allow_any: false+ allow_user_locale:client: true- default: "1|2" # admin, moderator- disallowed_groups: "4"- area: "localization"- content_localization_allow_author_localization:default: true+ area: "localization"+ content_localization_enabled:client: true+ default: falsearea: "localization"content_localization_supported_locales:default: ""@@ -1957,10 +1924,6 @@ content_localization:enum: "LocaleSiteSetting"area: "localization"validator: "ContentLocalizationLocalesValidator"- content_localization_max_locales:- default: 10- type: integer- hidden: truecontent_localization_language_switcher:type: enumchoices:@@ -1971,6 +1934,22 @@ content_localization:client: truearea: "localization"validator: "LanguageSwitcherSettingValidator"+ content_localization_allowed_groups:+ type: group_list+ list_type: compact+ allow_any: false+ client: true+ default: "1|2" # admin, moderator+ disallowed_groups: "4"+ area: "localization"+ content_localization_allow_author_localization:+ default: true+ client: true+ area: "localization"+ content_localization_max_locales:+ default: 10+ type: integer+ hidden: truecontent_localization_crawler_param:default: falsearea: "localization"@@ -1978,6 +1957,27 @@ content_localization:content_localization_use_default_locale_when_unsupported:default: truearea: "localization"+ set_locale_from_accept_language_header:+ default: false+ client: true+ validator: "AllowUserLocaleEnabledValidator"+ area: "localization"+ depends_on:+ - "allow_user_locale"+ set_locale_from_cookie:+ default: false+ client: true+ validator: "AllowUserLocaleEnabledValidator"+ area: "localization"+ depends_on:+ - "allow_user_locale"+ set_locale_from_param:+ default: false+ client: true+ validator: "AllowUserLocaleEnabledValidator"+ area: "localization"+ depends_on:+ - "allow_user_locale"nested_replies:nested_replies_enabled:diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-translations.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-translations.gjsindex 84fdac52000..ae87199a736 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-translations.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-translations.gjs@@ -509,7 +509,8 @@ export default class AiTranslations extends Component {/><actions.Default@label="discourse_ai.translations.admin_actions.localization_settings"- @route="adminConfig.localization.settings"+ @route="adminSiteSettingsCategory"+ @routeModels="content_localization"class="ai-localization-settings-button"/></:actions>diff --git a/plugins/discourse-ai/spec/system/admin_ai_translations_spec.rb b/plugins/discourse-ai/spec/system/admin_ai_translations_spec.rbindex 4c94c8cc969..d42ac8928f3 100644--- a/plugins/discourse-ai/spec/system/admin_ai_translations_spec.rb+++ b/plugins/discourse-ai/spec/system/admin_ai_translations_spec.rb@@ -112,10 +112,10 @@ describe "Admin AI translations" do)end- it "navigates to app language settings when clicking the app language button" do+ it "takes the user to content localization settings when clicking the localization settings button" dofind(".ai-localization-settings-button").click- expect(page).to have_current_path("/admin/config/localization")+ expect(page).to have_current_path("/admin/site_settings/category/content_localization")endit "toggles the selected target for the upcoming details panel" do