Renamed lang/ to locale/ because that's what we seem to

standarize on. Also, in future this place can be used for data/code that's
not literally translations but conceptually belongs to the locale (like
custom pluralization algorithms etc.).

3 files changed, 2 insertions, 2 deletions

diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index 71882833d4..17a7949959 100755
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -82,6 +82,6 @@ require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/schema_dumper'
 
 I18n.backend.populate do
-  require 'active_record/lang/en-US.rb'
+  require 'active_record/locale/en-US.rb'
 end
 
diff --git a/activerecord/lib/active_record/lang/en-US.rb b/activerecord/lib/active_record/locale/en-US.rb
index b31e13ed3a..b31e13ed3a 100644
--- a/activerecord/lib/active_record/lang/en-US.rb
+++ b/activerecord/lib/active_record/locale/en-US.rb
diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
index de844bf5a6..10e36b1512 100644
--- a/activerecord/test/cases/validations_i18n_test.rb
+++ b/activerecord/test/cases/validations_i18n_test.rb
@@ -11,7 +11,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   
   def teardown
     reset_callbacks Topic
-    load 'active_record/lang/en-US.rb'
+    load 'active_record/locale/en-US.rb'
   end
   
   def unique_topic