X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e660e609661edadc1ed5ad49d6e83e936b2f91cd..f839257e3e7fb54d738d278b965f12e9c01769f0:/config/initializers/i18n.rb?ds=sidebyside

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 22704901f..266e41cbb 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,36 +1,53 @@
 module I18n
   module Backend
-    class Simple
-      def init_translations_with_mn_cleanup
-        init_translations_without_mn_cleanup
+    module PluralizationFallback
+      def pluralize(locale, entry, count)
+        super
+      rescue InvalidPluralizationData => e
+        raise e unless e.entry.key?(:other)
 
-        translations[:mn][:errors][:template].delete(:body)
-        translations[:mn][:activemodel][:errors][:template].delete(:body)
-        translations[:mn][:activerecord][:errors][:template].delete(:body)
+        e.entry[:other]
       end
-
-      alias_method_chain :init_translations, :mn_cleanup
     end
+  end
+end
+
+module OpenStreetMap
+  module I18n
+    module NormaliseLocales
+      def store_translations(locale, data, options = {})
+        locale = ::I18n::Locale::Tag::Rfc4646.tag(locale).to_s
 
-    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
+        super(locale, data, options)
       end
     end
 
-    module PluralizationFallback
-      def pluralize(locale, entry, count)
-        super
-      rescue InvalidPluralizationData => ex
-        raise ex unless ex.entry.has_key?(:other)
-        ex.entry[:other]
+    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?
+  I18n.exception_handler = proc do |exception|
+    raise exception.to_exception
+  end
+end
+
+Rails.configuration.after_initialize do
+  I18n.available_locales
+end