Permalink
Browse files

Move to Rails 2.2

  • Loading branch information...
1 parent dcaae79 commit 4bd14529ff1aa3c16201f76d07b8663fff245b53 @clemens committed Dec 3, 2008
Showing 681 changed files with 50,149 additions and 15,309 deletions.
@@ -21,15 +21,5 @@ def set_locale
# set locale based on session or default
I18n.locale = session[:locale] || I18n.default_locale
-
- # load locale from settings
- @locale_files = []
- ['yml', 'rb'].each do |type|
- locale_file = "#{LOCALES_DIRECTORY}#{I18n.locale}.#{type}"
- if File.exists?(locale_file)
- @locale_files << locale_file
- I18n.load_translations locale_file
- end
- end
end
end
View
@@ -67,7 +67,7 @@ def load_rails_gem
class << self
def rubygems_version
- Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+ Gem::RubyGemsVersion rescue nil
end
def gem_version
@@ -82,7 +82,7 @@ def gem_version
def load_rubygems
require 'rubygems'
- min_version = '1.1.1'
+ min_version = '1.3.1'
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
@@ -66,7 +66,7 @@
# config.active_record.observers = :cacher, :garbage_collector
end
-I18n.default_locale = 'en-US'
+I18n.default_locale = 'en'
LOCALES_DIRECTORY = "#{RAILS_ROOT}/config/locales/"
LOCALES_AVAILABLE = Dir["#{LOCALES_DIRECTORY}/*.{rb,yml}"].collect do |locale_file|
Oops, something went wrong.

0 comments on commit 4bd1452

Please sign in to comment.