X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ece52c818feb85e0a28787f753b17bf95ff68526..3123822bba5865e81e8c10be16452a0a8b5362f9:/config/initializers/i18n.rb

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 3c3ba872c..a94618c7e 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,31 +1,45 @@
 module I18n
   module Backend
-    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
+
+    class Simple
+      def store_translations_with_normalisation(locale, data, options = {})
+        locale = I18n::Locale::Tag::Rfc4646.tag(locale).to_s
+
+        store_translations_without_normalisation(locale, data, options)
+      end
+
+      alias_method_chain :store_translations, :normalisation
+    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::Pluralization)
 I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
-I18n.load_path << "#{Rails.root}/config/pluralizers.rb"
-
 I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
 
 I18n.fallbacks.map("no" => "nb")
 
+I18n.enforce_available_locales = false
+
 Rails.configuration.after_initialize do
-  I18n.reload!
+  I18n.available_locales
 end