X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/aa1fb6dbb8c2e71b8ce8c231ae1272a2dfebd75a..efc65b86a23032e7867314082f80e1da3654b51a:/config/initializers/i18n.rb

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 89ff677fb..a316db408 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -3,9 +3,10 @@ module I18n
     module PluralizationFallback
       def pluralize(locale, entry, count)
         super
-      rescue InvalidPluralizationData => ex
-        raise ex unless ex.entry.key?(:other)
-        ex.entry[:other]
+      rescue InvalidPluralizationData => e
+        raise e unless e.entry.key?(:other)
+
+        e.entry[:other]
       end
     end
   end
@@ -17,30 +18,25 @@ module OpenStreetMap
       def store_translations(locale, data, options = {})
         locale = ::I18n::Locale::Tag::Rfc4646.tag(locale).to_s
 
-        super(locale, data, options)
-      end
-    end
-
-    module ValidateLocales
-      def default_fallbacks
-        super.select do |locale|
-          ::I18n.available_locales.include?(locale)
-        end
+        super
       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?
+  I18n.exception_handler = proc do |exception|
+    raise exception.to_exception
+  end
+end
+
 Rails.configuration.after_initialize do
   I18n.available_locales
 end