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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 22704901f..a94618c7e 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,31 +1,34 @@
 module I18n
   module Backend
+    module PluralizationFallback
+      def pluralize(locale, entry, count)
+        super
+      rescue InvalidPluralizationData => ex
+        raise ex unless ex.entry.key?(:other)
+        ex.entry[:other]
+      end
+    end
+
     class Simple
-      def init_translations_with_mn_cleanup
-        init_translations_without_mn_cleanup
+      def store_translations_with_normalisation(locale, data, options = {})
+        locale = I18n::Locale::Tag::Rfc4646.tag(locale).to_s
 
-        translations[:mn][:errors][:template].delete(:body)
-        translations[:mn][:activemodel][:errors][:template].delete(:body)
-        translations[:mn][:activerecord][:errors][:template].delete(:body)
+        store_translations_without_normalisation(locale, data, options)
       end
 
-      alias_method_chain :init_translations, :mn_cleanup
+      alias_method_chain :store_translations, :normalisation
     end
+  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
+  module JS
+    class FallbackLocales
+      def default_fallbacks_with_validation
+        default_fallbacks_without_validation.select do |locale|
+          ::I18n.available_locales.include?(locale)
+        end
       end
-    end
 
-    module PluralizationFallback
-      def pluralize(locale, entry, count)
-        super
-      rescue InvalidPluralizationData => ex
-        raise ex unless ex.entry.has_key?(:other)
-        ex.entry[:other]
-      end
+      alias_method_chain :default_fallbacks, :validation
     end
   end
 end
@@ -34,3 +37,9 @@ 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