File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -7,12 +7,12 @@ module Locale
7
7
8
8
class << self
9
9
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 )
11
11
end
12
12
13
13
def reload! ( *languages )
14
14
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 ) }
16
16
I18n . backend . load_translations ( paths )
17
17
if customizable_plugin_messages?
18
18
available_languages . each { |lang | @available_messages [ :"#{ lang } " ] = I18n . backend . send ( :translations ) [ :"#{ lang } " ] || { } }
@@ -22,7 +22,7 @@ def reload!(*languages)
22
22
if File . exist? ( redmine_root_locale_path )
23
23
loaded_yml = I18n . backend . send ( :load_yml , redmine_root_locale_path )
24
24
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
26
26
end
27
27
end
28
28
end
You can’t perform that action at this time.
0 commit comments