Merge branch 'master' into notes

[rails.git] / config / initializers / i18n.rb

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 22704901fd88a700a2c8e4f80022353a7993243f..48d1ec976f334f7cc6841e99c7ea9f8521a03f38 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,24 +1,5 @@
 module I18n
   module Backend
-    class Simple
-      def init_translations_with_mn_cleanup
-        init_translations_without_mn_cleanup
-
-        translations[:mn][:errors][:template].delete(:body)
-        translations[:mn][:activemodel][:errors][:template].delete(:body)
-        translations[:mn][:activerecord][:errors][:template].delete(:body)
-      end
-
-      alias_method_chain :init_translations, :mn_cleanup
-    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
-      end
-    end
-
     module PluralizationFallback
       def pluralize(locale, entry, count)
         super
@@ -28,6 +9,32 @@ 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)