From 428aa24d24032d382dc3d9ccf131e0c874043dbd Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Sat, 21 Jun 2008 11:35:02 +0200
Subject: 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.).

---
 activerecord/lib/active_record.rb                |  2 +-
 activerecord/lib/active_record/lang/en-US.rb     | 25 ------------------------
 activerecord/lib/active_record/locale/en-US.rb   | 25 ++++++++++++++++++++++++
 activerecord/test/cases/validations_i18n_test.rb |  2 +-
 4 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 activerecord/lib/active_record/lang/en-US.rb
 create mode 100644 activerecord/lib/active_record/locale/en-US.rb

(limited to 'activerecord')

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/lang/en-US.rb
deleted file mode 100644
index b31e13ed3a..0000000000
--- a/activerecord/lib/active_record/lang/en-US.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-I18n.backend.store_translations :'en-US', {
-  :active_record => {
-    :error_messages => {
-      :inclusion => "is not included in the list",
-      :exclusion => "is reserved",
-      :invalid => "is invalid",
-      :confirmation => "doesn't match confirmation",
-      :accepted  => "must be accepted",
-      :empty => "can't be empty",
-      :blank => "can't be blank",
-      :too_long => "is too long (maximum is {{count}} characters)",
-      :too_short => "is too short (minimum is {{count}} characters)",
-      :wrong_length => "is the wrong length (should be {{count}} characters)",
-      :taken => "has already been taken",
-      :not_a_number => "is not a number",
-      :greater_than => "must be greater than {{count}}",
-      :greater_than_or_equal_to => "must be greater than or equal to {{count}}",
-      :equal_to => "must be equal to {{count}}",
-      :less_than => "must be less than {{count}}",
-      :less_than_or_equal_to => "must be less than or equal to {{count}}",
-      :odd => "must be odd",
-      :even => "must be even"
-    }            
-  }
-}
\ No newline at end of file
diff --git a/activerecord/lib/active_record/locale/en-US.rb b/activerecord/lib/active_record/locale/en-US.rb
new file mode 100644
index 0000000000..b31e13ed3a
--- /dev/null
+++ b/activerecord/lib/active_record/locale/en-US.rb
@@ -0,0 +1,25 @@
+I18n.backend.store_translations :'en-US', {
+  :active_record => {
+    :error_messages => {
+      :inclusion => "is not included in the list",
+      :exclusion => "is reserved",
+      :invalid => "is invalid",
+      :confirmation => "doesn't match confirmation",
+      :accepted  => "must be accepted",
+      :empty => "can't be empty",
+      :blank => "can't be blank",
+      :too_long => "is too long (maximum is {{count}} characters)",
+      :too_short => "is too short (minimum is {{count}} characters)",
+      :wrong_length => "is the wrong length (should be {{count}} characters)",
+      :taken => "has already been taken",
+      :not_a_number => "is not a number",
+      :greater_than => "must be greater than {{count}}",
+      :greater_than_or_equal_to => "must be greater than or equal to {{count}}",
+      :equal_to => "must be equal to {{count}}",
+      :less_than => "must be less than {{count}}",
+      :less_than_or_equal_to => "must be less than or equal to {{count}}",
+      :odd => "must be odd",
+      :even => "must be even"
+    }            
+  }
+}
\ No newline at end of file
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
-- 
cgit v1.2.3