X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/420a7289a0b08eee091f6650c2e83166df3fbe69..08fa95cbfcc3a2ebaa8fb693c8a2c42c9734010f:/config/initializers/i18n.rb

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index b4399a9f8..8f74c3cd3 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -3,10 +3,10 @@ module I18n
     module PluralizationFallback
       def pluralize(locale, entry, count)
         super
-      rescue InvalidPluralizationData => ex
-        raise ex unless ex.entry.key?(:other)
+      rescue InvalidPluralizationData => e
+        raise e unless e.entry.key?(:other)
 
-        ex.entry[:other]
+        e.entry[:other]
       end
     end
   end
@@ -18,7 +18,7 @@ module OpenStreetMap
       def store_translations(locale, data, options = {})
         locale = ::I18n::Locale::Tag::Rfc4646.tag(locale).to_s
 
-        super(locale, data, options)
+        super
       end
     end
 
@@ -42,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