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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 22704901f..91efa2557 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,36 +1,35 @@
 module I18n
   module Backend
-    class Simple
-      def init_translations_with_mn_cleanup
-        init_translations_without_mn_cleanup
-
-        translations[:mn][:errors][:template].delete(:body)
-        translations[:mn][:activemodel][:errors][:template].delete(:body)
-        translations[:mn][:activerecord][:errors][:template].delete(:body)
-      end
-
-      alias_method_chain :init_translations, :mn_cleanup
-    end
-
-    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
-      end
-    end
-
     module PluralizationFallback
       def pluralize(locale, entry, count)
         super
       rescue InvalidPluralizationData => ex
-        raise ex unless ex.entry.has_key?(:other)
+        raise ex unless ex.entry.key?(:other)
         ex.entry[:other]
       end
     end
   end
+
+  module JS
+    class FallbackLocales
+      def default_fallbacks_with_validation
+        default_fallbacks_without_validation.select do |locale|
+          ::I18n.available_locales.include?(locale)
+        end
+      end
+
+      alias_method_chain :default_fallbacks, :validation
+    end
+  end
 end
 
 I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
 I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
 
 I18n.fallbacks.map("no" => "nb")
+
+I18n.enforce_available_locales = false
+
+Rails.configuration.after_initialize do
+  I18n.available_locales
+end