diff --git a/Gemfile b/Gemfile index 299af4509..f3bc0612a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source 'http://rubygems.org' +source 'http://ruby.taobao.org' #source 'http://ruby.sdutlinux.org/' unless RUBY_PLATFORM =~ /w32/ diff --git a/lib/redmine/plugin.rb b/lib/redmine/plugin.rb index 30c182d17..1185cd016 100644 --- 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 /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)