Avoid relying on the order in which emails are sent

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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 7aafc91ebdbb7c0c26f01af95b18d89f7c0fadb4..1ee7716e6e45e4839a7477097b837e05de06cc9d 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,21 +1,40 @@
 module I18n
   module Backend
 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
     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
         ex.entry[:other]
       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)
 end
 
 I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)


@@ -23,6 +42,8 @@ I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
 
 I18n.fallbacks.map("no" => "nb")
 
 
 I18n.fallbacks.map("no" => "nb")
 

+I18n.enforce_available_locales = false
+

 Rails.configuration.after_initialize do
 Rails.configuration.after_initialize do

-  I18n.reload!
+  I18n.available_locales

 end
 end