Merge branch 'master' into overpass

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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 6601fb15a142580151025deb825a9a74198548e5..156eea4ecad2d8a1992f30d99970d1eb3166bee6 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,12 +1,5 @@
 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
     module PluralizationFallback
       def pluralize(locale, entry, count)
         super


@@ -17,30 +10,40 @@ module I18n
     end
   end
 
     end
   end
 

-  module Locale
-    class Fallbacks
-      def compute(tags, include_defaults = true, exclude = [])
-        result = Array(tags).collect do |tag|
-          tags = I18n::Locale::Tag.tag(tag).self_and_parents.map! { |t| t.to_sym } - exclude
-          tags.each { |_tag| tags += compute(@map[_tag], false, exclude + tags) if @map[_tag] }
-          tags
-        end.flatten
-        result.push(*defaults) if include_defaults
-        result.uniq.compact
+  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
       end

+
+      def filtered_translations_with_order
+        make_ordered(filtered_translations_without_order)
+      end
+
+      alias_method_chain :filtered_translations, :order

     end
   end
 end
 
     end
   end
 end
 

-I18n::Backend::Simple.include(I18n::Backend::Pluralization)

 I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
 I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)

-I18n.load_path << "#{Rails.root}/config/pluralizers.rb"
-

 I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
 
 I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
 

-I18n.fallbacks.map("nb" => "no")

 I18n.fallbacks.map("no" => "nb")
 
 I18n.fallbacks.map("no" => "nb")
 

-Rails.configuration.after_initialize do
-  I18n.reload!
+I18n.enforce_available_locales = false
+
+Rails.configuration.after_initialize do |app|
+  I18n.available_locales

 end
 end