Unforce i18n from AS

Signed-off-by: José Valim <[email protected]>

Author: spastorino

actionpack/actionpack.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('activesupport', version)
   s.add_dependency('activemodel',   version)
+  s.add_dependency('i18n',          '~> 0.4.0')
   s.add_dependency('rack',          '~> 1.1.0')
   s.add_dependency('rack-test',     '~> 0.5.4')
   s.add_dependency('rack-mount',    '~> 0.6.3')

activemodel/activemodel.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
   s.has_rdoc = true
 
   s.add_dependency('activesupport', version)
+  s.add_dependency('i18n',          '~> 0.4.0')
 end

activesupport/activesupport.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
 
   s.has_rdoc = true
 
-  s.add_dependency('i18n',            '~> 0.4.0')
   s.add_dependency('tzinfo',          '~> 0.3.16')
   s.add_dependency('builder',         '~> 2.1.2')
   s.add_dependency('memcache-client', '>= 1.7.5')

activesupport/lib/active_support/core_ext/array/conversions.rb

@@ -9,9 +9,15 @@ class Array
   # * <tt>:two_words_connector</tt> - The sign or word used to join the elements in arrays with two elements (default: " and ")
   # * <tt>:last_word_connector</tt> - The sign or word used to join the last element in arrays with three or more elements (default: ", and ")
   def to_sentence(options = {})
-    default_words_connector     = I18n.translate(:'support.array.words_connector',     :locale => options[:locale])
-    default_two_words_connector = I18n.translate(:'support.array.two_words_connector', :locale => options[:locale])
-    default_last_word_connector = I18n.translate(:'support.array.last_word_connector', :locale => options[:locale])
+    if defined?(I18n)
+      default_words_connector     = I18n.translate(:'support.array.words_connector',     :locale => options[:locale])
+      default_two_words_connector = I18n.translate(:'support.array.two_words_connector', :locale => options[:locale])
+      default_last_word_connector = I18n.translate(:'support.array.last_word_connector', :locale => options[:locale])
+    else
+      default_words_connector     = ", "
+      default_two_words_connector = " and "
+      default_last_word_connector = ", and "
+    end
 
     options.assert_valid_keys(:words_connector, :two_words_connector, :last_word_connector, :locale)
     options.reverse_merge! :words_connector => default_words_connector, :two_words_connector => default_two_words_connector, :last_word_connector => default_last_word_connector

activesupport/lib/active_support/core_ext/string/interpolation.rb

@@ -1 +1,2 @@
+require 'active_support/i18n'
 require 'i18n/core_ext/string/interpolate'

activesupport/lib/active_support/i18n.rb

@@ -1,3 +1,8 @@
-require 'i18n'
+begin
+  require 'i18n'
+rescue LoadError => e
+  $stderr.puts "You don't have i18n installed in your application. Please add it to your Gemfile and run bundle install"
+  raise e
+end
 I18n.load_path << "#{File.dirname(__FILE__)}/locale/en.yml"
-ActiveSupport.run_load_hooks(:i18n)
+ActiveSupport.run_load_hooks(:i18n)