gettext 1.8.0-mswin32 → 1.9.0-mswin32

data/samples/rails/vendor/plugins/gettext/po/ca/gettext_plugin.po

@@ -0,0 +1,27 @@
+# GetText Sample Blog on RoR.
+#
+# Copyright (C) 2005 Masao Mutoh
+#
+# This file is distributed under the same license as the Ruby-GetText-Package.
+#
+# Ramon Salvadó <rsalvado at gnuine.com>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gettext_plugin 1.2.0\n"
+"POT-Creation-Date: 2006-05-31 02:06+0900\n"
+"PO-Revision-Date: 2005-12-20 10:33+0900\n"
+"Last-Translator: Ramon Salvadó <rsalvado at gnuine.com>\n"
+"Language-Team: Catalan\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: lib/gettext_plugin.rb:18
+msgid "Select locale"
+msgstr "Selecciona locale"
+
+#: lib/gettext_plugin.rb:30
+msgid "Cookie &quot;lang&quot; is set: %s"
+msgstr "La galeta &quot;lang&quot; existeix: %s"

data/test/README

@@ -8,3 +8,9 @@ $ sh test.sh
 
 You can set some options. See --help.
 $ sh test.sh --help
+
+= Tasks
+rake createdb   # Build the MySQL test databases
+rake dropdb     # Drop the MySQL test databases
+rake rebuilddb  # Rebuild the MySQL test databases
+

data/test/Rakefile

@@ -21,7 +21,7 @@ task :dropdb do
 end
 
 desc 'Rebuild the MySQL test databases'
-task :rebuilddb => [:dropdb, :builddb]
+task :rebuilddb => [:dropdb, :createdb]
 
 require 'gettext/utils'
 

data/test/fixtures/book.rb

@@ -0,0 +1,3 @@
+class Book < ActiveRecord::Base
+  untranslate :title
+end

data/test/fixtures/user.rb

@@ -0,0 +1,3 @@
+class User < ActiveRecord::Base
+  untranslate_all
+end

data/test/gettext_test_active_record.rb

@@ -4,6 +4,7 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'rubygems'
 require 'gettext'
 require 'gettext/active_record'
+require 'gettext/parser/active_record'
 require 'test/unit'
 require 'active_record'
 require 'active_record/fixtures'
@@ -14,7 +15,25 @@ require 'fixtures/reply'
 require 'fixtures/developer'
 require 'logger'
 
-puts "This test requires MySQL"
+version = /activerecord-([^\/]+)/.match($:.join)[1]
+
+#if version > "1.15.0"
+# ticket 6657 on dev.rubyonrails.org require this but it becames removed(?)
+#  AR_6657 = true
+#else
+  AR_6657 = false
+#end
+puts "The activerecord svn version is #{$1}"
+
+
+begin
+  `rake dropdb`
+rescue
+end
+begin
+  `rake createdb`
+rescue
+end
 
 ActiveRecord::Base.establish_connection(
   :adapter  => "mysql",
@@ -61,7 +80,7 @@ class ValidationsTest < Test::Unit::TestCase
     r.save
     assert r.errors.invalid?("content"), "A reply without content should mark that attribute as invalid"
     assert_equal "空です。", r.errors.on("content"), "A reply without content should contain an error"
-    assert_equal "内容 空です。", r.errors.full_messages[0], "A reply without content should contain an error"
+    assert_equal "Reply内容 空です。", r.errors.full_messages[0], "A reply without content should contain an error"
     assert_equal 1, r.errors.count
 
     GetText.set_locale_all "en"
@@ -77,11 +96,11 @@ class ValidationsTest < Test::Unit::TestCase
     assert !r.save
 
     assert r.errors.invalid?("title"), "A reply without title should mark that attribute as invalid"
-    assert_equal "タイトル 空です。", r.errors.full_messages[0]
+    assert_equal "Replyタイトル 空です。", r.errors.full_messages[0]
     assert_equal "空です。", r.errors.on("title")
 
     assert r.errors.invalid?("content"), "A reply without content should mark that attribute as invalid"
-    assert_equal "内容 空です。", r.errors.full_messages[1]
+    assert_equal "Reply内容 空です。", r.errors.full_messages[1]
     assert_equal "空です。", r.errors.on("content")
 
     assert_equal 2, r.errors.count
@@ -107,7 +126,7 @@ class ValidationsTest < Test::Unit::TestCase
     r.title = "Wrong Create"
     assert !r.save
     assert r.errors.invalid?("title"), "A reply with a bad title should mark that attribute as invalid"
-    assert_equal "タイトル が不正に生成されました。", r.errors.full_messages[0]
+    assert_equal "Replyタイトル が不正に生成されました。", r.errors.full_messages[0]
     assert_equal "が不正に生成されました。", r.errors.on("title")
 
     GetText.set_locale_all "en"
@@ -129,7 +148,7 @@ class ValidationsTest < Test::Unit::TestCase
     r.title = "Wrong Update"
     assert !r.save, "Second save should fail"
     assert r.errors.invalid?("title"), "A reply with a bad title should mark that attribute as invalid"
-    assert_equal "タイトル が不正に更新されました。", r.errors.full_messages[0]
+    assert_equal "Replyタイトル が不正に更新されました。", r.errors.full_messages[0]
     assert_equal "が不正に更新されました。", r.errors.on("title")
 
     GetText.set_locale_all "en"
@@ -146,6 +165,56 @@ class ValidationsTest < Test::Unit::TestCase
     assert_equal "is Wrong Update", r.errors.on("title")
   end
 
+  def test_invalid_record_exception
+    assert_raises(ActiveRecord::RecordInvalid) { Reply.create! }
+    assert_raises(ActiveRecord::RecordInvalid) { Reply.new.save! }
+
+    GetText.set_locale_all "ja_JP.UTF-8"
+    begin
+      r = Reply.new
+      r.save!
+      flunk
+    rescue ActiveRecord::RecordInvalid => invalid
+      assert_equal r, invalid.record
+      assert_equal "入力値が正しくありません。: Replyタイトル 空です。, Reply内容 空です。", invalid.message
+    end
+
+    GetText.set_locale_all "en"
+    begin
+      r = Reply.new
+      r.save!
+      flunk
+    rescue ActiveRecord::RecordInvalid => invalid
+      assert_equal r, invalid.record
+      assert_equal "Validation failed: Title Empty, Content Empty", invalid.message
+    end
+  end
+
+  def test_scoped_create_without_attributes
+    Reply.with_scope(:create => {}) do
+      assert_raises(ActiveRecord::RecordInvalid) { Reply.create! }
+    end
+
+    GetText.set_locale_all "ja_JP.UTF-8"
+    Reply.with_scope(:create => {}) do
+      begin
+        Reply.create!
+      rescue ActiveRecord::RecordInvalid => invalid
+        assert_equal "入力値が正しくありません。: Replyタイトル 空です。, Reply内容 空です。", invalid.message
+      end
+    end
+
+    GetText.set_locale_all "en"
+    Reply.with_scope(:create => {}) do
+      begin
+        Reply.create!
+      rescue ActiveRecord::RecordInvalid => invalid
+        assert_equal "Validation failed: Title Empty, Content Empty", invalid.message
+      end
+    end
+  end
+
+
   def test_single_error_per_attr_iteration
     GetText.set_locale_all "ja_JP.UTF-8"
     r = Reply.new
@@ -177,8 +246,8 @@ class ValidationsTest < Test::Unit::TestCase
 
     errors = []
     r.errors.each_full { |error| errors << error }
-    assert_equal "タイトル が不正に生成されました。", errors[0]
-    assert_equal "タイトル は内容がミスマッチです。", errors[1]
+    assert_equal "Replyタイトル が不正に生成されました。", errors[0]
+    assert_equal "Replyタイトル は内容がミスマッチです。", errors[1]
     assert_equal 2, r.errors.count
 
     GetText.set_locale_all "en"
@@ -207,7 +276,7 @@ class ValidationsTest < Test::Unit::TestCase
 
     assert_equal "リプライはdignifyされてません。", r.errors.on_base
 
-    assert errors.include?("タイトル 空です。")
+    assert errors.include?("Replyタイトル 空です。")
     assert errors.include?("リプライはdignifyされてません。")
     assert_equal 2, r.errors.count
 
@@ -498,6 +567,58 @@ class ValidationsTest < Test::Unit::TestCase
 
     assert_raise(ArgumentError) { Topic.validates_format_of(:title, :content) }
   end
+
+  def test_validate_format_numeric
+    Topic.validates_format_of(:title, :content, :with => /^[1-9][0-9]*$/, :message => N_("is bad data"))
+
+    GetText.set_locale_all "ja_JP.UTF-8"
+    t = Topic.create("title" => "72x", "content" => "6789")
+    assert !t.valid?, "Shouldn't be valid"
+    assert !t.save, "Shouldn't save because it's invalid"
+    assert_equal "は悪いデータです。", t.errors.on(:title)
+    assert_nil t.errors.on(:content)
+    
+    t.title = "-11"
+    assert !t.valid?, "Shouldn't be valid"
+
+    t.title = "03"
+    assert !t.valid?, "Shouldn't be valid"
+
+    t.title = "z44"
+    assert !t.valid?, "Shouldn't be valid"
+
+    t.title = "5v7"
+    assert !t.valid?, "Shouldn't be valid"
+
+    t.title = "1"
+
+    assert t.save
+    assert_nil t.errors.on(:title)
+
+    GetText.set_locale_all "en"
+    t = Topic.create("title" => "72x", "content" => "6789")
+    assert !t.valid?, "Shouldn't be valid"
+    assert !t.save, "Shouldn't save because it's invalid"
+    assert_equal "is bad data", t.errors.on(:title)
+    assert_nil t.errors.on(:content)
+
+    t.title = "-11"
+    assert !t.valid?, "Shouldn't be valid"
+
+    t.title = "03"
+    assert !t.valid?, "Shouldn't be valid"
+
+    t.title = "z44"
+    assert !t.valid?, "Shouldn't be valid"
+
+    t.title = "5v7"
+    assert !t.valid?, "Shouldn't be valid"
+
+    t.title = "1"
+
+    assert t.save
+    assert_nil t.errors.on(:title)
+  end
   
   def test_validates_inclusion_of
     Topic.validates_inclusion_of( :title, :in => %w( a b c d e f g ) )
@@ -1001,13 +1122,20 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.salary = "0"
     assert !d.valid?
-    assert_equal "給料は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:salary).first
-
+    if AR_6657
+      assert_equal "給料は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:salary).last
+    else
+      assert_equal "給料は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:salary).first
+    end
     GetText.set_locale_all "en"
     d = Developer.new
     d.salary = "0"
     assert !d.valid?
-    assert_equal "Salary contains 'single' and \"double\" quotes", d.errors.on(:salary).first 
+    if AR_6657
+      assert_equal "Salary contains 'single' and \"double\" quotes", d.errors.on(:salary).last 
+    else
+      assert_equal "Salary contains 'single' and \"double\" quotes", d.errors.on(:salary).first 
+    end
   end
 
   def test_validates_acceptance_of_with_custom_error_using_quotes
@@ -1017,13 +1145,20 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.salary = "0"
     assert !d.valid?
-    assert_equal "この文字列は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:salary).first
-
+    if AR_6657
+      assert_equal "この文字列は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:salary).last
+    else
+      assert_equal "この文字列は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:salary).first
+    end
     GetText.set_locale_all "en"
     d = Developer.new
     d.salary = "0"
     assert !d.valid?
-    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:salary).first 
+    if AR_6657
+      assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:salary).last 
+    else
+      assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:salary).first
+    end
   end
 
   def test_validates_confirmation_of_with_custom_error_using_quotes_fn
@@ -1034,14 +1169,21 @@ class ValidationsTest < Test::Unit::TestCase
     d.name = "John"
     d.name_confirmation = "Johnny"
     assert !d.valid?
-    assert_equal "開発者名は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).first
-
+    if AR_6657
+      assert_equal "開発者名は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).last
+    else
+      assert_equal "開発者名は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).first
+    end
     GetText.set_locale_all "en"
     d = Developer.new
     d.name = "John"
     d.name_confirmation = "Johnny"
     assert !d.valid?
-    assert_equal "Name contains 'single' and \"double\" quotes", d.errors.on(:name).first
+    if AR_6657
+      assert_equal "Name contains 'single' and \"double\" quotes", d.errors.on(:name).last
+    else
+      assert_equal "Name contains 'single' and \"double\" quotes", d.errors.on(:name).first
+    end
   end
 
   def test_validates_confirmation_of_with_custom_error_using_quotes
@@ -1069,13 +1211,21 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.name = "John 32"
     assert !d.valid?
-    assert_equal "開発者名は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).first
+    if AR_6657
+      assert_equal "開発者名は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).last
+    else
+      assert_equal "開発者名は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).first
+    end
 
     GetText.set_locale_all "en"
     d = Developer.new
     d.name = "John 32"
     assert !d.valid?
-    assert_equal "Name contains 'single' and \"double\" quotes", d.errors.on(:name).first
+    if AR_6657
+      assert_equal "Name contains 'single' and \"double\" quotes", d.errors.on(:name).last
+    else
+      assert_equal "Name contains 'single' and \"double\" quotes", d.errors.on(:name).first
+    end
   end
 
   def test_validates_format_of_with_custom_error_using_quotes
@@ -1101,12 +1251,20 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.salary = "90,000"
     assert !d.valid?
-    assert_equal "給料は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:salary).first
+    if AR_6657
+      assert_equal "給料は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:salary).last
+    else
+      assert_equal "給料は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:salary).first
+    end
     GetText.set_locale_all "en"
     d = Developer.new
     d.salary = "90,000"
     assert !d.valid?
-    assert_equal "Salary contains 'single' and \"double\" quotes", d.errors.on(:salary).first
+    if AR_6657
+      assert_equal "Salary contains 'single' and \"double\" quotes", d.errors.on(:salary).last
+    else
+      assert_equal "Salary contains 'single' and \"double\" quotes", d.errors.on(:salary).first
+    end
   end
 
   def test_validates_inclusion_of_with_custom_error_using_quotes
@@ -1116,14 +1274,20 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.salary = "90,000"
     assert !d.valid?
-
-    assert_equal "この文字列は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:salary).first
-
+    if AR_6657
+      assert_equal "この文字列は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:salary).last
+    else
+      assert_equal "この文字列は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:salary).first
+    end
     GetText.set_locale_all "en"
     d = Developer.new
     d.salary = "90,000"
     assert !d.valid?
-    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:salary).first
+    if AR_6657
+      assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:salary).last
+    else
+      assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:salary).first
+    end
   end
 
   def test_validates_length_of_with_custom_too_long_using_quotes_fn
@@ -1133,13 +1297,20 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.name = "Jeffrey"
     assert !d.valid?
-    assert_equal "開発者名は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).first
-
+    if AR_6657
+      assert_equal "開発者名は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).last
+    else
+      assert_equal "開発者名は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).first
+    end
     GetText.set_locale_all "en"
     d = Developer.new
     d.name = "Jeffrey"
     assert !d.valid?
-    assert_equal "Name contains 'single' and \"double\" quotes", d.errors.on(:name).first
+    if AR_6657
+      assert_equal "Name contains 'single' and \"double\" quotes", d.errors.on(:name).last
+    else
+      assert_equal "Name contains 'single' and \"double\" quotes", d.errors.on(:name).first
+    end
   end
 
   def test_validates_length_of_with_custom_too_long_using_quotes
@@ -1149,13 +1320,13 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.name = "Jeffrey"
     assert !d.valid?
-    assert_equal "この文字列は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).first
+    assert_equal "この文字列は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).last
 
     GetText.set_locale_all "en"
     d = Developer.new
     d.name = "Jeffrey"
     assert !d.valid?
-    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name).first
+    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name).last
   end
 
   def test_validates_length_of_with_custom_too_short_using_quotes_fn
@@ -1164,13 +1335,20 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.name = "Joe"
     assert !d.valid?
-    assert_equal "開発者名は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).first
-
+    if AR_6657
+      assert_equal "開発者名は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).last
+    else
+      assert_equal "開発者名は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).first
+    end
     GetText.set_locale_all "en"
     d = Developer.new
     d.name = "Joe"
     assert !d.valid?
-    assert_equal "Name contains 'single' and \"double\" quotes", d.errors.on(:name).first
+    if AR_6657
+      assert_equal "Name contains 'single' and \"double\" quotes", d.errors.on(:name).last
+    else
+      assert_equal "Name contains 'single' and \"double\" quotes", d.errors.on(:name).first
+    end
   end
 
   def test_validates_length_of_with_custom_too_short_using_quotes
@@ -1179,13 +1357,13 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.name = "Joe"
     assert !d.valid?
-    assert_equal "この文字列は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).first
+    assert_equal "この文字列は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).last
 
     GetText.set_locale_all "en"
     d = Developer.new
     d.name = "Joe"
     assert !d.valid?
-    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name).first
+    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name).last
   end
 
   def test_validates_length_of_with_custom_message_using_quotes_fn
@@ -1194,13 +1372,20 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.name = "Joe"
     assert !d.valid?
-    assert_equal "開発者名は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).first
-
+    if AR_6657
+      assert_equal "開発者名は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).last
+    else
+      assert_equal "開発者名は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).first
+    end
     GetText.set_locale_all "en"
     d = Developer.new
     d.name = "Joe"
     assert !d.valid?
-    assert_equal "Name contains 'single' and \"double\" quotes", d.errors.on(:name).first
+    if AR_6657
+      assert_equal "Name contains 'single' and \"double\" quotes", d.errors.on(:name).last
+    else
+      assert_equal "Name contains 'single' and \"double\" quotes", d.errors.on(:name).first
+    end
   end
 
   def test_validates_length_of_with_custom_message_using_quotes
@@ -1209,13 +1394,20 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.name = "Joe"
     assert !d.valid?
-    assert_equal "この文字列は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).first
-
+    if AR_6657
+      assert_equal "この文字列は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).last
+    else
+      assert_equal "この文字列は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:name).first
+    end
     GetText.set_locale_all "en"
     d = Developer.new
     d.name = "Joe"
     assert !d.valid?
-    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name).first
+    if AR_6657
+      assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name).last
+    else
+      assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name).first
+    end
   end
 
   def test_validates_presence_of_with_custom_message_using_quotes_fn
@@ -1226,13 +1418,20 @@ class ValidationsTest < Test::Unit::TestCase
     d.name = "Joe"
     assert !d.valid?
 
-    assert_equal "存在しないは'シングル' \"ダブル\"クオートを含む。", d.errors.on(:non_existent).first
-
+    if AR_6657
+      assert_equal "存在しないは'シングル' \"ダブル\"クオートを含む。", d.errors.on(:non_existent).last
+    else
+      assert_equal "存在しないは'シングル' \"ダブル\"クオートを含む。", d.errors.on(:non_existent).first
+    end
     GetText.set_locale_all "en"
     d = Developer.new
     d.name = "Joe"
     assert !d.valid?
-    assert_equal "Non existent contains 'single' and \"double\" quotes", d.errors.on(:non_existent).first
+    if AR_6657
+      assert_equal "Non existent contains 'single' and \"double\" quotes", d.errors.on(:non_existent).last
+    else
+      assert_equal "Non existent contains 'single' and \"double\" quotes", d.errors.on(:non_existent).first
+    end
   end
 
   def test_validates_presence_of_with_custom_message_using_quotes
@@ -1242,7 +1441,6 @@ class ValidationsTest < Test::Unit::TestCase
     d.name = "Joe"
     assert !d.valid?
     assert_equal "この文字列は'シングル' \"ダブル\"クオートを含む。", d.errors.on(:non_existent)
-
     GetText.set_locale_all "en"
     d = Developer.new
     d.name = "Joe"
@@ -1257,13 +1455,21 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.name = "David"
     assert !d.valid?
-    assert_equal d.errors.on(:name).first, "開発者名は'シングル' \"ダブル\"クオートを含む。"
+    if AR_6657
+      assert_equal d.errors.on(:name).last, "開発者名は'シングル' \"ダブル\"クオートを含む。"
+    else
+      assert_equal d.errors.on(:name).first, "開発者名は'シングル' \"ダブル\"クオートを含む。"
+    end
 
     GetText.set_locale_all "en"
     d = Developer.new
     d.name = "David"
     assert !d.valid?
-    assert_equal d.errors.on(:name).first, "Name contains 'single' and \"double\" quotes"
+    if AR_6657
+      assert_equal d.errors.on(:name).last, "Name contains 'single' and \"double\" quotes"
+    else
+      assert_equal d.errors.on(:name).first, "Name contains 'single' and \"double\" quotes"
+    end
   end
 
   def test_validates_uniqueness_of_with_custom_message_using_quotes
@@ -1273,18 +1479,18 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.name = "David"
     assert !d.valid?
-    assert_equal d.errors.on(:name).first, "この文字列は'シングル' \"ダブル\"クオートを含む。"
+    assert_equal d.errors.on(:name).last, "この文字列は'シングル' \"ダブル\"クオートを含む。"
 
     GetText.set_locale_all "en"
     d = Developer.new
     d.name = "David"
     assert !d.valid?
-    assert_equal d.errors.on(:name).first, "This string contains 'single' and \"double\" quotes"
+    assert_equal d.errors.on(:name).last, "This string contains 'single' and \"double\" quotes"
   end
 
   def test_validates_associated_with_custom_message_using_quotes_fn
-    Reply.validates_associated( :topic )
-    Topic.validates_presence_of( :content )
+    Reply.validates_associated :topic, :message => N_("%{fn} contains 'single' and \"double\" quotes")
+    Topic.validates_presence_of :content
     r = Reply.create("title" => "A reply", "content" => "with content!")
     r.topic = Topic.create("title" => "uhohuhoh")
     assert !r.valid?
@@ -1293,25 +1499,29 @@ class ValidationsTest < Test::Unit::TestCase
     assert r.valid?
 
     GetText.set_locale_all "ja_JP.UTF-8"
-    Reply.validates_associated :topic, :message => N_("%{fn} contains 'single' and \"double\" quotes")
-    Topic.validates_presence_of :content
     r = Reply.create("title" => "A reply", "content" => "with content!")
     r.topic = Topic.create("title" => "uhohuhoh")
     assert !r.valid?
-    assert_equal "トピックは'シングル' \"ダブル\"クオートを含む。", r.errors.full_messages[0]
-    assert_equal "トピックは'シングル' \"ダブル\"クオートを含む。", r.errors.on(:topic).first 
+    if AR_6657
+      assert_equal "Replyトピックは'シングル' \"ダブル\"クオートを含む。", r.errors.on(:topic).last 
+    else
+      assert_equal "Replyトピックは'シングル' \"ダブル\"クオートを含む。", r.errors.on(:topic).first
+    end
 
     GetText.set_locale_all "en"
     r = Reply.create("title" => "A reply", "content" => "with content!")
     r.topic = Topic.create("title" => "uhohuhoh")
     assert !r.valid?
-    assert_equal "Topic contains 'single' and \"double\" quotes", r.errors.full_messages[0]
-    assert_equal "Topic contains 'single' and \"double\" quotes", r.errors.on(:topic).first 
+    if AR_6657
+      assert_equal "Topic contains 'single' and \"double\" quotes", r.errors.on(:topic).last 
+    else
+      assert_equal "Topic contains 'single' and \"double\" quotes", r.errors.on(:topic).first
+    end
   end
 
   def test_validates_associated_with_custom_message_using_quotes
-    Reply.validates_associated( :topic )
-    Topic.validates_presence_of( :content )
+    Reply.validates_associated :topic, :message => N_("This string contains 'single' and \"double\" quotes")
+    Topic.validates_presence_of :content
     r = Reply.create("title" => "A reply", "content" => "with content!")
     r.topic = Topic.create("title" => "uhohuhoh")
     assert !r.valid?
@@ -1320,20 +1530,16 @@ class ValidationsTest < Test::Unit::TestCase
     assert r.valid?
 
     GetText.set_locale_all "ja_JP.UTF-8"
-    Reply.validates_associated :topic, :message => N_("This string contains 'single' and \"double\" quotes")
-    Topic.validates_presence_of :content
     r = Reply.create("title" => "A reply", "content" => "with content!")
     r.topic = Topic.create("title" => "uhohuhoh")
     assert !r.valid?
-    assert_equal "トピック この文字列は'シングル' \"ダブル\"クオートを含む。", r.errors.full_messages[0]
-    assert_equal "この文字列は'シングル' \"ダブル\"クオートを含む。", r.errors.on(:topic).first 
+    assert_equal "この文字列は'シングル' \"ダブル\"クオートを含む。", r.errors.on(:topic)
 
     GetText.set_locale_all "en"
     r = Reply.create("title" => "A reply", "content" => "with content!")
     r.topic = Topic.create("title" => "uhohuhoh")
     assert !r.valid?
-    assert_equal "Topic This string contains 'single' and \"double\" quotes", r.errors.full_messages[0]
-    assert_equal "This string contains 'single' and \"double\" quotes", r.errors.on(:topic).first 
+    assert_equal "This string contains 'single' and \"double\" quotes", r.errors.on(:topic)
   end
 
   def test_conditional_validation_using_method_true_fn
@@ -1456,7 +1662,7 @@ class ValidationsTest < Test::Unit::TestCase
     r = Reply.create("title" => "A reply", "content" => "with content!")
     # In this case, rgettext doesn't pick up the names of relations as msgid, 
     # so you need to define N_() in the model class
-    assert_equal "トピックを入力してください。",  r.errors.on(:topic)
+    assert_equal "Replyトピックを入力してください。",  r.errors.on(:topic)
 
     GetText.set_locale_all "en"
     r = Reply.create("title" => "A reply", "content" => "with content!")
@@ -1464,6 +1670,41 @@ class ValidationsTest < Test::Unit::TestCase
     assert_equal "Topic can't be blank",  r.errors.full_messages[0]
   end
 
+  def test_errors_to_xml
+    GetText.set_locale_all "ja_JP.UTF-8"
+    r = Reply.new :title => "Wrong Create"
+    assert !r.valid?
+    xml = r.errors.to_xml(:skip_instruct => true)
+    assert_equal "<errors>", xml.first(8)
+    assert xml.include?("<error>Reply&#12479;&#12452;&#12488;&#12523; &#12364;&#19981;&#27491;&#12395;&#29983;&#25104;&#12373;&#12428;&#12414;&#12375;&#12383;&#12290;</error>")
+    assert xml.include?("<error>Reply&#20869;&#23481; &#31354;&#12391;&#12377;&#12290;</error>")
+
+    GetText.set_locale_all "en"
+    r = Reply.new :title => "Wrong Create"
+    assert !r.valid?
+    xml = r.errors.to_xml(:skip_instruct => true)
+    assert_equal "<errors>", xml.first(8)
+    assert xml.include?("<error>Title is Wrong Create</error>")
+    assert xml.include?("<error>Content Empty</error>")
+  end
+
+  def test_validation_order
+    if AR_6657
+      Topic.validates_presence_of :title
+      Topic.validates_length_of :title, :minimum => 2
+      
+      GetText.set_locale_all "ja_JP.UTF-8"
+      t = Topic.new("title" => "")
+      assert !t.valid?
+      assert_equal "タイトルを入力してください。", t.errors.on("title").first
+      
+      GetText.set_locale_all "en"
+      t = Topic.new("title" => "")
+      assert !t.valid?
+      assert_equal "Title can't be blank", t.errors.on("title").first
+    end
+  end
+
   def test_default_validates_numericality_of
     GetText.set_locale_all "ja_JP.UTF-8"
     Topic.validates_numericality_of :approved
@@ -1475,5 +1716,44 @@ class ValidationsTest < Test::Unit::TestCase
     assert_equal "Approved is not a number", topic.errors.on(:approved)
     assert_equal "Approved is not a number", topic.errors.full_messages[0]
    end
+
+  def test_inherited_messages
+    GetText.set_locale_all "ja_JP.UTF-8"
+    Topic.validates_presence_of(:title, :content)
+
+    GetText.set_locale_all "ja_JP.UTF-8"
+    t = Topic.create
+    assert !t.save
+    assert_equal "タイトルを入力してください。", t.errors.full_messages[0]
+    assert_equal "内容を入力してください。", t.errors.full_messages[1]
+    assert_equal "タイトルを入力してください。", t.errors.on(:title)
+    assert_equal "内容を入力してください。", t.errors.on(:content)
+
+    t = Reply.create
+    assert !t.save
+    assert_equal "Replyタイトル 空です。", t.errors.full_messages[0]
+    assert_equal "Reply内容 空です。", t.errors.full_messages[1]
+    assert_equal "空です。", t.errors.on(:title)
+    assert_equal "空です。", t.errors.on(:content)
+
+    t = Reply.create
+    t.title = "Wrong Create"
+    assert !t.save
+    assert_equal "Replyタイトル が不正に生成されました。", t.errors.full_messages[0]
+    assert_equal "Reply内容 空です。", t.errors.full_messages[1]
+
+    t = SillyReply.create
+    assert !t.save
+    assert_equal "Sillyタイトル 空です。", t.errors.full_messages[0]
+    assert_equal "Silly内容 空です。", t.errors.full_messages[1]
+    assert_equal "空です。", t.errors.on(:title)
+    assert_equal "空です。", t.errors.on(:content)
+
+    t = SillyReply.create
+    t.title = "Wrong Create"
+    assert !t.save
+    assert_equal "Sillyタイトル が不正に生成されました。", t.errors.full_messages[0]
+    assert_equal "Silly内容 空です。", t.errors.full_messages[1]
+  end
 end