Skip to content

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

FIX: don't cache localized color scheme name (#38317)

Kris855fe2606636
diff --git a/app/models/color_scheme.rb b/app/models/color_scheme.rb
index 4a5c14aa55f..983a4048f2b 100644
--- a/app/models/color_scheme.rb
+++ b/app/models/color_scheme.rb
@@ -406,16 +406,17 @@ class ColorScheme < ActiveRecord::Base
end
def self.base
- return @base_color_scheme if @base_color_scheme
- @base_color_scheme =
- new(
- id: NAMES_TO_ID_MAP[LIGHT_PALETTE_NAME],
- name: I18n.t("admin_js.admin.customize.theme.default_light_scheme"),
- )
- @base_color_scheme.colors = base_colors.map { |name, hex| { name: name, hex: hex } }
- @base_color_scheme.is_base = true
- @base_color_scheme.is_builtin_default = true
- @base_color_scheme
+ @base_color_scheme ||=
+ begin
+ scheme = new(id: NAMES_TO_ID_MAP[LIGHT_PALETTE_NAME], name: LIGHT_PALETTE_NAME)
+ scheme.colors = base_colors.map { |name, hex| { name: name, hex: hex } }
+ scheme.is_base = true
+ scheme.is_builtin_default = true
+ scheme.define_singleton_method(:name) do
+ I18n.t("admin_js.admin.customize.theme.default_light_scheme")
+ end
+ scheme
+ end
end
def self.is_base?(scheme_name)
diff --git a/lib/stylesheet/manager.rb b/lib/stylesheet/manager.rb
index 31fd678a04c..2b7f2a727ea 100644
--- a/lib/stylesheet/manager.rb
+++ b/lib/stylesheet/manager.rb
@@ -43,7 +43,7 @@ class Stylesheet::Manager
end
def self.color_scheme_cache_key(color_scheme, theme_id = nil)
- color_scheme_name = Slug.for(color_scheme.name) + color_scheme&.id.to_s
+ color_scheme_name = Slug.for(color_scheme.read_attribute(:name)) + color_scheme&.id.to_s
theme_string = theme_id ? "_theme#{theme_id}" : ""
"#{COLOR_SCHEME_STYLESHEET}_#{color_scheme_name}_#{theme_string}_#{Discourse.current_hostname}_#{GlobalSetting.relative_url_root}"
end