Localisation updates from translatewiki.net

[rails.git] / config / boot.rb

diff --git a/config/boot.rb b/config/boot.rb
index b71c198db300f27bfb646140255d6d1ab177d01d..9759b93f3845b7a9f45636e979b0e85024fbd6b6 100644 (file)
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -25,7 +25,7 @@ module Rails
     end
 
     def preinitialize
     end
 
     def preinitialize

-      load(preinitializer_path) if File.exists?(preinitializer_path)
+      load(preinitializer_path) if File.exist?(preinitializer_path)

     end
 
     def preinitializer_path
     end
 
     def preinitializer_path


@@ -43,6 +43,8 @@ module Rails
   class VendorBoot < Boot
     def load_initializer
       require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
   class VendorBoot < Boot
     def load_initializer
       require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"

+      Rails::Initializer.run(:install_gem_spec_stubs)
+      Rails::GemDependency.add_frozen_gem_path

     end
   end
 
     end
   end
 


@@ -66,7 +68,7 @@ module Rails
 
     class << self
       def rubygems_version
 
     class << self
       def rubygems_version

-        Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+        Gem::RubyGemsVersion rescue nil

       end
 
       def gem_version
       end
 
       def gem_version


@@ -80,20 +82,20 @@ module Rails
       end
 
       def load_rubygems
       end
 
       def load_rubygems

+        min_version = '1.3.1'

         require 'rubygems'
         require 'rubygems'

-
-        unless rubygems_version >= '0.9.4'
-          $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
+        unless rubygems_version >= min_version
+          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)

           exit 1
         end
 
       rescue LoadError
           exit 1
         end
 
       rescue LoadError

-        $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)

         exit 1
       end
 
       def parse_gem_version(text)
         exit 1
       end
 
       def parse_gem_version(text)

-        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*'([!~<>=]*\s*[\d.]+)'/
+        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/

       end
 
       private
       end
 
       private