Merge remote-tracking branch 'upstream/master' into vagrant

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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index aae87bef9be18f8539a3946743d5babc2d72bb87..156eea4ecad2d8a1992f30d99970d1eb3166bee6 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,38 +1,49 @@
 module I18n
   module Backend
 module I18n
   module Backend

-    module Base
-      protected
-      alias_method :old_init_translations, :init_translations
-      
-      def init_translations
-        old_init_translations
+    module PluralizationFallback
+      def pluralize(locale, entry, count)
+        super
+      rescue InvalidPluralizationData => ex
+        raise ex unless ex.entry.has_key?(:other)
+        ex.entry[:other]
+      end
+    end
+  end

 
 

-        merge_translations(:nb, translations[:no])
-        translations[:no] = translations[:nb]
+  module JS
+    class << self
+      def make_ordered(unordered)
+        ordered = ActiveSupport::OrderedHash.new

 
 

-        friendly = translate('en', 'time.formats.friendly')
+        unordered.keys.sort { |a,b| a.to_s <=> b.to_s }.each do |key|
+          value = unordered[key]

 
 

-        available_locales.each do |locale|
-          unless lookup(locale, 'time.formats.friendly')
-            store_translations(locale, :time => { :formats => { :friendly => friendly } })
+          if value.is_a?(Hash)
+            ordered[key] = make_ordered(value)
+          else
+            ordered[key] = value

           end
         end
           end
         end

+
+        ordered

       end
       end

-    end

 
 

-    module PluralizationFallback
-      def pluralize(locale, entry, count)
-        super
-      rescue InvalidPluralizationData => ex
-        raise ex unless ex.entry.has_key?(:other)
-        ex.entry[:other]
+      def filtered_translations_with_order
+        make_ordered(filtered_translations_without_order)

       end
       end

+
+      alias_method_chain :filtered_translations, :order

     end
   end
 end
 
     end
   end
 end
 

-I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization)
-I18n::Backend::Simple.send(:include, I18n::Backend::PluralizationFallback)
-I18n.load_path << RAILS_ROOT + "/config/pluralizers.rb"
+I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
+I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
+
+I18n.fallbacks.map("no" => "nb")

 
 

-I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
+I18n.enforce_available_locales = false
+
+Rails.configuration.after_initialize do |app|
+  I18n.available_locales
+end