Monkey patch in an upstream fix for I18n::Backend::Fallbacks

[rails.git] / config / initializers / i18n.rb

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 7b5db5aabf1d2c0babbc914924bfa0813a6fe408..906d59c2d9402f33907fe5da7c78690f04aa9206 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -11,19 +11,18 @@ module I18n
           store_translations(:nb, translations[:no])
           translations[:no] = translations[:nb]
 
-          friendly = translate('en', 'time.formats.friendly')
-
-          available_locales.each do |locale|
-            unless lookup(locale, 'time.formats.friendly')
-              store_translations(locale, :time => { :formats => { :friendly => friendly } })
-            end
-          end
-
           @skip_syntax_deprecation = true
         end
       end
     end
 
+    module Fallbacks
+      def find_first_string_or_lambda_default(defaults)
+        defaults.each_with_index { |default, ix| return ix if default && !default.is_a?(Symbol) }
+        nil
+      end
+    end
+
     module PluralizationFallback
       def pluralize(locale, entry, count)
         super
@@ -35,11 +34,11 @@ module I18n
   end
 end
 
-I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization)
-I18n::Backend::Simple.send(:include, I18n::Backend::PluralizationFallback)
+I18n::Backend::Simple.include(I18n::Backend::Pluralization)
+I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
 I18n.load_path << "#{Rails.root}/config/pluralizers.rb"
 
-I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
+I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
 
 Rails.configuration.after_initialize do
   I18n.reload!