Merge branch 'master' of github.com:rails/rails

4 files changed, 36 insertions, 20 deletions

diff --git a/activesupport/lib/active_support/core_ext/string/multibyte.rb b/activesupport/lib/active_support/core_ext/string/multibyte.rb
index 13208c6ee2..42e053d0f8 100644
--- a/activesupport/lib/active_support/core_ext/string/multibyte.rb
+++ b/activesupport/lib/active_support/core_ext/string/multibyte.rb
@@ -49,13 +49,6 @@ class String
     def is_utf8?
       ActiveSupport::Multibyte::Chars.consumes?(self)
     end
-
-    unless '1.8.7 and later'.respond_to?(:chars)
-      def chars
-        ActiveSupport::Deprecation.warn('String#chars has been deprecated in favor of String#mb_chars.', caller)
-        mb_chars
-      end
-    end
   else
     def mb_chars #:nodoc
       self
diff --git a/activesupport/lib/active_support/railtie.rb b/activesupport/lib/active_support/railtie.rb
index b8d54ff839..0243157e35 100644
--- a/activesupport/lib/active_support/railtie.rb
+++ b/activesupport/lib/active_support/railtie.rb
@@ -33,6 +33,7 @@ module I18n
     config.i18n = ActiveSupport::OrderedOptions.new
     config.i18n.railties_load_path = []
     config.i18n.load_path = []
+    config.i18n.fallbacks = ActiveSupport::OrderedOptions.new
 
     initializer "i18n.initialize" do
       ActiveSupport.on_load(:i18n) do
@@ -53,6 +54,8 @@ module I18n
           app.config.i18n.load_path.unshift(*value)
         when :load_path
           I18n.load_path += value
+        when :fallbacks
+          init_fallbacks(value) if value && validate_fallbacks(value)
         else
           I18n.send("#{setting}=", value)
         end
@@ -60,5 +63,37 @@ module I18n
 
       I18n.reload!
     end
+
+    class << self
+      protected
+
+        def init_fallbacks(fallbacks)
+          include_fallbacks_module
+          args = case fallbacks
+          when ActiveSupport::OrderedOptions
+            [*(fallbacks[:defaults] || []) << fallbacks[:map]].compact
+          when Hash, Array
+            Array.wrap(fallbacks)
+          else # TrueClass
+            []
+          end
+          I18n.fallbacks = I18n::Locale::Fallbacks.new(*args)
+        end
+
+        def include_fallbacks_module
+          I18n.backend.class.send(:include, I18n::Backend::Fallbacks)
+        end
+      
+        def validate_fallbacks(fallbacks)
+          case fallbacks
+          when ActiveSupport::OrderedOptions
+            !fallbacks.empty?
+          when TrueClass, Array, Hash
+            true
+          else
+            raise "Unexpected fallback type #{fallbacks.inspect}"
+          end
+        end
+    end
   end
 end
\ No newline at end of file
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index 234e41c772..58ca215970 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -230,18 +230,6 @@ class CoreExtStringMultibyteTest < ActiveSupport::TestCase
     assert !BYTE_STRING.is_utf8?
   end
 
-  if RUBY_VERSION < '1.8.7'
-    def test_core_ext_adds_chars
-      assert UNICODE_STRING.respond_to?(:chars)
-    end
-
-    def test_chars_warns_about_deprecation
-      assert_deprecated("String#chars") do
-        ''.chars
-      end
-    end
-  end
-
   if RUBY_VERSION < '1.9'
     def test_mb_chars_returns_self_when_kcode_not_set
       with_kcode('none') do
diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb
index 58035ebbcd..3b7fbb7808 100644
--- a/activesupport/test/time_zone_test.rb
+++ b/activesupport/test/time_zone_test.rb
@@ -282,7 +282,7 @@ class TimeZoneTest < Test::Unit::TestCase
 
   def test_unknown_zone_with_utc_offset
     zone = ActiveSupport::TimeZone.create("bogus", -21_600)
-    assert_equal -21_600, zone.utc_offset
+    assert_equal(-21_600, zone.utc_offset)
   end
 
   def test_new