From d6e2f5013cdc0aa830d167a84582f48dc636dc81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 30 Jan 2010 13:07:48 +0100
Subject: Drop AR I18n deprecation and simple use errors.messages as fallback.

---
 activerecord/lib/active_record/locale/en.yml  | 24 ++++++++++++------------
 activerecord/lib/active_record/railtie.rb     | 12 ------------
 activerecord/lib/active_record/validations.rb |  4 ++--
 3 files changed, 14 insertions(+), 26 deletions(-)

(limited to 'activerecord/lib/active_record')

diff --git a/activerecord/lib/active_record/locale/en.yml b/activerecord/lib/active_record/locale/en.yml
index 4115cc8e17..810359fef3 100644
--- a/activerecord/lib/active_record/locale/en.yml
+++ b/activerecord/lib/active_record/locale/en.yml
@@ -1,9 +1,16 @@
 en:
-  errors:
-    messages:
-      taken: "has already been taken"
-      record_invalid: "Validation failed: {{errors}}"
-      # Append your own errors here or at the model/attributes scope.
+  # Attributes names common to most models
+  #attributes:
+    #created_at: "Created at"
+    #updated_at: "Updated at"
+
+  # ActiveRecord models configuration
+  activerecord:
+    errors:
+      messages:
+        taken: "has already been taken"
+        record_invalid: "Validation failed: {{errors}}"
+        # Append your own errors here or at the model/attributes scope.
 
       # You can define own errors for models or model attributes.
       # The values :model, :attribute and :value are always available for interpolation.
@@ -19,13 +26,6 @@ en:
       # custom blank validation message for login attribute of User model.
       #models:
 
-  # Attributes names common to most models
-  #attributes:
-    #created_at: "Created at"
-    #updated_at: "Updated at"
-
-  # ActiveRecord models configuration
-  #activerecord:
     # Translate model names. Used in Model.human_name().
     #models:
       # For example,
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index 30da494d57..2b204043b4 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -77,17 +77,5 @@ module ActiveRecord
         end
       end
     end
-
-    initializer "active_record.i18n_deprecation" do
-      require 'active_support/i18n'
-
-      begin
-        I18n.t(:"activerecord.errors", :raise => true)
-        warn "[DEPRECATION] \"activerecord.errors\" namespace is deprecated in I18n " << 
-          "yml files, please use just \"errors\" instead."
-      rescue Exception => e
-        # No message then.
-      end
-    end
   end
 end
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb
index a9743aa1ea..8b266be638 100644
--- a/activerecord/lib/active_record/validations.rb
+++ b/activerecord/lib/active_record/validations.rb
@@ -10,8 +10,8 @@ module ActiveRecord
     attr_reader :record
     def initialize(record)
       @record = record
-      errors = @record.errors.full_messages.join(I18n.t('support.array.words_connector', :default => ', '))
-      super(I18n.t('errors.messages.record_invalid', :errors => errors))
+      errors = @record.errors.full_messages.join(", ")
+      super(I18n.t("activerecord.errors.messages.record_invalid", :errors => errors))
     end
   end
 
-- 
cgit v1.2.3