Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

478d635109def1232a790c60319ac1.
10 years ago · 7e34ce48bf
parent 08f625446e 7b72f8c59b
commit 7e34ce48bf
1 changed files with 1 additions and 1 deletions
--- a/lib/redmine/plugin.rb
+++ b/lib/redmine/plugin.rb
@ -77,7 +77,7 @@ module Redmine #:nodoc:
      # Adds plugin locales if any
      # YAML translation files should be found under <plugin>/config/locales/
      ::I18n.load_path += Dir.glob(File.join(p.directory, 'config', 'locales', '*.yml'))
-
+      ::I18n.load_path += Dir.glob(File.join(Rails.root, 'config', 'locales', '**','*.yml'))
      # Prepends the app/views directory of the plugin to the view path
      view_path = File.join(p.directory, 'app', 'views')
      if File.directory?(view_path)