Configure CA path for OpenID

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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index de44126b05942afd07f6bd44fe92c54c95ed2c81..1ee7716e6e45e4839a7477097b837e05de06cc9d 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,17 +1,10 @@
 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
         ex.entry[:other]
       end
     end


@@ -22,7 +15,7 @@ module I18n
       def make_ordered(unordered)
         ordered = ActiveSupport::OrderedHash.new
 
       def make_ordered(unordered)
         ordered = ActiveSupport::OrderedHash.new
 

-        unordered.keys.sort { |a,b| a.to_s <=> b.to_s }.each do |key|
+        unordered.keys.sort { |a, b| a.to_s <=> b.to_s }.each do |key|

           value = unordered[key]
 
           if value.is_a?(Hash)
           value = unordered[key]
 
           if value.is_a?(Hash)


@@ -48,3 +41,9 @@ I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
 I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
 
 I18n.fallbacks.map("no" => "nb")
 I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
 
 I18n.fallbacks.map("no" => "nb")

+
+I18n.enforce_available_locales = false
+
+Rails.configuration.after_initialize do
+  I18n.available_locales
+end