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

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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index fff69378baf7246fda9e65fda0737fdebcb9479b..8f74c3cd39455a0b5548aa8d6a364da9259a1309 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -3,21 +3,22 @@ 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
 end
 
-module OSM
+module OpenStreetMap
   module I18n
     module NormaliseLocales
       def store_translations(locale, data, options = {})
         locale = ::I18n::Locale::Tag::Rfc4646.tag(locale).to_s
 
-        super(locale, data, options)
+        super
       end
     end
 
@@ -31,8 +32,8 @@ module OSM
   end
 end
 
-I18n::Backend::Simple.prepend(OSM::I18n::NormaliseLocales)
-I18n::JS::FallbackLocales.prepend(OSM::I18n::ValidateLocales)
+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)
@@ -41,6 +42,12 @@ 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