Skip to content

A platform for community discussion. Free, open, simple.

FEATURE: Localizable /about page fields via its settings page (#41123)

Natalie Tayaf11f8992cfa
diff --git a/app/assets/stylesheets/admin/admin_config_area.scss b/app/assets/stylesheets/admin/admin_config_area.scss
index 92c5313a5c7..16d4923508e 100644
--- a/app/assets/stylesheets/admin/admin_config_area.scss
+++ b/app/assets/stylesheets/admin/admin_config_area.scss
@@ -102,6 +102,17 @@
}
}
+.admin-config-area-about {
+ &__locale-form {
+ margin: 0;
+ width: 100%;
+ }
+
+ &__locale-selector-dropdown {
+ width: 100%;
+ }
+}
+
.admin-site-settings-filter-controls {
border-bottom: 1px solid var(--content-border-color);
}
diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index 002f2e52b06..97a16c7c8d6 100644
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -8,8 +8,14 @@ class AboutController < ApplicationController
def index
return redirect_to path("/login") if SiteSetting.login_required? && current_user.nil?
- @about = About.new(current_user)
- @title = "#{I18n.t("js.about.simple_title")} - #{SiteSetting.title}"
+ @about =
+ About.new(
+ current_user,
+ locale: I18n.locale,
+ show_original: ContentLocalization.show_original?(guardian),
+ )
+ @title = "#{I18n.t("js.about.simple_title")} - #{@about.title}"
+ @description_meta = @about.description
respond_to do |format|
format.html { render :index }
format.json { render_json_dump(AboutSerializer.new(@about, scope: guardian)) }
diff --git a/app/controllers/admin/config/about_controller.rb b/app/controllers/admin/config/about_controller.rb
index 328f031a81b..91859728d02 100644
--- a/app/controllers/admin/config/about_controller.rb
+++ b/app/controllers/admin/config/about_controller.rb
@@ -1,9 +1,38 @@
# frozen_string_literal: true
class Admin::Config::AboutController < Admin::AdminController
+ before_action :ensure_can_localize_site_settings, only: %i[localizations update_localizations]
+
def index
end
+ def localizations
+ SiteSettingLocalizations::AboutConfig::Show.call(
+ service_params.deep_merge(params: { locale: params[:locale] }),
+ ) do
+ on_success { |payload:| render json: payload }
+ on_failed_contract { raise Discourse::InvalidParameters, :locale }
+ on_failed_policy(:can_localize_site_settings) { raise Discourse::InvalidAccess }
+ on_failed_policy(:locale_is_supported) { raise Discourse::InvalidParameters, :locale }
+ end
+ end
+
+ def update_localizations
+ SiteSettingLocalizations::AboutConfig::Update.call(
+ service_params.deep_merge(
+ params: {
+ locale: params[:locale],
+ general_settings: params[:general_settings],
+ },
+ ),
+ ) do
+ on_success { |payload:| render json: payload }
+ on_failed_contract { raise Discourse::InvalidParameters, :locale }
+ on_failed_policy(:can_localize_site_settings) { raise Discourse::InvalidAccess }
+ on_failed_policy(:locale_is_supported) { raise Discourse::InvalidParameters, :locale }
+ end
+ end
+
def update
settings = []
@@ -103,4 +132,10 @@ class Admin::Config::AboutController < Admin::AdminController
end
end
end
+
+ private
+
+ def ensure_can_localize_site_settings
+ guardian.ensure_can_localize_site_settings!
+ end
end
diff --git a/app/models/about.rb b/app/models/about.rb
index e4049d5b3ac..55bd5efb793 100644
--- a/app/models/about.rb
+++ b/app/models/about.rb
@@ -26,8 +26,10 @@ class About
Stat.api_stats
end
- def initialize(user = nil)
+ def initialize(user = nil, locale: I18n.locale, show_original: false)
@user = user
+ @locale = locale
+ @show_original = show_original
end
def version
@@ -39,7 +41,7 @@ class About
end
def title
- SiteSetting.title
+ localized_site_setting(:title)
end
def locale
@@ -47,11 +49,15 @@ class About
end
def description
- SiteSetting.site_description
+ localized_site_setting(:site_description)
end
def extended_site_description
- SiteSetting.extended_site_description_cooked
+ localized_site_setting(
+ :extended_site_description,
+ cooked: true,
+ fallback: SiteSetting.extended_site_description_cooked,
+ )
end
def banner_image
@@ -165,6 +171,16 @@ class About
@guardian ||= Guardian.new(@user)
end
+ def localized_site_setting(setting_name, cooked: false, fallback: nil)
+ SiteSettingLocalization.value_for(
+ setting_name,
+ locale: @locale,
+ cooked:,
+ fallback: fallback || SiteSetting.public_send(setting_name),
+ show_original: @show_original,
+ )
+ end
+
def apply_hidden_profile(query)
return query if guardian.is_staff?
return query unless SiteSetting.allow_users_to_hide_profile
diff --git a/app/models/site_setting_localization.rb b/app/models/site_setting_localization.rb
new file mode 100644
index 00000000000..35ab1dffb89
--- /dev/null
+++ b/app/models/site_setting_localization.rb
@@ -0,0 +1,180 @@
+# frozen_string_literal: true
+
+class SiteSettingLocalization < ActiveRecord::Base
+ include LocaleMatchable
+
+ ABOUT_CONFIG_PARAM_MAP = {
+ general_settings: {
+ name: "title",
+ summary: "site_description",
+ extended_description: "extended_site_description",
+ },
+ }.freeze
+
+ class << self
+ def localizable_settings
+ SiteSetting.localizable_settings.deep_merge(registered_settings)
+ end
+
+ def registered_settings
+ @registered_settings ||= {}
+ end
+
+ def localizable_setting_names
+ localizable_settings.keys
+ end
+
+ def register(setting_name, **options)
+ registered_settings[setting_name.to_s] = options.symbolize_keys
+ end
+
+ def localizable?(setting_name)
+ localizable_settings.key?(setting_name.to_s) && SiteSetting.respond_to?(setting_name)
+ end
+
+ def value_for(setting_name, locale:, cooked: false, fallback: nil, show_original: false)
+ fallback = SiteSetting.public_send(setting_name) if fallback.nil? &&
+ SiteSetting.respond_to?(setting_name)
+
+ return fallback if show_original
+ return fallback if locale.blank?
+ return fallback if !SiteSetting.content_localization_enabled?
+ return fallback if !localizable?(setting_name)
+
+ localization = lookup(setting_name, locale)
+ return fallback if localization.blank?
+
+ if cooked
+ localization.cooked.presence || fallback
+ else
+ localization.value.presence || fallback
+ end
+ end
+
+ def lookup(setting_name, locale)
+ locale = normalize_locale(locale)
+ scope = where(setting_name: setting_name.to_s)
+ scope.find_by(locale:) || scope.matching_locale(locale).order(:locale).first
+ end
+
+ def normalize_locale(locale)
+ locale.to_s.tr("-", "_")
+ end
+
+ def supported_content_locale?(locale)
+ normalized_locale = normalize_locale(locale)
+ return false if normalized_locale == normalize_locale(SiteSetting.default_locale)
+
+ SiteSetting
+ .content_localization_supported_locales_map
+ .map { |supported_locale| normalize_locale(supported_locale) }
+ .include?(normalized_locale)
+ end
+
+ def about_config_setting_names
+ ABOUT_CONFIG_PARAM_MAP.values.flat_map(&:values)
+ end
+
+ def about_config_settings_from_params(params)
+ ABOUT_CONFIG_PARAM_MAP.flat_map do |section_name, param_map|
+ section_params = params[section_name.to_s] || params[section_name]
+ next [] if section_params.blank?
+
+ param_map.filter_map do |param_name, setting_name|
+ if section_params.key?(param_name.to_s) || section_params.key?(param_name)
+ value =
+ if section_params.key?(param_name.to_s)
+ section_params[param_name.to_s]
+ else
+ section_params[param_name]
+ end
+ { setting_name:, value: value.to_s }
+ end
+ end
+ end
+ end
+
+ def about_config_payload(locale)
+ localizations =
+ where(locale:, setting_name: about_config_setting_names)
+ .where.not(value: "")
+ .index_by(&:setting_name)
+ .transform_values do |localization|
+ { value: localization.value, cooked: localization.cooked }
+ end
+
+ { locale:, localizations: }
+ end
+ end
+
+ before_validation :normalize_setting_name
+ before_validation :normalize_locale
+ before_validation :cook_value
+
+ validates :setting_name, presence: true
+ validates :locale, presence: true, length: { maximum: 20 }
+ validates :value, presence: true
+ validates :setting_name, uniqueness: { scope: :locale }
+ validate :setting_is_localizable
+ validate :value_length_is_valid
+ validate :cooked_value_is_supported
+
+ def supports_cooked?
+ self.class.localizable_settings.dig(setting_name, :cooked)
+ end
+
+ private
+
+ def normalize_setting_name
+ self.setting_name = setting_name.to_s
+ end
+
+ def normalize_locale
+ self.locale = self.class.normalize_locale(locale)
+ end
+
+ def cook_value
+ return if !supports_cooked?
+
+ self.cooked = value.present? ? PrettyText.markdown(value) : nil
+ end
+
+ def setting_is_localizable
+ return if self.class.localizable?(setting_name)
+
+ errors.add(:setting_name, :inclusion)
+ end
+
+ def value_length_is_valid
+ max_length = self.class.localizable_settings.dig(setting_name, :max_length)
+ return if max_length.blank?
+ return if value.blank? || value.length <= max_length
+
+ errors.add(:value, :too_long, count: max_length)
+ end
+
+ def cooked_value_is_supported
+ return if cooked.blank? || supports_cooked?
+
+ errors.add(:cooked, :present)
+ end
+end
+
+# == Schema Information
+#
+# Table name: site_setting_localizations
+#
+# id :bigint not null, primary key
+# cooked :text
+# locale :string(20) not null
+# setting_name :string not null
+# value :text not null
+# created_at :datetime not null
+# updated_at :datetime not null
+# localizer_user_id :integer
+#
+# Indexes
+#
+# index_site_setting_localizations_on_locale (locale)
+# index_site_setting_localizations_on_setting_name_and_locale (setting_name,locale) UNIQUE
+#
diff --git a/app/services/site_setting_localizations/about_config/show.rb b/app/services/site_setting_localizations/about_config/show.rb
new file mode 100644
index 00000000000..4b2240cf4cb
--- /dev/null
+++ b/app/services/site_setting_localizations/about_config/show.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class SiteSettingLocalizations::AboutConfig::Show
+ include Service::Base
+
+ params do
+ attribute :locale, :string
+
+ before_validation { self.locale = SiteSettingLocalization.normalize_locale(locale) }
+
+ validates :locale, presence: true
+ end
+
+ policy :can_localize_site_settings
+ policy :locale_is_supported
+ step :build_payload
+
+ private
+
+ def can_localize_site_settings(guardian:)
+ guardian.can_localize_site_settings?
+ end
+
+ def locale_is_supported(params:)
+ SiteSettingLocalization.supported_content_locale?(params.locale)
+ end
+
+ def build_payload(params:)
+ context[:payload] = SiteSettingLocalization.about_config_payload(params.locale)
+ end
+end
diff --git a/app/services/site_setting_localizations/about_config/update.rb b/app/services/site_setting_localizations/about_config/update.rb
new file mode 100644
index 00000000000..8743f6878d4
--- /dev/null
+++ b/app/services/site_setting_localizations/about_config/update.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+class SiteSettingLocalizations::AboutConfig::Update
+ include Service::Base
+
+ params do
+ attribute :locale, :string
+ attribute :general_settings, default: -> { {} }
+
+ before_validation { self.locale = SiteSettingLocalization.normalize_locale(locale) }
+
+ validates :locale, presence: true
+ end
+
+ policy :can_localize_site_settings
+ policy :locale_is_supported
+ step :extract_submitted_settings
+
+ transaction do
+ each :submitted_settings, as: :submitted_setting do
+ step :save_submitted_setting
+ end
+ end
+
+ only_if(:submitted_settings_present) { step :log_update }
+
+ step :build_payload
+
+ private
+
+ def can_localize_site_settings(guardian:)
+ guardian.can_localize_site_settings?
+ end
+
+ def locale_is_supported(params:)
+ SiteSettingLocalization.supported_content_locale?(params.locale)
+ end
+
+ def extract_submitted_settings(params:)
+ context[:submitted_settings] = SiteSettingLocalization.about_config_settings_from_params(
+ params.raw_attributes,
+ )
+ end
+
+ def save_submitted_setting(guardian:, params:, submitted_setting:)
+ if submitted_setting[:value].blank?
+ SiteSettingLocalization.where(
+ setting_name: submitted_setting[:setting_name],
+ locale: params.locale,
+ ).destroy_all
+ else
+ localization =
+ SiteSettingLocalization.find_or_initialize_by(
+ setting_name: submitted_setting[:setting_name],
+ locale: params.locale,
+ )
+ localization.value = submitted_setting[:value]
+ localization.localizer_user_id = guardian.user.id
+ localization.save!
+ end
+ end
+
+ def submitted_settings_present(submitted_settings:)
+ submitted_settings.present?
+ end
+
+ def log_update(guardian:, params:, submitted_settings:)
+ StaffActionLogger.new(guardian.user).log_update_site_setting_localizations(
+ locale: params.locale,
+ setting_names: submitted_settings.map { |setting| setting[:setting_name] },
+ )
+ end
+
+ def build_payload(params:)
+ context[:payload] = SiteSettingLocalization.about_config_payload(params.locale)
+ end
+end
diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb
index 165b0ca82e5..756fc8e4ea9 100644
--- a/app/services/staff_action_logger.rb
+++ b/app/services/staff_action_logger.rb
@@ -319,6 +319,23 @@ class StaffActionLogger
)
end
+ def log_update_site_setting_localizations(locale:, setting_names:, opts: {})
+ raise Discourse::InvalidParameters.new(:locale) if locale.blank?
+ raise Discourse::InvalidParameters.new(:setting_names) if setting_names.blank?
+
+ UserHistory.create!(
+ params(opts).merge(
+ action: UserHistory.actions[:custom_staff],
+ custom_type: "update_site_setting_localizations",
+ details:
+ {
+ locale:,
+ setting_names: Array(setting_names).map(&:to_s).uniq.sort.join("|"),
+ }.map { |key, value| "#{key}: #{truncate(value.to_s)}" }.join("\n"),
+ ),
+ )
+ end
+
def log_site_setting_groups_change(setting_name, previous_value, new_value, opts = {})
unless setting_name.present? && SiteSetting.respond_to?(setting_name)
raise Discourse::InvalidParameters.new(:setting_name)
diff --git a/app/views/about/index.html.erb b/app/views/about/index.html.erb
index e529aa5740a..9239754809b 100644
--- a/app/views/about/index.html.erb
+++ b/app/views/about/index.html.erb
@@ -111,11 +111,8 @@
<% if @title %>
<% content_for :title do %><%= @title %><% end %>
- <% content_for :head do %>
- <%= raw crawlable_meta_data(title: @title, description: SiteSetting.site_description) %>
- <% end %>
-<% else %>
- <% content_for :head do %>
- <%= raw crawlable_meta_data(title: SiteSetting.title, description: SiteSetting.site_description) %>
- <% end %>
+<% end %>
+
+<% content_for :head do %>
+ <%= raw crawlable_meta_data(title: @title || @about.title, description: @about.description) %>
<% end %>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ec8954fb6f6..a317cec5dba 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -7854,6 +7854,9 @@ en:
initial_members: "Expanded members"
initial_members_description: "Number of group members to display before adding a View more button."
show_description: "Include description"
+ locale_selector:
+ title: "Language"
+ description: "Only translatable About page fields are shown."
optional: "(optional)"
update: "Update"
toasts:
diff --git a/config/routes.rb b/config/routes.rb
index 20983105888..6abde1aab7d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -468,7 +468,11 @@ Discourse::Application.routes.draw do
end
resources :about, constraints: AdminConstraint.new, only: %i[index] do
- collection { put "/" => "about#update" }
+ collection do
+ put "/" => "about#update"
+ get "localizations" => "about#localizations"
+ put "localizations" => "about#update_localizations"
+ end
end
resources :customize,
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 400809e2886..e62620f4f8c 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -25,6 +25,10 @@
# the setting is disabled).
# themeable - Set to true if themes can override this site setting. Generally, only client side affecting settings
# that change the UI should be themeable, and try limit to simple setting types like bool, list, integer, enum.
+# localizable - Set to true if content localization can translate this setting. Use a hash for translation-specific
+# options:
+# - max_length: maximum localized value length
+# - cooked: true when the localized value should be cooked markdown
# upcoming_change_default_override - Allow an upcoming change to control the new default value of this setting.
# - upcoming_change: The site setting of the upcoming change to control this
# - new_default: The new default value when the upcoming change is enabled
@@ -88,9 +92,13 @@ required:
client: true
default: "Discourse"
area: "about"
+ localizable:
+ max_length: 255
site_description:
default: ""
area: "about"
+ localizable:
+ max_length: 1000
short_site_description:
default: ""
client: true
@@ -576,6 +584,9 @@ basic:
max: 10_000
hidden: true
area: "about"
+ localizable:
+ max_length: 10_000
+ cooked: true
extended_site_description_cooked:
default: ""
hidden: true
diff --git a/db/migrate/20260622140747_create_site_setting_localizations.rb b/db/migrate/20260622140747_create_site_setting_localizations.rb
new file mode 100644
index 00000000000..98462f8230f
--- /dev/null
+++ b/db/migrate/20260622140747_create_site_setting_localizations.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class CreateSiteSettingLocalizations < ActiveRecord::Migration[8.0]
+ def change
+ create_table :site_setting_localizations do |t|
+ t.string :setting_name, null: false
+ t.string :locale, null: false, limit: 20
+ t.text :value, null: false
+ t.text :cooked
+ t.integer :localizer_user_id
+
+ t.timestamps null: false
+ end
+
+ add_index :site_setting_localizations, :locale
+ add_index :site_setting_localizations, %i[setting_name locale], unique: true
+ end
+end
diff --git a/db/structure.sql b/db/structure.sql
index d56910d91ec..6394935facd 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -8712,6 +8712,41 @@ CREATE SEQUENCE public.site_setting_groups_id_seq
ALTER SEQUENCE public.site_setting_groups_id_seq OWNED BY public.site_setting_groups.id;
+--
+-- Name: site_setting_localizations; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.site_setting_localizations (
+ id bigint NOT NULL,
+ setting_name character varying NOT NULL,
+ locale character varying(20) NOT NULL,
+ value text NOT NULL,
+ cooked text,
+ localizer_user_id integer,
+ created_at timestamp(6) without time zone NOT NULL,
+ updated_at timestamp(6) without time zone NOT NULL
+);
+
+
+--
+-- Name: site_setting_localizations_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE public.site_setting_localizations_id_seq
+ START WITH 1
+ INCREMENT BY 1
+ NO MINVALUE
+ NO MAXVALUE
+ CACHE 1;
+
+
+--
+-- Name: site_setting_localizations_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE public.site_setting_localizations_id_seq OWNED BY public.site_setting_localizations.id;
+
+
--
-- Name: site_settings; Type: TABLE; Schema: public; Owner: -
--
@@ -13527,6 +13562,13 @@ ALTER TABLE ONLY public.single_sign_on_records ALTER COLUMN id SET DEFAULT nextv
ALTER TABLE ONLY public.site_setting_groups ALTER COLUMN id SET DEFAULT nextval('public.site_setting_groups_id_seq'::regclass);
+--
+-- Name: site_setting_localizations id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.site_setting_localizations ALTER COLUMN id SET DEFAULT nextval('public.site_setting_localizations_id_seq'::regclass);
+
+
--
-- Name: site_settings id; Type: DEFAULT; Schema: public; Owner: -
--
@@ -15947,6 +15989,14 @@ ALTER TABLE ONLY public.site_setting_groups
ADD CONSTRAINT site_setting_groups_pkey PRIMARY KEY (id);
+--
+-- Name: site_setting_localizations site_setting_localizations_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.site_setting_localizations
+ ADD CONSTRAINT site_setting_localizations_pkey PRIMARY KEY (id);
+
+
--
-- Name: site_settings site_settings_pkey; Type: CONSTRAINT; Schema: public; Owner: -
--
@@ -20389,6 +20439,20 @@ CREATE INDEX index_single_sign_on_records_on_user_id ON public.single_sign_on_re
CREATE UNIQUE INDEX index_site_setting_groups_on_name ON public.site_setting_groups USING btree (name);
+--
+-- Name: index_site_setting_localizations_on_locale; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_site_setting_localizations_on_locale ON public.site_setting_localizations USING btree (locale);
+
+
+--
+-- Name: index_site_setting_localizations_on_setting_name_and_locale; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE UNIQUE INDEX index_site_setting_localizations_on_setting_name_and_locale ON public.site_setting_localizations USING btree (setting_name, locale);
+
+
--
-- Name: index_site_settings_on_name; Type: INDEX; Schema: public; Owner: -
--
@@ -22137,6 +22201,7 @@ INSERT INTO "schema_migrations" (version) VALUES
('20260626055145'),
('20260624140945'),
('20260623090824'),
+('20260622140747'),
('20260617053237'),
('20260615084100'),
('20260615082047'),
diff --git a/frontend/discourse/admin/components/admin-config-area-cards/about/contact-information.gjs b/frontend/discourse/admin/components/admin-config-area-cards/about/contact-information.gjs
index bb8d46f1a13..6ae752e58b7 100644
--- a/frontend/discourse/admin/components/admin-config-area-cards/about/contact-information.gjs
+++ b/frontend/discourse/admin/components/admin-config-area-cards/about/contact-information.gjs
@@ -22,7 +22,10 @@ export default class AdminConfigAreasAboutContactInformation extends Component {
@cached
get data() {
return {
- communityOwner: this.args.contactInformation.communityOwner.value,
+ communityOwner: this.#settingValue(
+ "community_owner",
+ this.args.contactInformation.communityOwner
+ ),
contactEmail: this.args.contactInformation.contactEmail.value,
contactURL: this.args.contactInformation.contactURL.value,
contactGroupName: this.args.contactInformation.contactGroupName.value,
@@ -46,17 +49,9 @@ export default class AdminConfigAreasAboutContactInformation extends Component {
async save(data) {
try {
this.args.setGlobalSavingStatus(true);
- await ajax("/admin/config/about.json", {
+ await ajax(this.#savePath, {
type: "PUT",
- data: {
- contact_information: {
- community_owner: data.communityOwner,
- contact_email: data.contactEmail,
- contact_url: data.contactURL,
- contact_username: data.contactUsername,
- contact_group_name: data.contactGroupName,
- },
- },
+ data: this.#saveData(data),
});
this.toasts.success({
duration: "short",
@@ -73,6 +68,40 @@ export default class AdminConfigAreasAboutContactInformation extends Component {
}
}
+ get #savePath() {
+ if (this.args.isDefaultLocale) {
+ return "/admin/config/about.json";
+ }
+
+ return "/admin/config/about/localizations.json";
+ }
+
+ #saveData(data) {
+ const payload = {
+ locale: this.args.locale,
+ contact_information: {
+ community_owner: data.communityOwner,
+ },
+ };
+
+ if (this.args.isDefaultLocale) {
+ payload.contact_information.contact_email = data.contactEmail;
+ payload.contact_information.contact_url = data.contactURL;
+ payload.contact_information.contact_username = data.contactUsername;
+ payload.contact_information.contact_group_name = data.contactGroupName;
+ }
+
+ return payload;
+ }
+
+ #settingValue(settingName, setting) {
+ if (this.args.isDefaultLocale) {
+ return setting.value;
+ }
+
+ return this.args.localizations?.[settingName]?.value ?? "";
+ }
+
<template>
<Form @data={{this.data}} @onSubmit={{this.save}} as |form|>
<form.Field
@@ -90,72 +119,78 @@ export default class AdminConfigAreasAboutContactInformation extends Component {
/>
</form.Field>
- <form.Field
- @name="contactEmail"
- @title={{i18n "admin.config_areas.about.contact_email"}}
- @description={{i18n "admin.config_areas.about.contact_email_help"}}
- @type="input-email"
- @format="large"
- as |field|
- >
- <field.Control
- placeholder={{i18n
- "admin.config_areas.about.contact_email_placeholder"
- }}
- />
- </form.Field>
-
- <form.Field
- @name="contactURL"
- @title={{i18n "admin.config_areas.about.contact_url"}}
- @description={{i18n "admin.config_areas.about.contact_url_help"}}
- @type="input-url"
- @format="large"
- as |field|
- >
- <field.Control
- placeholder={{i18n
- "admin.config_areas.about.contact_url_placeholder"
- }}
- />
- </form.Field>
-
- <form.Field
- @name="contactUsername"
- @title={{i18n "admin.config_areas.about.site_contact_name"}}
- @description={{i18n "admin.config_areas.about.site_contact_name_help"}}
- @onSet={{this.setContactUsername}}
- @format="large"
- @type="custom"
- as |field|
- >
- <field.Control>
- <UserChooser
- @value={{field.value}}
- @options={{hash maximum=1}}
- @onChange={{field.set}}
+ {{#if @isDefaultLocale}}
+ <form.Field
+ @name="contactEmail"
+ @title={{i18n "admin.config_areas.about.contact_email"}}
+ @description={{i18n "admin.config_areas.about.contact_email_help"}}
+ @type="input-email"
+ @format="large"
+ as |field|
+ >
+ <field.Control
+ placeholder={{i18n
+ "admin.config_areas.about.contact_email_placeholder"
+ }}
/>
- </field.Control>
- </form.Field>
+ </form.Field>
- <form.Field
- @name="contactGroupName"
- @title={{i18n "admin.config_areas.about.site_contact_group"}}
- @description={{i18n "admin.config_areas.about.site_contact_group_help"}}
- @onSet={{this.setContactGroup}}
- @format="large"
- @type="custom"
- as |field|
- >
- <field.Control>
- <GroupChooser
- @content={{this.site.groups}}
- @value={{this.contactGroupId}}
- @options={{hash maximum=1}}
- @onChange={{field.set}}
+ <form.Field
+ @name="contactURL"
+ @title={{i18n "admin.config_areas.about.contact_url"}}
+ @description={{i18n "admin.config_areas.about.contact_url_help"}}
+ @type="input-url"
+ @format="large"
+ as |field|
+ >
+ <field.Control
+ placeholder={{i18n
+ "admin.config_areas.about.contact_url_placeholder"
+ }}
/>
- </field.Control>
- </form.Field>
+ </form.Field>
+
+ <form.Field
+ @name="contactUsername"
+ @title={{i18n "admin.config_areas.about.site_contact_name"}}
+ @description={{i18n
+ "admin.config_areas.about.site_contact_name_help"
+ }}
+ @onSet={{this.setContactUsername}}
+ @format="large"
+ @type="custom"
+ as |field|
+ >
+ <field.Control>
+ <UserChooser
+ @value={{field.value}}
+ @options={{hash maximum=1}}
+ @onChange={{field.set}}
+ />
+ </field.Control>
+ </form.Field>
+
+ <form.Field
+ @name="contactGroupName"
+ @title={{i18n "admin.config_areas.about.site_contact_group"}}
+ @description={{i18n
+ "admin.config_areas.about.site_contact_group_help"
+ }}
+ @onSet={{this.setContactGroup}}
+ @format="large"
+ @type="custom"
+ as |field|
+ >
+ <field.Control>
+ <GroupChooser
+ @content={{this.site.groups}}
+ @value={{this.contactGroupId}}
+ @options={{hash maximum=1}}
+ @onChange={{field.set}}
+ />
+ </field.Control>
+ </form.Field>
+ {{/if}}
<form.Submit
@label="admin.config_areas.about.update"
diff --git a/frontend/discourse/admin/components/admin-config-area-cards/about/general-settings.gjs b/frontend/discourse/admin/components/admin-config-area-cards/about/general-settings.gjs
index c29e644e852..c5dee9049f1 100644
--- a/frontend/discourse/admin/components/admin-config-area-cards/about/general-settings.gjs
+++ b/frontend/discourse/admin/components/admin-config-area-cards/about/general-settings.gjs
@@ -13,10 +13,15 @@ export default class AdminConfigAreasAboutGeneralSettings extends Component {
@cached
get data() {
return {
- name: this.args.generalSettings.title.value,
- summary: this.args.generalSettings.siteDescription.value,
- extendedDescription:
- this.args.generalSettings.extendedSiteDescription.value,
+ name: this.#settingValue("title", this.args.generalSettings.title),
+ summary: this.#settingValue(
+ "site_description",
+ this.args.generalSettings.siteDescription
+ ),
+ extendedDescription: this.#settingValue(
+ "extended_site_description",
+ this.args.generalSettings.extendedSiteDescription
+ ),
communityTitle: this.args.generalSettings.communityTitle.value,
aboutBannerImage: this.args.generalSettings.aboutBannerImage.value,
};
@@ -26,17 +31,9 @@ export default class AdminConfigAreasAboutGeneralSettings extends Component {
async save(data) {
try {
this.args.setGlobalSavingStatus(true);
- await ajax("/admin/config/about.json", {
+ await ajax(this.#savePath, {
type: "PUT",
- data: {
- general_settings: {
- name: data.name,
- summary: data.summary,
- extended_description: data.extendedDescription,
- community_title: data.communityTitle,
- about_banner_image: data.aboutBannerImage,
- },
- },
+ data: this.#saveData(data),
});
this.toasts.success({
duration: "short",
@@ -53,6 +50,44 @@ export default class AdminConfigAreasAboutGeneralSettings extends Component {
}
}
+ get #savePath() {
+ if (this.args.isDefaultLocale) {
+ return "/admin/config/about.json";
+ }
+
+ return "/admin/config/about/localizations.json";
+ }
+
+ get nameValidation() {
+ return this.args.isDefaultLocale ? "required" : null;
+ }
+
+ #saveData(data) {
+ const payload = {
+ locale: this.args.locale,
+ general_settings: {
+ name: data.name,
+ summary: data.summary,
+ extended_description: data.extendedDescription,
+ },
+ };
+
+ if (this.args.isDefaultLocale) {
+ payload.general_settings.about_banner_image = data.aboutBannerImage;
+ payload.general_settings.community_title = data.communityTitle;
+ }
+
+ return payload;
+ }
+
+ #settingValue(settingName, setting) {
+ if (this.args.isDefaultLocale) {
+ return setting.value;
+ }
+
+ return this.args.localizations?.[settingName]?.value ?? "";
+ }
+
@action
setImage(upload, { set }) {
set("aboutBannerImage", upload?.url);
@@ -63,7 +98,7 @@ export default class AdminConfigAreasAboutGeneralSettings extends Component {
<form.Field
@name="name"
@title={{i18n "admin.config_areas.about.community_name"}}
- @validation="required"
+ @validation={{this.nameValidation}}
@format="large"
@type="input"
as |field|
@@ -94,27 +129,31 @@ export default class AdminConfigAreasAboutGeneralSettings extends Component {
<field.Control />
</form.Field>
- <form.Field
- @name="communityTitle"
- @title={{i18n "admin.config_areas.about.community_title"}}
- @description={{i18n "admin.config_areas.about.community_title_help"}}
- @format="large"
- @type="input"
- as |field|
- >
- <field.Control />
- </form.Field>
+ {{#if @isDefaultLocale}}
+ <form.Field
+ @name="communityTitle"
+ @title={{i18n "admin.config_areas.about.community_title"}}
+ @description={{i18n "admin.config_areas.about.community_title_help"}}
+ @format="large"
+ @type="input"
+ as |field|
+ >
+ <field.Control />
+ </form.Field>
+ {{/if}}
- <form.Field
- @name="aboutBannerImage"
- @title={{i18n "admin.config_areas.about.banner_image"}}
- @helpText={{i18n "admin.config_areas.about.banner_image_help"}}
- @onSet={{this.setImage}}
- @type="image"
- as |field|
- >
- <field.Control @type="site_setting" />
- </form.Field>
+ {{#if @isDefaultLocale}}
+ <form.Field
+ @name="aboutBannerImage"
+ @title={{i18n "admin.config_areas.about.banner_image"}}
+ @helpText={{i18n "admin.config_areas.about.banner_image_help"}}
+ @onSet={{this.setImage}}
+ @type="image"
+ as |field|
+ >
+ <field.Control @type="site_setting" />
+ </form.Field>
+ {{/if}}
<form.Submit
@label="admin.config_areas.about.update"
diff --git a/frontend/discourse/admin/components/admin-config-area-cards/about/your-organization.gjs b/frontend/discourse/admin/components/admin-config-area-cards/about/your-organization.gjs
index 09e0372a32b..83fae8e3ce4 100644
--- a/frontend/discourse/admin/components/admin-config-area-cards/about/your-organization.gjs
+++ b/frontend/discourse/admin/components/admin-config-area-cards/about/your-organization.gjs
@@ -13,10 +13,22 @@ export default class AdminConfigAreasAboutYourOrganization extends Component {
@cached
get data() {
return {
- companyName: this.args.yourOrganization.companyName.value,
- companyURL: this.args.yourOrganization.companyURL.value,
- governingLaw: this.args.yourOrganization.governingLaw.value,
- cityForDisputes: this.args.yourOrganization.cityForDisputes.value,
+ companyName: this.#settingValue(
+ "company_name",
+ this.args.yourOrganization.companyName
+ ),
+ companyURL: this.#settingValue(
+ "company_url",
+ this.args.yourOrganization.companyURL
+ ),
+ governingLaw: this.#settingValue(
+ "governing_law",
+ this.args.yourOrganization.governingLaw
+ ),
+ cityForDisputes: this.#settingValue(
+ "city_for_disputes",
+ this.args.yourOrganization.cityForDisputes
+ ),
};
}
@@ -24,9 +36,10 @@ export default class AdminConfigAreasAboutYourOrganization extends Component {
async save(data) {
this.args.setGlobalSavingStatus(true);
try {
- await ajax("/admin/config/about.json", {
+ await ajax(this.#savePath, {
type: "PUT",
data: {
+ locale: this.args.locale,
your_organization: {
company_name: data.companyName,
company_url: data.companyURL,
@@ -50,6 +63,22 @@ export default class AdminConfigAreasAboutYourOrganization extends Component {
}
}
+ get #savePath() {
+ if (this.args.isDefaultLocale) {
+ return "/admin/config/about.json";
+ }
+
+ return "/admin/config/about/localizations.json";
+ }
+
+ #settingValue(settingName, setting) {
+ if (this.args.isDefaultLocale) {
+ return setting.value;
+ }
+
+ return this.args.localizations?.[settingName]?.value ?? "";
+ }
+
<template>
<Form @data={{this.data}} @onSubmit={{this.save}} as |form|>
<form.Field
diff --git a/frontend/discourse/admin/components/admin-config-areas/about.gjs b/frontend/discourse/admin/components/admin-config-areas/about.gjs
index d5cd9f94a0f..37e0cd4c9b7 100644
--- a/frontend/discourse/admin/components/admin-config-areas/about.gjs
+++ b/frontend/discourse/admin/components/admin-config-areas/about.gjs
@@ -1,14 +1,62 @@
import Component from "@glimmer/component";
import { tracked } from "@glimmer/tracking";
+import { hash } from "@ember/helper";
import { action } from "@ember/object";
+import { service } from "@ember/service";
import AdminConfigAreaCard from "discourse/admin/components/admin-config-area-card";
import AdminConfigAreasAboutContactInformation from "discourse/admin/components/admin-config-area-cards/about/contact-information";
import AdminConfigAreasAboutExtraGroups from "discourse/admin/components/admin-config-area-cards/about/extra-groups";
import AdminConfigAreasAboutGeneralSettings from "discourse/admin/components/admin-config-area-cards/about/general-settings";
import AdminConfigAreasAboutYourOrganization from "discourse/admin/components/admin-config-area-cards/about/your-organization";
+import Form from "discourse/components/form";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";
+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";
+import DPageHeader from "discourse/ui-kit/d-page-header";
+import dBasePath from "discourse/ui-kit/helpers/d-base-path";
+import { i18n } from "discourse-i18n";
export default class AdminConfigAreasAbout extends Component {
+ @service siteSettings;
+
@tracked saving = false;
+ @tracked loadingLocalizations = false;
+ @tracked selectedLocale = this.siteSettings.default_locale;
+ @tracked localizations = {};
+
+ get isDefaultLocale() {
+ return this.selectedLocale === this.siteSettings.default_locale;
+ }
+
+ get contentLocalizationEnabled() {
+ return this.siteSettings.content_localization_enabled;
+ }
+
+ get localeSelectorData() {
+ return { locale: this.selectedLocale };
+ }
+
+ get localeSelectorHelpText() {
+ if (this.isDefaultLocale) {
+ return;
+ }
+
+ return i18n("admin.config_areas.about.locale_selector.description");
+ }
+
+ get availableLocales() {
+ const supportedLocales = new Set([
+ this.siteSettings.default_locale,
+ ...(this.siteSettings.content_localization_supported_locales || "")
+ .split("|")
+ .filter(Boolean),
+ ]);
+
+ return this.siteSettings.available_locales.filter((locale) =>
+ supportedLocales.has(locale.value)
+ );
+ }
get generalSettings() {
return {
@@ -63,67 +111,173 @@ export default class AdminConfigAreasAbout extends Component {
this.saving = status;
}
+ @action
+ async updateLocale(locale) {
+ this.selectedLocale = locale;
+
+ if (this.isDefaultLocale) {
+ this.localizations = {};
+ this.loadingLocalizations = false;
+ return;
+ }
+
+ this.loadingLocalizations = true;
+
+ try {
+ const response = await ajax("/admin/config/about/localizations.json", {
+ data: { locale },
+ });
+
+ if (this.selectedLocale === locale) {
+ this.localizations = response.localizations;
+ }
+ } catch (err) {
+ popupAjaxError(err);
+ } finally {
+ if (this.selectedLocale === locale) {
+ this.loadingLocalizations = false;
+ }
+ }
+ }
+
+ @action
+ async updateLocaleField(name, locale) {
+ if (name === "locale") {
+ await this.updateLocale(locale);
+ }
+ }
+
#lookupSettingFromData(name) {
return this.args.data.find((value) => value.setting === name);
}
<template>
- <div class="admin-config-area">
- <div class="admin-config-area__primary-content">
- <AdminConfigAreaCard
- @heading="admin.config_areas.about.general_settings"
- @collapsable={{true}}
- class="admin-config-area-about__general-settings-section"
- >
- <:content>
- <AdminConfigAreasAboutGeneralSettings
- @generalSettings={{this.generalSettings}}
- @setGlobalSavingStatus={{this.setSavingStatus}}
- @globalSavingStatus={{this.saving}}
- />
- </:content>
- </AdminConfigAreaCard>
- <AdminConfigAreaCard
- @heading="admin.config_areas.about.contact_information"
- @collapsable={{true}}
- class="admin-config-area-about__contact-information-section"
- >
- <:content>
- <AdminConfigAreasAboutContactInformation
- @contactInformation={{this.contactInformation}}
- @setGlobalSavingStatus={{this.setSavingStatus}}
- @globalSavingStatus={{this.saving}}
- />
- </:content>
- </AdminConfigAreaCard>
- <AdminConfigAreaCard
- @heading="admin.config_areas.about.your_organization"
- @description="admin.config_areas.about.your_organization_description"
- @collapsable={{true}}
- class="admin-config-area-about__your-organization-section"
- >
- <:content>
- <AdminConfigAreasAboutYourOrganization
- @yourOrganization={{this.yourOrganization}}
- @setGlobalSavingStatus={{this.setSavingStatus}}
- @globalSavingStatus={{this.saving}}
- />
- </:content>
- </AdminConfigAreaCard>
- <AdminConfigAreaCard
- @heading="admin.config_areas.about.extra_groups.heading"
- @description="admin.config_areas.about.extra_groups.description"
- @collapsable={{true}}
- class="admin-config-area-about__extra-groups-section"
- >
- <:content>
- <AdminConfigAreasAboutExtraGroups
- @extraGroups={{this.extraGroups}}
- @setGlobalSavingStatus={{this.setSavingStatus}}
- @globalSavingStatus={{this.saving}}
- />
- </:content>
- </AdminConfigAreaCard>
+ <DPageHeader
+ @titleLabel={{i18n "admin.config.about.title"}}
+ @descriptionLabel={{i18n
+ "admin.config.about.header_description"
+ (hash basePath=(dBasePath))
+ }}
+ @hideTabs={{true}}
+ @collapseActionsOnMobile={{false}}
+ @learnMoreUrl="https://meta.discourse.org/t/understanding-and-customizing-the-about-page/332161"
+ >
+ <:breadcrumbs>
+ <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
+ <DBreadcrumbsItem
+ @path="/admin/config/about"
+ @label={{i18n "admin.config.about.title"}}
+ />
+ </:breadcrumbs>
+ </DPageHeader>
+
+ <div class="admin-container admin-config-page__main-area">
+ <div class="admin-config-area">
+ <div class="admin-config-area__primary-content">
+ {{#if this.contentLocalizationEnabled}}
+ <div class="admin-config-area-about__language-toolbar">
+ <Form
+ @data={{this.localeSelectorData}}
+ @onSet={{this.updateLocaleField}}
+ class="admin-config-area-about__locale-form"
+ as |form|
+ >
+ <form.Field
+ @name="locale"
+ @title={{i18n
+ "admin.config_areas.about.locale_selector.title"
+ }}
+ @helpText={{this.localeSelectorHelpText}}
+ @format="large"
+ @showOptional={{false}}
+ @type="select"
+ class="admin-config-area-about__locale-selector"
+ as |field|
+ >
+ <field.Control
+ @includeNone={{false}}
+ class="admin-config-area-about__locale-selector-dropdown"
+ as |select|
+ >
+ {{#each this.availableLocales as |locale|}}
+ <select.Option @value={{locale.value}}>
+ {{locale.name}}
+ </select.Option>
+ {{/each}}
+ </field.Control>
+ </form.Field>
+ </Form>
+ </div>
+ {{/if}}
+
+ <DConditionalLoadingSpinner @condition={{this.loadingLocalizations}}>
+ <AdminConfigAreaCard
+ @heading="admin.config_areas.about.general_settings"
+ @collapsable={{true}}
+ class="admin-config-area-about__general-settings-section"
+ >
+ <:content>
+ <AdminConfigAreasAboutGeneralSettings
+ @generalSettings={{this.generalSettings}}
+ @localizations={{this.localizations}}
+ @locale={{this.selectedLocale}}
+ @isDefaultLocale={{this.isDefaultLocale}}
+ @setGlobalSavingStatus={{this.setSavingStatus}}
+ @globalSavingStatus={{this.saving}}
+ />
+ </:content>
+ </AdminConfigAreaCard>
+ {{#if this.isDefaultLocale}}
+ <AdminConfigAreaCard
+ @heading="admin.config_areas.about.contact_information"
+ @collapsable={{true}}
+ class="admin-config-area-about__contact-information-section"
+ >
+ <:content>
+ <AdminConfigAreasAboutContactInformation
+ @contactInformation={{this.contactInformation}}
+ @localizations={{this.localizations}}
+ @locale={{this.selectedLocale}}
+ @isDefaultLocale={{this.isDefaultLocale}}
+ @setGlobalSavingStatus={{this.setSavingStatus}}
+ @globalSavingStatus={{this.saving}}
+ />
+ </:content>
+ </AdminConfigAreaCard>
+ <AdminConfigAreaCard
+ @heading="admin.config_areas.about.your_organization"
+ @description="admin.config_areas.about.your_organization_description"
+ @collapsable={{true}}
+ class="admin-config-area-about__your-organization-section"
+ >
+ <:content>
+ <AdminConfigAreasAboutYourOrganization
+ @yourOrganization={{this.yourOrganization}}
+ @localizations={{this.localizations}}
+ @locale={{this.selectedLocale}}
+ @isDefaultLocale={{this.isDefaultLocale}}
+ @setGlobalSavingStatus={{this.setSavingStatus}}
+ @globalSavingStatus={{this.saving}}
+ />
+ </:content>
+ </AdminConfigAreaCard>
+ <AdminConfigAreaCard
+ @heading="admin.config_areas.about.extra_groups.heading"
+ @description="admin.config_areas.about.extra_groups.description"
+ @collapsable={{true}}
+ class="admin-config-area-about__extra-groups-section"
+ >
+ <:content>
+ <AdminConfigAreasAboutExtraGroups
+ @extraGroups={{this.extraGroups}}
+ @setGlobalSavingStatus={{this.setSavingStatus}}
+ @globalSavingStatus={{this.saving}}
+ />
+ </:content>
+ </AdminConfigAreaCard>
+ {{/if}}
+ </DConditionalLoadingSpinner>
+ </div>
</div>
</div>
</template>
diff --git a/frontend/discourse/admin/templates/admin-config/about.gjs b/frontend/discourse/admin/templates/admin-config/about.gjs
index 27d5c52962d..73e2d476017 100644
--- a/frontend/discourse/admin/templates/admin-config/about.gjs
+++ b/frontend/discourse/admin/templates/admin-config/about.gjs
@@ -1,30 +1,5 @@
-import { hash } from "@ember/helper";
import About from "discourse/admin/components/admin-config-areas/about";
-import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";
-import DPageHeader from "discourse/ui-kit/d-page-header";
-import dBasePath from "discourse/ui-kit/helpers/d-base-path";
-import { i18n } from "discourse-i18n";
export default <template>
- <DPageHeader
- @titleLabel={{i18n "admin.config.about.title"}}
- @descriptionLabel={{i18n
- "admin.config.about.header_description"
- (hash basePath=(dBasePath))
- }}
- @hideTabs={{true}}
- @learnMoreUrl="https://meta.discourse.org/t/understanding-and-customizing-the-about-page/332161"
- >
- <:breadcrumbs>
- <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
- <DBreadcrumbsItem
- @path="/admin/config/about"
- @label={{i18n "admin.config.about.title"}}
- />
- </:breadcrumbs>
- </DPageHeader>
-
- <div class="admin-container admin-config-page__main-area">
- <About @data={{@controller.model.site_settings}} />
- </div>
+ <About @data={{@controller.model.site_settings}} />
</template>
diff --git a/lib/guardian/localization_guardian.rb b/lib/guardian/localization_guardian.rb
index 84387d58d18..3ff1115cdb9 100644
--- a/lib/guardian/localization_guardian.rb
+++ b/lib/guardian/localization_guardian.rb
@@ -9,6 +9,10 @@ module LocalizationGuardian
@user.in_any_groups?(SiteSetting.content_localization_allowed_groups_map)
end
+ def can_localize_site_settings?
+ SiteSetting.content_localization_enabled && is_admin?
+ end
+
def can_localize_post?(post_or_post_id)
return false if !SiteSetting.content_localization_enabled
return false if anonymous?
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index c2e60237b4a..87bf7ef570c 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -130,6 +130,10 @@ module SiteSettingExtension
@themeable ||= {}
end
+ def localizable_settings
+ @localizable_settings ||= {}
+ end
+
def areas
@areas ||= {}
end
@@ -1191,7 +1195,7 @@ module SiteSettingExtension
if %i[list emoji_list tag_list].include?(type_supervisor.get_type(name))
list_type = type_supervisor.get_list_type(name)
- if %w[simple compact].include?(list_type) || list_type.nil?
+ if %w[simple compact locale].include?(list_type) || list_type.nil?
define_singleton_method("#{clean_name}_map") do |scoped_to = nil|
public_send(clean_name, scoped_to).to_s.split("|")
end
@@ -1335,6 +1339,19 @@ module SiteSettingExtension
themeable[name] = opts[:themeable] ? true : false
+ localizable_setting_name = name.to_s
+ if opts[:localizable]
+ localizable_settings[localizable_setting_name] = (
+ if opts[:localizable].is_a?(Hash)
+ opts[:localizable].symbolize_keys
+ else
+ {}
+ end
+ )
+ else
+ localizable_settings.delete(localizable_setting_name)
+ end
+
if opts[:area]
split_areas = opts[:area].split("|")
if split_areas.any? { |area| !SiteSetting.valid_areas.include?(area) }
diff --git a/spec/lib/guardian/localization_guardian_spec.rb b/spec/lib/guardian/localization_guardian_spec.rb
index 1849c2fa658..b78a3ee1063 100644
--- a/spec/lib/guardian/localization_guardian_spec.rb
+++ b/spec/lib/guardian/localization_guardian_spec.rb
@@ -28,6 +28,24 @@ describe LocalizationGuardian do
end
end
+ describe "#can_localize_site_settings?" do
+ it "returns false when content localization is disabled" do
+ SiteSetting.content_localization_enabled = false
+
+ expect(Guardian.new(admin).can_localize_site_settings?).to eq(false)
+ end
+
+ it "returns true for admins when content localization is enabled" do
+ expect(Guardian.new(admin).can_localize_site_settings?).to eq(true)
+ end
+
+ it "returns false for regular users" do
+ SiteSetting.content_localization_allowed_groups = "#{Group::AUTO_GROUPS[:everyone]}"
+
+ expect(Guardian.new(user).can_localize_site_settings?).to eq(false)
+ end
+ end
+
describe "#can_localize_post?" do
it "returns false when content localization is disabled" do
SiteSetting.content_localization_enabled = false
diff --git a/spec/lib/site_setting_extension_spec.rb b/spec/lib/site_setting_extension_spec.rb
index abb755f41ef..28412150e03 100644
--- a/spec/lib/site_setting_extension_spec.rb
+++ b/spec/lib/site_setting_extension_spec.rb
@@ -1779,6 +1779,11 @@ RSpec.describe SiteSettingExtension do
expect(SiteSetting.ga_universal_auto_link_domains_map).to eq(%w[test.com xy.com])
end
+ it "handles splitting locale list settings" do
+ SiteSetting.content_localization_supported_locales = "ja|pt_BR"
+ expect(SiteSetting.content_localization_supported_locales_map).to eq(%w[ja pt_BR])
+ end
+
it "handles splitting list settings with no type" do
SiteSetting.post_menu = "read|like"
expect(SiteSetting.post_menu_map).to eq(%w[read like])
diff --git a/spec/models/site_setting_localization_spec.rb b/spec/models/site_setting_localization_spec.rb
new file mode 100644
index 00000000000..a0e0715f829
--- /dev/null
+++ b/spec/models/site_setting_localization_spec.rb
@@ -0,0 +1,177 @@
+# frozen_string_literal: true
+
+describe SiteSettingLocalization do
+ before { SiteSetting.content_localization_enabled = true }
+
+ describe ".value_for" do
+ it "returns the localized setting value for the locale" do
+ SiteSetting.site_description = "English description"
+ described_class.create!(setting_name: "site_description", locale: "ja", value: "日本語の説明")
+
+ expect(described_class.value_for(:site_description, locale: "ja")).to eq("日本語の説明")
+ end
+
+ it "falls back to the site setting value" do
+ SiteSetting.site_description = "English description"
+
+ expect(described_class.value_for(:site_description, locale: "ja")).to eq(
+ "English description",
+ )
+ end
+
+ it "falls back to the site setting value when the localized value is blank" do
+ SiteSetting.site_description = "English description"
+ localization =
+ described_class.create!(setting_name: "site_description", locale: "ja", value: "日本語の説明")
+ localization.update_column(:value, "")
+
+ expect(described_class.value_for(:site_description, locale: "ja")).to eq(
+ "English description",
+ )
+ end
+
+ it "falls back to a matching base locale" do
+ SiteSetting.site_description = "English description"
+ described_class.create!(
+ setting_name: "site_description",
+ locale: "pt",
+ value: "Descrição em português",
+ )
+
+ expect(described_class.value_for(:site_description, locale: "pt_BR")).to eq(
+ "Descrição em português",
+ )
+ end
+
+ it "normalizes hyphenated locale names" do
+ SiteSetting.site_description = "English description"
+ described_class.create!(
+ setting_name: "site_description",
+ locale: "pt-BR",
+ value: "Descrição brasileira",
+ )
+
+ expect(described_class.value_for(:site_description, locale: "pt-BR")).to eq(
+ "Descrição brasileira",
+ )
+ end
+
+ it "returns the site setting value when showing original content" do
+ SiteSetting.site_description = "English description"
+ described_class.create!(setting_name: "site_description", locale: "ja", value: "日本語の説明")
+
+ expect(described_class.value_for(:site_description, locale: "ja", show_original: true)).to eq(
+ "English description",
+ )
+ end
+
+ it "returns cooked content for markdown settings" do
+ localization =
+ described_class.create!(
+ setting_name: "extended_site_description",
+ locale: "ja",
+ value: "これは **説明** です",
+ )
+
+ expect(
+ described_class.value_for(:extended_site_description, locale: "ja", cooked: true),
+ ).to eq(localization.cooked)
+ end
+ end
+
+ it "rejects settings outside the allowlist" do
+ localization =
+ described_class.new(setting_name: "contact_email", locale: "ja", value: "[email protected]")
+
+ expect(localization).to be_invalid
+ end
+
+ it "rejects settings that are not displayed as localized content" do
+ expect(described_class.localizable?("company_url")).to eq(false)
+ end
+
+ it "returns only valid localizable settings" do
+ described_class.register(:missing_site_setting)
+
+ expect(described_class.localizable?("title")).to eq(true)
+ expect(described_class.localizable?("missing_site_setting")).to eq(false)
+ ensure
+ described_class.registered_settings.delete("missing_site_setting")
+ end
+
+ it "loads localizable setting metadata from site settings" do
+ expect(SiteSetting.localizable_settings).to include(
+ "title" => {
+ max_length: 255,
+ },
+ "site_description" => {
+ max_length: 1000,
+ },
+ "extended_site_description" => {
+ cooked: true,
+ max_length: 10_000,
+ },
+ )
+
+ expect(described_class.localizable_settings).to include(
+ "title" => {
+ max_length: 255,
+ },
+ "site_description" => {
+ max_length: 1000,
+ },
+ "extended_site_description" => {
+ cooked: true,
+ max_length: 10_000,
+ },
+ )
+ end
+
+ it "removes metadata when a setting is reloaded without localizable options" do
+ SiteSetting.send(
+ :setting,
+ :temporary_localizable_setting,
+ "default",
+ type: :string,
+ localizable: {
+ max_length: 20,
+ },
+ )
+
+ expect(SiteSetting.localizable_settings).to include(
+ "temporary_localizable_setting" => {
+ max_length: 20,
+ },
+ )
+
+ SiteSetting.send(:setting, :temporary_localizable_setting, "default", type: :string)
+
+ expect(SiteSetting.localizable_settings).not_to have_key("temporary_localizable_setting")
+ end
+
+ it "rejects cooked content for plain text settings" do
+ localization =
+ described_class.new(
+ setting_name: "site_description",
+ locale: "ja",
+ value: "日本語の説明",
+ cooked: "<p>日本語の説明</p>",
+ )
+
+ expect(localization).to be_invalid
+ end
+
+ it "regenerates cooked content from the setting value" do
+ localization =
+ described_class.create!(
+ setting_name: "extended_site_description",
+ locale: "ja",
+ value: "これは **安全** です",
+ )
+
+ localization.update!(cooked: "<script>alert('xss')</script>")
+
+ expect(localization.reload.cooked).to include("<strong>安全</strong>")
+ expect(localization.cooked).not_to include("<script>")
+ end
+end
diff --git a/spec/requests/about_controller_spec.rb b/spec/requests/about_controller_spec.rb
index 2ed415c0289..648422d6128 100644
--- a/spec/requests/about_controller_spec.rb
+++ b/spec/requests/about_controller_spec.rb
@@ -48,6 +48,71 @@ RSpec.describe AboutController do
end
end
+ context "with localized site settings" do
+ before do
+ SiteSetting.content_localization_enabled = true
+ SiteSetting.set_locale_from_param = true
+ SiteSetting.title = "English title"
+ SiteSetting.site_description = "English description"
+
+ SiteSettingLocalization.create!(setting_name: "title", locale: "ja", value: "日本語タイトル")
+ SiteSettingLocalization.create!(
+ setting_name: "site_description",
+ locale: "ja",
+ value: "日本語の説明",
+ )
+ end
+
+ it "uses localized values in the JSON response" do
+ get "/about.json", params: { Discourse::LOCALE_PARAM => "ja" }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body.dig("about", "title")).to eq("日本語タイトル")
+ expect(response.parsed_body.dig("about", "description")).to eq("日本語の説明")
+ end
+
+ it "falls back to default values when a localized value is blank" do
+ SiteSettingLocalization.find_by!(setting_name: "title", locale: "ja").update_column(
+ :value,
+ "",
+ )
+
+ get "/about.json", params: { Discourse::LOCALE_PARAM => "ja" }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body.dig("about", "title")).to eq("English title")
+ expect(response.parsed_body.dig("about", "description")).to eq("日本語の説明")
+ end
+
+ it "uses localized values in crawler metadata" do
+ get "/about",
+ params: {
+ Discourse::LOCALE_PARAM => "ja",
+ },
+ headers: {
+ "HTTP_USER_AGENT" => "Googlebot",
+ }
+
+ expect(response.status).to eq(200)
+ expect(response.body).to include(
+ "<title>#{I18n.t("js.about.simple_title", locale: :ja)} - 日本語タイトル</title>",
+ )
+ expect(response.body).to include(%(meta name="description" content="日本語の説明"))
+ end
+
+ it "uses original values when the user prefers original content" do
+ user = Fabricate(:user, locale: "ja")
+ user.user_option.update!(show_original_content: true)
+ sign_in(user)
+
+ get "/about.json", params: { Discourse::LOCALE_PARAM => "ja" }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body.dig("about", "title")).to eq("English title")
+ expect(response.parsed_body.dig("about", "description")).to eq("English description")
+ end
+ end
+
it "serializes stats when 'Guardian#can_see_about_stats?' is true" do
Guardian.any_instance.stubs(:can_see_about_stats?).returns(true)
get "/about.json"
diff --git a/spec/requests/admin/config/about_controller_spec.rb b/spec/requests/admin/config/about_controller_spec.rb
new file mode 100644
index 00000000000..58775d5f3a4
--- /dev/null
+++ b/spec/requests/admin/config/about_controller_spec.rb
@@ -0,0 +1,184 @@
+# frozen_string_literal: true
+
+describe Admin::Config::AboutController do
+ fab!(:admin)
+ fab!(:moderator)
+
+ before do
+ sign_in(admin)
+ SiteSetting.content_localization_enabled = true
+ SiteSetting.content_localization_supported_locales = "ja|pt_BR"
+ end
+
+ describe "#localizations" do
+ it "returns localizations for the requested locale" do
+ SiteSettingLocalization.create!(setting_name: "title", locale: "ja", value: "日本語タイトル")
+ SiteSettingLocalization.create!(
+ setting_name: "site_description",
+ locale: "pt_BR",
+ value: "Descrição",
+ )
+
+ get "/admin/config/about/localizations.json", params: { locale: "ja" }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body).to eq(
+ "locale" => "ja",
+ "localizations" => {
+ "title" => {
+ "value" => "日本語タイトル",
+ "cooked" => nil,
+ },
+ },
+ )
+ end
+
+ it "does not return blank localizations" do
+ localization =
+ SiteSettingLocalization.create!(setting_name: "title", locale: "ja", value: "日本語タイトル")
+ localization.update_column(:value, "")
+
+ get "/admin/config/about/localizations.json", params: { locale: "ja" }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["localizations"]).to be_empty
+ end
+
+ it "normalizes hyphenated locale names" do
+ get "/admin/config/about/localizations.json", params: { locale: "pt-BR" }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["locale"]).to eq("pt_BR")
+ end
+
+ it "rejects the site default locale" do
+ SiteSetting.default_locale = "en"
+
+ get "/admin/config/about/localizations.json", params: { locale: "en" }
+
+ expect(response.status).to eq(400)
+ end
+
+ it "rejects requests when content localization is disabled" do
+ SiteSetting.content_localization_enabled = false
+
+ get "/admin/config/about/localizations.json", params: { locale: "ja" }
+
+ expect(response.status).to eq(403)
+ end
+
+ it "rejects moderators" do
+ sign_in(moderator)
+
+ get "/admin/config/about/localizations.json", params: { locale: "ja" }
+
+ expect(response.status).to eq(404)
+ end
+ end
+
+ describe "#update_localizations" do
+ it "saves localized about settings and logs the change" do
+ put "/admin/config/about/localizations.json",
+ params: {
+ locale: "ja",
+ general_settings: {
+ name: "日本語タイトル",
+ summary: "日本語の説明",
+ extended_description: "日本語の **詳細** 説明",
+ about_banner_image: "/ignored.png",
+ },
+ contact_information: {
+ community_owner: "日本語の所有者",
+ contact_email: "[email protected]",
+ },
+ your_organization: {
+ company_name: "日本語会社",
+ company_url: "https://example.com/ja",
+ governing_law: "日本法",
+ city_for_disputes: "東京",
+ },
+ }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body.dig("localizations", "title", "value")).to eq("日本語タイトル")
+ expect(
+ response.parsed_body.dig("localizations", "extended_site_description", "cooked"),
+ ).to include("<strong>詳細</strong>")
+
+ expect(response.parsed_body["localizations"].keys).to contain_exactly(
+ "extended_site_description",
+ "site_description",
+ "title",
+ )
+
+ staff_action_log = UserHistory.where(action: UserHistory.actions[:custom_staff]).last
+
+ aggregate_failures do
+ expect(staff_action_log.custom_type).to eq("update_site_setting_localizations")
+ expect(staff_action_log.details).to include("locale: ja")
+ expect(staff_action_log.details).to include(
+ "setting_names: extended_site_description|site_description|title",
+ )
+ end
+ end
+
+ it "removes a localization when the value is blank" do
+ SiteSettingLocalization.create!(
+ setting_name: "site_description",
+ locale: "ja",
+ value: "日本語の説明",
+ )
+
+ put "/admin/config/about/localizations.json",
+ params: {
+ locale: "ja",
+ general_settings: {
+ summary: "",
+ },
+ }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["localizations"]).to be_empty
+ end
+
+ it "rejects unsupported locales" do
+ put "/admin/config/about/localizations.json",
+ params: {
+ locale: "de",
+ general_settings: {
+ name: "Deutsch",
+ },
+ }
+
+ expect(response.status).to eq(400)
+ end
+
+ it "rejects updates when content localization is disabled" do
+ SiteSetting.content_localization_enabled = false
+
+ put "/admin/config/about/localizations.json",
+ params: {
+ locale: "ja",
+ general_settings: {
+ name: "日本語タイトル",
+ },
+ }
+
+ expect(response.status).to eq(403)
+ end
+
+ it "rejects moderator updates" do
+ sign_in(moderator)
+
+ put "/admin/config/about/localizations.json",
+ params: {
+ locale: "ja",
+ general_settings: {
+ name: "日本語タイトル",
+ },
+ }
+
+ expect(response.status).to eq(404)
+ end
+ end
+end
diff --git a/spec/serializers/about_serializer_spec.rb b/spec/serializers/about_serializer_spec.rb
index 17cc47c0e3a..04d8cdd2fd9 100644
--- a/spec/serializers/about_serializer_spec.rb
+++ b/spec/serializers/about_serializer_spec.rb
@@ -3,6 +3,59 @@
RSpec.describe AboutSerializer do
fab!(:user)
+ describe "localized site settings" do
+ before do
+ SiteSetting.content_localization_enabled = true
+ SiteSetting.title = "English title"
+ SiteSetting.site_description = "English description"
+ SiteSetting.extended_site_description = "English **extended** description"
+ SiteSetting.extended_site_description_cooked =
+ PrettyText.markdown(SiteSetting.extended_site_description)
+
+ SiteSettingLocalization.create!(setting_name: "title", locale: "ja", value: "日本語タイトル")
+ SiteSettingLocalization.create!(
+ setting_name: "site_description",
+ locale: "ja",
+ value: "日本語の説明",
+ )
+ SiteSettingLocalization.create!(
+ setting_name: "extended_site_description",
+ locale: "ja",
+ value: "日本語の **詳細** 説明",
+ )
+ end
+
+ it "serializes localized about content" do
+ json =
+ AboutSerializer.new(
+ About.new(user, locale: "ja"),
+ scope: Guardian.new(user),
+ root: nil,
+ ).as_json
+
+ aggregate_failures do
+ expect(json[:title]).to eq("日本語タイトル")
+ expect(json[:description]).to eq("日本語の説明")
+ expect(json[:extended_site_description]).to include("<strong>詳細</strong>")
+ end
+ end
+
+ it "serializes original about content when requested" do
+ json =
+ AboutSerializer.new(
+ About.new(user, locale: "ja", show_original: true),
+ scope: Guardian.new(user),
+ root: nil,
+ ).as_json
+
+ aggregate_failures do
+ expect(json[:title]).to eq("English title")
+ expect(json[:description]).to eq("English description")
+ expect(json[:extended_site_description]).to include("<strong>extended</strong>")
+ end
+ end
+ end
+
context "when login_required is enabled" do
before do
SiteSetting.login_required = true
diff --git a/spec/services/site_setting_localizations/about_config/show_spec.rb b/spec/services/site_setting_localizations/about_config/show_spec.rb
new file mode 100644
index 00000000000..5feca6cb3ab
--- /dev/null
+++ b/spec/services/site_setting_localizations/about_config/show_spec.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+describe SiteSettingLocalizations::AboutConfig::Show do
+ describe described_class::Contract, type: :model do
+ it { is_expected.to validate_presence_of(:locale) }
+ end
+
+ describe ".call" do
+ subject(:result) { described_class.call(params:, **dependencies) }
+
+ fab!(:admin)
+ fab!(:user)
+
+ let(:params) { { locale: } }
+ let(:dependencies) { { guardian: } }
+ let(:guardian) { admin.guardian }
+ let(:locale) { "ja" }
+
+ before do
+ SiteSetting.content_localization_enabled = true
+ SiteSetting.content_localization_supported_locales = "ja|pt_BR"
+ end
+
+ context "when locale is blank" do
+ let(:locale) { nil }
+
+ it { is_expected.to fail_a_contract }
+ end
+
+ context "when the user is not an admin" do
+ let(:guardian) { user.guardian }
+
+ it { is_expected.to fail_a_policy(:can_localize_site_settings) }
+ end
+
+ context "when content localization is disabled" do
+ before { SiteSetting.content_localization_enabled = false }
+
+ it { is_expected.to fail_a_policy(:can_localize_site_settings) }
+ end
+
+ context "with an unsupported locale" do
+ let(:locale) { "de" }
+
+ it { is_expected.to fail_a_policy(:locale_is_supported) }
+ end
+
+ context "when everything is ok" do
+ before do
+ SiteSettingLocalization.create!(setting_name: "title", locale: "ja", value: "日本語タイトル")
+ SiteSettingLocalization.create!(
+ setting_name: "site_description",
+ locale: "pt_BR",
+ value: "Descrição",
+ )
+ end
+
+ it { is_expected.to run_successfully }
+
+ it "returns the localized about settings" do
+ expect(result.payload).to eq(
+ locale: "ja",
+ localizations: {
+ "title" => {
+ value: "日本語タイトル",
+ cooked: nil,
+ },
+ },
+ )
+ end
+ end
+ end
+end
diff --git a/spec/services/site_setting_localizations/about_config/update_spec.rb b/spec/services/site_setting_localizations/about_config/update_spec.rb
new file mode 100644
index 00000000000..31eb0516d01
--- /dev/null
+++ b/spec/services/site_setting_localizations/about_config/update_spec.rb
@@ -0,0 +1,155 @@
+# frozen_string_literal: true
+
+describe SiteSettingLocalizations::AboutConfig::Update do
+ describe described_class::Contract, type: :model do
+ it { is_expected.to validate_presence_of(:locale) }
+ end
+
+ describe ".call" do
+ subject(:result) { described_class.call(params:, **dependencies) }
+
+ fab!(:admin)
+ fab!(:user)
+
+ let(:params) { { locale:, general_settings: } }
+ let(:dependencies) { { guardian: } }
+ let(:guardian) { admin.guardian }
+ let(:locale) { "ja" }
+ let(:general_settings) { { name: "日本語タイトル" } }
+
+ before do
+ SiteSetting.content_localization_enabled = true
+ SiteSetting.content_localization_supported_locales = "ja|pt_BR"
+ end
+
+ context "when locale is blank" do
+ let(:locale) { nil }
+
+ it { is_expected.to fail_a_contract }
+ end
+
+ context "when the user is not an admin" do
+ let(:guardian) { user.guardian }
+
+ it { is_expected.to fail_a_policy(:can_localize_site_settings) }
+ end
+
+ context "when content localization is disabled" do
+ before { SiteSetting.content_localization_enabled = false }
+
+ it { is_expected.to fail_a_policy(:can_localize_site_settings) }
+ end
+
+ context "with an unsupported locale" do
+ let(:locale) { "de" }
+
+ it { is_expected.to fail_a_policy(:locale_is_supported) }
+ end
+
+ context "when everything is ok" do
+ let(:general_settings) do
+ { name: "日本語タイトル", summary: "日本語の説明", extended_description: "日本語の **詳細** 説明" }
+ end
+
+ before do
+ SiteSettingLocalization.create!(setting_name: "title", locale: "ja", value: "古いタイトル")
+ end
+
+ it { is_expected.to run_successfully }
+
+ it "creates and updates localized about settings" do
+ expect { result }.to change {
+ SiteSettingLocalization.find_by(setting_name: "title", locale: "ja")&.value
+ }.from("古いタイトル").to("日本語タイトル").and change {
+ SiteSettingLocalization.exists?(setting_name: "site_description", locale: "ja")
+ }.from(false).to(true)
+
+ expect(
+ SiteSettingLocalization.find_by(
+ setting_name: "extended_site_description",
+ locale: "ja",
+ ).cooked,
+ ).to include("<strong>詳細</strong>")
+ end
+
+ it "logs the changed setting names" do
+ expect { result }.to change { UserHistory.count }.by(1)
+
+ log_record = UserHistory.where(action: UserHistory.actions[:custom_staff]).last
+
+ aggregate_failures do
+ expect(log_record.custom_type).to eq("update_site_setting_localizations")
+ expect(log_record.details).to include("locale: ja")
+ expect(log_record.details).to include(
+ "setting_names: extended_site_description|site_description|title",
+ )
+ end
+ end
+
+ it "returns the updated payload" do
+ expect(result.payload[:localizations].dig("title", :value)).to eq("日本語タイトル")
+ end
+ end
+
+ context "with a blank value" do
+ let(:general_settings) { { summary: "" } }
+
+ before do
+ SiteSettingLocalization.create!(
+ setting_name: "site_description",
+ locale: "ja",
+ value: "日本語の説明",
+ )
+ end
+
+ it "removes the localized setting" do
+ expect { result }.to change {
+ SiteSettingLocalization.exists?(setting_name: "site_description", locale: "ja")
+ }.from(true).to(false)
+ end
+ end
+
+ context "with omitted fields" do
+ let(:general_settings) { { name: "日本語タイトル" } }
+
+ before do
+ SiteSettingLocalization.create!(
+ setting_name: "site_description",
+ locale: "ja",
+ value: "既存の説明",
+ )
+ end
+
+ it "does not change existing rows for omitted fields" do
+ expect { result }.not_to change {
+ SiteSettingLocalization.find_by(setting_name: "site_description", locale: "ja")&.value
+ }
+ end
+ end
+
+ context "with non-general sections" do
+ let(:params) do
+ {
+ locale:,
+ general_settings: {
+ name: "日本語タイトル",
+ },
+ contact_information: {
+ contact_email: "[email protected]",
+ },
+ your_organization: {
+ company_name: "日本語会社",
+ },
+ }
+ end
+
+ it "ignores unsupported about sections" do
+ expect { result }.to change {
+ SiteSettingLocalization.exists?(setting_name: "title", locale: "ja")
+ }.from(false).to(true)
+
+ expect(SiteSettingLocalization.where(locale: "ja").pluck(:setting_name)).to eq(["title"])
+ end
+ end
+ end
+end
diff --git a/spec/services/staff_action_logger_spec.rb b/spec/services/staff_action_logger_spec.rb
index 7424c5e8f61..3a29f33320d 100644
--- a/spec/services/staff_action_logger_spec.rb
+++ b/spec/services/staff_action_logger_spec.rb
@@ -264,6 +264,32 @@ RSpec.describe StaffActionLogger do
end
end
+ describe "log_update_site_setting_localizations" do
+ it "raises an error when params are invalid" do
+ expect {
+ logger.log_update_site_setting_localizations(locale: nil, setting_names: ["title"])
+ }.to raise_error(Discourse::InvalidParameters)
+ expect {
+ logger.log_update_site_setting_localizations(locale: "ja", setting_names: [])
+ }.to raise_error(Discourse::InvalidParameters)
+ end
+
+ it "creates a custom staff UserHistory record" do
+ log_record =
+ logger.log_update_site_setting_localizations(
+ locale: "ja",
+ setting_names: %w[title site_description title],
+ )
+
+ aggregate_failures do
+ expect(log_record.action).to eq(UserHistory.actions[:custom_staff])
+ expect(log_record.custom_type).to eq("update_site_setting_localizations")
+ expect(log_record.details).to include("locale: ja")
+ expect(log_record.details).to include("setting_names: site_description|title")
+ end
+ end
+ end
+
describe "log_theme_change" do
fab!(:theme)
diff --git a/spec/system/admin_about_config_area_spec.rb b/spec/system/admin_about_config_area_spec.rb
index 15910ec3c7d..7b441c9b59b 100644
--- a/spec/system/admin_about_config_area_spec.rb
+++ b/spec/system/admin_about_config_area_spec.rb
@@ -5,6 +5,7 @@ describe "Admin About Config Area Page" do
fab!(:image_upload)
let(:config_area) { PageObjects::Pages::AdminAboutConfigArea.new }
+ let(:about_page) { PageObjects::Pages::About.new }
let!(:extra_group_1) { Fabricate(:group, name: "extra1") }
let!(:extra_group_2) { Fabricate(:group, name: "extra2") }
@@ -260,4 +261,91 @@ describe "Admin About Config Area Page" do
expect(SiteSetting.about_page_extra_groups_show_description).to eq(false)
end
end
+
+ describe "localized about content" do
+ before do
+ SiteSetting.allow_user_locale = true
+ SiteSetting.content_localization_enabled = true
+ SiteSetting.content_localization_supported_locales = "ja"
+ SiteSetting.title = "English community"
+ SiteSetting.site_description = "English summary"
+ SiteSetting.extended_site_description = "English **description**"
+ SiteSetting.extended_site_description_cooked =
+ PrettyText.markdown(SiteSetting.extended_site_description)
+ SiteSetting.community_owner = "English owner"
+ SiteSetting.company_name = "English company"
+ end
+
+ it "lets admins edit and view about page translations" do
+ config_area.visit
+
+ expect(config_area).to have_language_toolbar
+
+ config_area.select_locale("ja")
+
+ expect(config_area.general_settings_section).to have_no_banner_image_field
+ expect(config_area.general_settings_section).to have_no_community_title_field
+ expect(config_area).to have_no_contact_information_section
+ expect(config_area).to have_no_your_organization_section
+ expect(config_area).to have_no_group_listing_section
+ expect(config_area).to have_locale_description
+
+ config_area.general_settings_section.community_name_input.fill_in("日本語コミュニティ")
+ config_area.general_settings_section.community_summary_input.fill_in("日本語の概要")
+ config_area.general_settings_section.community_description_editor.fill_in("日本語の **詳細** 説明")
+ config_area.general_settings_section.submit
+ expect(config_area.general_settings_section).to have_saved_successfully
+
+ page.refresh
+ config_area.select_locale("ja")
+
+ expect(config_area.general_settings_section.community_name_input.value).to eq("日本語コミュニティ")
+ expect(config_area.general_settings_section.community_summary_input.value).to eq("日本語の概要")
+
+ sign_in(Fabricate(:user, locale: "ja"))
+ about_page.visit
+
+ expect(about_page).to have_header_title("日本語コミュニティ")
+ expect(about_page).to have_short_description("日本語の概要")
+ expect(about_page).to have_extended_description("日本語の 詳細 説明")
+ end
+
+ it "prevents clearing a required default field and lets admins clear a translated field" do
+ SiteSettingLocalization.create!(setting_name: "title", locale: "ja", value: "日本語コミュニティ")
+
+ config_area.visit
+
+ config_area.general_settings_section.community_name_input.fill_in("")
+ config_area.general_settings_section.submit
+
+ expect(config_area.general_settings_section.community_name_input).to have_errors(
+ I18n.t("js.form_kit.errors.required"),
+ )
+
+ config_area.select_locale("ja")
+
+ expect(config_area.general_settings_section.community_name_input.value).to eq("日本語コミュニティ")
+
+ config_area.general_settings_section.community_name_input.fill_in("")
+ config_area.general_settings_section.submit
+ expect(config_area.general_settings_section).to have_saved_successfully
+
+ page.refresh
+ config_area.select_locale("ja")
+
+ expect(config_area.general_settings_section.community_name_input.value).to eq("")
+
+ about_page.visit(locale: "ja")
+
+ expect(about_page).to have_header_title("English community")
+ end
+ end
+
+ it "keeps language controls hidden when content localization is disabled" do
+ SiteSetting.content_localization_enabled = false
+
+ config_area.visit
+
+ expect(config_area).to have_no_language_toolbar
+ end
end
diff --git a/spec/system/content_localization_spec.rb b/spec/system/content_localization_spec.rb
index 8fc44bf9752..07c763f0cb9 100644
--- a/spec/system/content_localization_spec.rb
+++ b/spec/system/content_localization_spec.rb
@@ -38,6 +38,7 @@ describe "Content Localization" do
let(:topic_list) { PageObjects::Components::TopicList.new }
let(:composer) { PageObjects::Components::Composer.new }
let(:translation_composer) { PageObjects::Components::TranslationComposer.new }
+ let(:about_page) { PageObjects::Pages::About.new }
let(:post_1_obj) { PageObjects::Components::Post.new(1) }
let(:post_3_obj) { PageObjects::Components::Post.new(3) }
let(:post_4_obj) { PageObjects::Components::Post.new(4) }
@@ -196,6 +197,31 @@ describe "Content Localization" do
expect(topic_page.has_topic_title?("Life strategies from The Art of War")).to eq(true)
end
+
+ it "lets anonymous users view the localized about page" do
+ SiteSetting.title = "English community"
+ SiteSetting.site_description = "English community description"
+ SiteSetting.extended_site_description = "English **extended** description"
+ SiteSetting.extended_site_description_cooked =
+ PrettyText.markdown(SiteSetting.extended_site_description)
+ SiteSettingLocalization.create!(setting_name: "title", locale: "ja", value: "日本語コミュニティ")
+ SiteSettingLocalization.create!(
+ setting_name: "site_description",
+ locale: "ja",
+ value: "日本語のコミュニティ説明",
+ )
+ SiteSettingLocalization.create!(
+ setting_name: "extended_site_description",
+ locale: "ja",
+ value: "日本語の **詳細** 説明",
+ )
+
+ about_page.visit(locale: "ja")
+
+ expect(about_page).to have_header_title("日本語コミュニティ")
+ expect(about_page).to have_short_description("日本語のコミュニティ説明")
+ expect(about_page).to have_extended_description("日本語の 詳細 説明")
+ end
end
context "when editing" do
diff --git a/spec/system/page_objects/components/admin_about_config_area_contact_information_card.rb b/spec/system/page_objects/components/admin_about_config_area_contact_information_card.rb
index 845307ab2d9..41d6d7bd9f5 100644
--- a/spec/system/page_objects/components/admin_about_config_area_contact_information_card.rb
+++ b/spec/system/page_objects/components/admin_about_config_area_contact_information_card.rb
@@ -27,6 +27,13 @@ module PageObjects
)
end
+ def has_translation_fields_only?
+ form.has_no_field_with_name?("contactEmail") &&
+ form.has_no_field_with_name?("contactURL") &&
+ form.has_no_field_with_name?("contactUsername") &&
+ form.has_no_field_with_name?("contactGroupName")
+ end
+
def submit
form.submit
end
diff --git a/spec/system/page_objects/components/admin_about_config_area_general_settings_card.rb b/spec/system/page_objects/components/admin_about_config_area_general_settings_card.rb
index dbd788b9548..d2786e6e3dd 100644
--- a/spec/system/page_objects/components/admin_about_config_area_general_settings_card.rb
+++ b/spec/system/page_objects/components/admin_about_config_area_general_settings_card.rb
@@ -23,6 +23,14 @@ module PageObjects
PageObjects::Components::UppyImageUploader.new(card.find(".file-uploader"))
end
+ def has_no_banner_image_field?
+ form.has_no_field_with_name?("aboutBannerImage")
+ end
+
+ def has_no_community_title_field?
+ form.has_no_field_with_name?("communityTitle")
+ end
+
def submit
form.submit
end
diff --git a/spec/system/page_objects/pages/about.rb b/spec/system/page_objects/pages/about.rb
index 3a2a5a85d16..341d72a3d47 100644
--- a/spec/system/page_objects/pages/about.rb
+++ b/spec/system/page_objects/pages/about.rb
@@ -3,8 +3,10 @@
module PageObjects
module Pages
class About < PageObjects::Pages::Base
- def visit
- page.visit("/about")
+ def visit(locale: nil)
+ path = "/about"
+ path += "?#{Discourse::LOCALE_PARAM}=#{locale}" if locale
+ page.visit(path)
end
def has_header_title?(title)
@@ -15,6 +17,10 @@ module PageObjects
has_css?(".about__header .short-description", text: content)
end
+ def has_extended_description?(content)
+ has_css?(".about__left-side", text: content)
+ end
+
def has_banner_image?(upload)
has_css?("img.about__banner-img[src=\"#{GlobalPath.full_cdn_url(upload.url)}\"]")
end
diff --git a/spec/system/page_objects/pages/admin_about_config_area.rb b/spec/system/page_objects/pages/admin_about_config_area.rb
index 2bf83bb7def..07803d2060d 100644
--- a/spec/system/page_objects/pages/admin_about_config_area.rb
+++ b/spec/system/page_objects/pages/admin_about_config_area.rb
@@ -7,6 +7,12 @@ module PageObjects
page.visit("/admin/config/about")
end
+ def select_locale(locale)
+ find(
+ ".admin-config-area-about__locale-selector-dropdown option[value='#{locale}']",
+ ).select_option
+ end
+
def general_settings_section
PageObjects::Components::AdminAboutConfigAreaGeneralSettingsCard.new
end
@@ -22,6 +28,33 @@ module PageObjects
def group_listing_section
PageObjects::Components::AdminAboutConfigAreaGroupListingCard.new
end
+
+ def has_no_group_listing_section?
+ has_no_css?(".admin-config-area-about__extra-groups-section")
+ end
+
+ def has_no_contact_information_section?
+ has_no_css?(".admin-config-area-about__contact-information-section")
+ end
+
+ def has_no_your_organization_section?
+ has_no_css?(".admin-config-area-about__your-organization-section")
+ end
+
+ def has_language_toolbar?
+ has_css?(".admin-config-area__primary-content > .admin-config-area-about__language-toolbar")
+ end
+
+ def has_no_language_toolbar?
+ has_no_css?(".admin-config-area-about__language-toolbar")
+ end
+
+ def has_locale_description?
+ has_css?(
+ ".admin-config-area-about__locale-selector .form-kit__container-help-text",
+ text: "Only translatable About page fields are shown.",
+ )
+ end
end
end
end