diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-27 14:43:06 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-27 14:43:06 -0800 |
| commit | 1cd949006a419807d5ae3400442942b752780ca2 (patch) | |
| tree | 0a6f25c7caa7735ae13f395b7311405fa4a96260 /activesupport | |
| parent | 9521fcbcc295cb1dd34f7d458c40790466a55244 (diff) | |
| download | rails-1cd949006a419807d5ae3400442942b752780ca2.tar.gz rails-1cd949006a419807d5ae3400442942b752780ca2.tar.bz2 rails-1cd949006a419807d5ae3400442942b752780ca2.zip | |
Fix the i18n dependency problem
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support.rb | 3 | ||||
| -rw-r--r-- | activesupport/lib/active_support/all.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/array/conversions.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/i18n.rb | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index f2baa5a56a..8215cfaf0d 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -70,6 +70,3 @@ module ActiveSupport end require 'active_support/vendor' - -require 'i18n' -I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml" diff --git a/activesupport/lib/active_support/all.rb b/activesupport/lib/active_support/all.rb index f537818300..64600575d9 100644 --- a/activesupport/lib/active_support/all.rb +++ b/activesupport/lib/active_support/all.rb @@ -1,3 +1,4 @@ require 'active_support' +require 'active_support/i18n' require 'active_support/time' require 'active_support/core_ext' diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb index db140225e8..7fcef38372 100644 --- a/activesupport/lib/active_support/core_ext/array/conversions.rb +++ b/activesupport/lib/active_support/core_ext/array/conversions.rb @@ -1,6 +1,7 @@ require 'active_support/core_ext/hash/keys' require 'active_support/core_ext/hash/reverse_merge' require 'active_support/inflector' +require 'active_support/i18n' class Array # Converts the array to a comma-separated sentence where the last element is joined by the connector word. Options: diff --git a/activesupport/lib/active_support/i18n.rb b/activesupport/lib/active_support/i18n.rb new file mode 100644 index 0000000000..854c60eec1 --- /dev/null +++ b/activesupport/lib/active_support/i18n.rb @@ -0,0 +1,2 @@ +require 'i18n' +I18n.load_path << "#{File.dirname(__FILE__)}/locale/en.yml"
\ No newline at end of file |