From 292363c75fd096030091bdbe1e5afccc890cd0be Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sun, 27 Dec 2009 15:17:44 -0800 Subject: Use i18n --- activemodel/lib/active_model.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb index e0de27b96d..0e43a1b30a 100644 --- a/activemodel/lib/active_model.rb +++ b/activemodel/lib/active_model.rb @@ -55,4 +55,5 @@ module ActiveModel end end +require 'active_support/i18n' I18n.load_path << File.dirname(__FILE__) + '/active_model/locale/en.yml' -- cgit v1.2.3 From a176263ebc53682133ccb6d5c8ad5705c7058f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Mon, 28 Dec 2009 00:17:14 +0100 Subject: Fix generators tests. Signed-off-by: Jeremy Kemper --- railties/lib/rails/generators.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index 16b28dd295..2ba56bc3c5 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -5,6 +5,7 @@ require 'active_support' require 'active_support/core_ext/object/blank' require 'active_support/core_ext/object/metaclass' require 'active_support/core_ext/array/extract_options' +require 'active_support/core_ext/hash/deep_merge' require 'active_support/core_ext/module/attribute_accessors' require 'active_support/core_ext/string/inflections' @@ -94,7 +95,7 @@ module Rails end def self.plugins_generators_paths #:nodoc: - return [] unless defined?(Rails.root) + return [] unless defined?(Rails.root) && Rails.root Dir[File.join(Rails.root, "vendor", "plugins", "*", "lib", "{generators,rails_generators}")] end @@ -135,7 +136,7 @@ module Rails def self.load_paths @load_paths ||= begin paths = [] - paths += Dir[File.join(Rails.root, "lib", "{generators,rails_generators}")] if defined?(Rails.root) + paths += Dir[File.join(Rails.root, "lib", "{generators,rails_generators}")] if defined?(Rails.root) && Rails.root paths += Dir[File.join(Thor::Util.user_home, ".rails", "{generators,rails_generators}")] paths += self.plugins_generators_paths paths += self.gems_generators_paths -- cgit v1.2.3