X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/782ddc9c3e652439ba98ad9f0216146b432830fe..5f0868bd49fcc2707f3758094c8356d2655e993d:/config/initializers/i18n.rb

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 82fd62df5..906d59c2d 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -11,17 +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
@@ -33,8 +34,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