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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 7aafc91eb..de44126b0 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -16,13 +16,35 @@ module I18n
       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
+
+        ordered
+      end
+
+      def filtered_translations_with_order
+        make_ordered(filtered_translations_without_order)
+      end
+
+      alias_method_chain :filtered_translations, :order
+    end
+  end
 end
 
 I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
 I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
 
 I18n.fallbacks.map("no" => "nb")
-
-Rails.configuration.after_initialize do
-  I18n.reload!
-end