Skip to content

Commit d799051

Browse files
committed
Fix failed test #44
Support to the change in the format of I18n.backend.load_yml results in Redmine 5.0.
1 parent 66ff949 commit d799051

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lib/message_customize/locale.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ module Locale
77

88
class << self
99
def available_locales
10-
@available_locales ||= I18n.load_path.map {|path| File.basename(path, '.*')}.uniq.sort.map(&:to_sym)
10+
@available_locales ||= Rails.application.config.i18n.load_path.map {|path| File.basename(path, '.*')}.uniq.sort.map(&:to_sym)
1111
end
1212

1313
def reload!(*languages)
1414
available_languages = self.find_language(languages.flatten)
15-
paths = I18n.load_path.select {|path| available_languages.include?(File.basename(path, '.*').to_s)}
15+
paths = Rails.application.config.i18n.load_path.select {|path| available_languages.include?(File.basename(path, '.*').to_s)}
1616
I18n.backend.load_translations(paths)
1717
if customizable_plugin_messages?
1818
available_languages.each{|lang| @available_messages[:"#{lang}"] = I18n.backend.send(:translations)[:"#{lang}"] || {}}
@@ -22,7 +22,7 @@ def reload!(*languages)
2222
if File.exist?(redmine_root_locale_path)
2323
loaded_yml = I18n.backend.send(:load_yml, redmine_root_locale_path)
2424
loaded_yml = loaded_yml.first if loaded_yml.is_a?(Array)
25-
@available_messages[:"#{lang}"] = (loaded_yml[lang] || {}).deep_symbolize_keys
25+
@available_messages[:"#{lang}"] = (loaded_yml[lang] || loaded_yml[lang.to_sym] || {}).deep_symbolize_keys
2626
end
2727
end
2828
end

0 commit comments

Comments
 (0)