X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..1cb1f18381c86301ae7a958080c8a25d5f21e092:/config/initializers/i18n.rb

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 1ee7716e6..89ff677fb 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -9,34 +9,31 @@ module I18n
       end
     end
   end
+end
 
-  module JS
-    class << self
-      def make_ordered(unordered)
-        ordered = ActiveSupport::OrderedHash.new
-
-        unordered.keys.sort { |a, b| a.to_s <=> b.to_s }.each do |key|
-          value = unordered[key]
-
-          if value.is_a?(Hash)
-            ordered[key] = make_ordered(value)
-          else
-            ordered[key] = value
-          end
-        end
+module OpenStreetMap
+  module I18n
+    module NormaliseLocales
+      def store_translations(locale, data, options = {})
+        locale = ::I18n::Locale::Tag::Rfc4646.tag(locale).to_s
 
-        ordered
+        super(locale, data, options)
       end
+    end
 
-      def filtered_translations_with_order
-        make_ordered(filtered_translations_without_order)
+    module ValidateLocales
+      def default_fallbacks
+        super.select do |locale|
+          ::I18n.available_locales.include?(locale)
+        end
       end
-
-      alias_method_chain :filtered_translations, :order
     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)