Use I18n::Backend::Simple.include directly

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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 82fd62df5fdc38cab5e083d1d039e74db687d1c0..87bfe611f42592170eb405b865a5fd337c4e7ce3 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -18,6 +18,8 @@ module I18n
               store_translations(locale, :time => { :formats => { :friendly => friendly } })
             end
           end
+
+          @skip_syntax_deprecation = true
         end
       end
     end
@@ -33,8 +35,12 @@ module I18n
   end
 end
 
-I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization)
-I18n::Backend::Simple.send(:include, I18n::Backend::PluralizationFallback)
-I18n.load_path << RAILS_ROOT + "/config/pluralizers.rb"
+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.include(I18n::Backend::Fallbacks)
 
-I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
+Rails.configuration.after_initialize do
+  I18n.reload!
+end