From a4a9b2dfdd2cdd3d7fa0d6344b73a8aec4dbfc45 Mon Sep 17 00:00:00 2001 From: whimlex Date: Tue, 10 Mar 2015 10:43:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E6=8F=92?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 +- lib/redmine/plugin.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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) From 7b72f8c59bf95ec4323f290a83509bf6272b0bd2 Mon Sep 17 00:00:00 2001 From: whimlex Date: Tue, 10 Mar 2015 10:48:48 +0800 Subject: [PATCH 2/2] source 'http://rubygems.org' --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index f3bc0612a..299af4509 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source 'http://ruby.taobao.org' +source 'http://rubygems.org' #source 'http://ruby.sdutlinux.org/' unless RUBY_PLATFORM =~ /w32/