X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/06934ad37565a1c5d251a5474a778b29b16591d1..19c2f6d485baf6ae5986a9eeaed412cb2e2039a1:/config/initializers/i18n.rb

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 7aafc91eb..b4399a9f8 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,28 +1,47 @@
 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
   end
 end
 
+module OpenStreetMap
+  module I18n
+    module NormaliseLocales
+      def store_translations(locale, data, options = {})
+        locale = ::I18n::Locale::Tag::Rfc4646.tag(locale).to_s
+
+        super(locale, data, options)
+      end
+    end
+
+    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
+
 Rails.configuration.after_initialize do
-  I18n.reload!
+  I18n.available_locales
 end