Merge remote-tracking branch 'upstream/pull/5809'

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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 8f74c3cd39455a0b5548aa8d6a364da9259a1309..a316db408dfdc06e92a7abe02cbc0e79bd4bdb19 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -21,25 +21,14 @@ module OpenStreetMap
         super
       end
     end
-
-    module ValidateLocales
-      def default_fallbacks
-        super.select do |locale|
-          ::I18n.available_locales.include?(locale)
-        end
-      end
-    end
   end
 end
 
 I18n::Backend::Simple.prepend(OpenStreetMap::I18n::NormaliseLocales)
-I18n::JS::FallbackLocales.prepend(OpenStreetMap::I18n::ValidateLocales)
 
 I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
 I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
 
-I18n.fallbacks.map("no" => "nb")
-
 I18n.enforce_available_locales = false
 
 if Rails.env.test?