diff --git a/app/assets/javascripts/select-kit/addon/components/color-palettes.js b/app/assets/javascripts/select-kit/addon/components/color-palettes.js index acb374f29f9..66d92e7a26a 100644 --- a/app/assets/javascripts/select-kit/addon/components/color-palettes.js +++ b/app/assets/javascripts/select-kit/addon/components/color-palettes.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import ComboBoxComponent from "select-kit/components/combo-box"; export default ComboBoxComponent.extend({ @@ -6,5 +7,9 @@ export default ComboBoxComponent.extend({ modifyComponentForRow() { return "color-palettes/color-palettes-row"; + }, + + selectKitOptions: { + translatedNone: I18n.t("admin.customize.theme.default_light_scheme") } }); diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb index a78a38f618b..8d70ea9afa8 100644 --- a/app/controllers/admin/themes_controller.rb +++ b/app/controllers/admin/themes_controller.rb @@ -135,7 +135,7 @@ class Admin::ThemesController < Admin::AdminController theme_fields: :upload ) @color_schemes = ColorScheme.all.includes(:theme, color_scheme_colors: :color_scheme).to_a - light = ColorScheme.new(name: I18n.t("color_schemes.light")) + light = ColorScheme.new(name: I18n.t("color_schemes.light_default")) @color_schemes.unshift(light) payload = { diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 6ac1680edd1..ad29da0b9be 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -3647,7 +3647,7 @@ en: use_global_key: Global Key (allows all actions) scopes: description: | - When using scopes, you can restrict an API key to a specific set of endpoints. + When using scopes, you can restrict an API key to a specific set of endpoints. You can also define which parameters will be allowed. Use commas to separate multiple values. title: Scopes resource: Resource @@ -3909,6 +3909,7 @@ en: is_default: "Theme is enabled by default" user_selectable: "Theme can be selected by users" color_scheme: "Color Palette" + default_light_scheme: "Light (default)" color_scheme_select: "Select colors to be used by theme" custom_sections: "Custom sections:" theme_components: "Theme Components" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 3219e5300d5..840a54a0422 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -3872,6 +3872,7 @@ en: color_schemes: base_theme_name: "Base" light: "Light" + light_default: "Light (default)" dark: "Dark" neutral: "Neutral" grey_amber: "Grey Amber"