github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 07:06:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Theme components should work with empty locale files (#18167)

Browse Source 
Theme components didn't work with empty locale files (just the locale key without any translations) that are created by translator-bot.
This commit is contained in:
Gerhard Schlager
2022-09-02 18:28:18 +02:00
committed by GitHub
parent 73a2d2e9ac
commit fd6109a6e1
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/theme_translation_parser.rb
View File

@ -10,7 +10,7 @@ class ThemeTranslationParser
end
def self.check_contains_hashes(hash)
hash.all? { |key, value| value.is_a?(String) || (value.is_a?(Hash) && self.check_contains_hashes(value)) }
hash.all? { |_key, value| value.is_a?(String) || (value.is_a?(Hash) && self.check_contains_hashes(value)) }
end
def load
@ -21,13 +21,18 @@ class ThemeTranslationParser
rescue Psych::SyntaxError, Psych::DisallowedClass => e
raise InvalidYaml.new(e.message)
end
raise InvalidYaml.new(I18n.t("themes.locale_errors.invalid_yaml")) unless parsed.is_a?(Hash) && ThemeTranslationParser.check_contains_hashes(parsed)
raise InvalidYaml.new(I18n.t("themes.locale_errors.top_level_locale")) unless parsed.keys.length == 1 && parsed.keys[0] == @setting_field.name
raise InvalidYaml.new(I18n.t("themes.locale_errors.invalid_yaml")) if !parsed.is_a?(Hash)
raise InvalidYaml.new(I18n.t("themes.locale_errors.top_level_locale")) if parsed.keys.length != 1 || parsed.keys.first != @setting_field.name
key = @setting_field.name.to_sym
parsed.deep_symbolize_keys!
parsed[key] ||= {}
parsed[@setting_field.name.to_sym].slice!(*INTERNAL_KEYS) if @internal
parsed[@setting_field.name.to_sym].except!(*INTERNAL_KEYS) if !@internal
raise InvalidYaml.new(I18n.t("themes.locale_errors.invalid_yaml")) if !ThemeTranslationParser.check_contains_hashes(parsed)
parsed[key].slice!(*INTERNAL_KEYS) if @internal
parsed[key].except!(*INTERNAL_KEYS) if !@internal
parsed
end