gettext 1.93.0 → 2.0.0

data/test/po/fr/test1.po

@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: testlib1.rb:10
+#: simple.rb:10
 msgid "language"
 msgstr "french"
 
-#: testlib1.rb:14
+#: simple.rb:14
 msgid "one is %d."
-msgstr "DON'T USE THIS"
+msgstr "FRENCH:ONE IS %d."

data/test/po/fr/test6.po

@@ -20,4 +20,4 @@ msgstr "french"
 
 #: testlib1.rb:14
 msgid "one is %d."
-msgstr "DON'T USE THIS"
+msgstr "ONE IS %d."

data/test/po/ja/{test_npgettext.po → npgettext.po}

@@ -2,14 +2,14 @@
 # PACKAGE パッケージに対する英訳.
 # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Masao Mutoh <mutoh@highway.ne.jp>, 2008.
+# Masao Mutoh <mutomasa at gmail.com>, 2008.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2008-08-06 02:36+0900\n"
 "PO-Revision-Date: 2008-08-06 02:36+0900\n"
-"Last-Translator: Masao Mutoh <mutoh@highway.ne.jp>\n"
+"Last-Translator: Masao Mutoh <mutomasa at gmail.com>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

data/test/po/ja/{test_nsgettext.po → nsgettext.po}

@@ -16,49 +16,49 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: test_nsgettext.rb:10 test_nsgettext.rb:14
+#: nsgettext.rb:10 nsgettext.rb:14
 msgid "AAA|BBB"
 msgid_plural "CCC"
 msgstr[0] "single"
 msgstr[1] "plural"
 
-#: test_nsgettext.rb:18
+#: nsgettext.rb:18
 msgid "AAA"
 msgid_plural "BBB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: test_nsgettext.rb:22
+#: nsgettext.rb:22
 msgid "AAA|CCC"
 msgid_plural "DDD"
 msgstr[0] ""
 msgstr[1] ""
 
-#: test_nsgettext.rb:26
+#: nsgettext.rb:26
 msgid "AAA|BBB|CCC"
 msgid_plural "DDD"
 msgstr[0] ""
 msgstr[1] ""
 
-#: test_nsgettext.rb:30
+#: nsgettext.rb:30
 msgid "AAA$BBB"
 msgid_plural "CCC"
 msgstr[0] ""
 msgstr[1] ""
 
-#: test_nsgettext.rb:34
+#: nsgettext.rb:34
 msgid "AAA$B|BB"
 msgid_plural "CCC"
 msgstr[0] ""
 msgstr[1] ""
 
-#: test_nsgettext.rb:38
+#: nsgettext.rb:38
 msgid "AAA$B|CC"
 msgid_plural "DDD"
 msgstr[0] "single"
 msgstr[1] "plural"
 
-#: test_nsgettext.rb:42
+#: nsgettext.rb:42
 msgid "AAA|CCC|BBB"
 msgid_plural "DDD"
 msgstr[0] ""

data/test/po/ja/{test_pgettext.po → pgettext.po}

@@ -2,14 +2,14 @@
 # PACKAGE パッケージに対する英訳.
 # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Masao Mutoh <mutoh@highway.ne.jp>, 2008.
+# Masao Mutoh <mutomasa at gmail.com>, 2008.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2008-07-26 15:39+0900\n"
 "PO-Revision-Date: 2008-07-26 15:39+0900\n"
-"Last-Translator: Masao Mutoh <mutoh@highway.ne.jp>\n"
+"Last-Translator: Masao Mutoh <mutomasa at gmail.com>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

data/test/po/ja/{test_sgettext.po → sgettext.po}

@@ -14,34 +14,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: test_sgettext.rb:10 test_sgettext.rb:14
+#: sgettext.rb:10 sgettext.rb:14
 msgid "AAA|BBB"
 msgstr "MATCHED"
 
-#: test_sgettext.rb:18
+#: sgettext.rb:18
 msgid "AAA"
 msgstr ""
 
-#: test_sgettext.rb:22
+#: sgettext.rb:22
 msgid "AAA|CCC"
 msgstr ""
 
-#: test_sgettext.rb:26
+#: sgettext.rb:26
 msgid "AAA|BBB|CCC"
 msgstr ""
 
-#: test_sgettext.rb:30
+#: sgettext.rb:30
 msgid "AAA$BBB"
 msgstr ""
 
-#: test_sgettext.rb:34
+#: sgettext.rb:34
 msgid "AAA$B|BB"
 msgstr ""
 
-#: test_sgettext.rb:38
+#: sgettext.rb:38
 msgid "AAA$B|CC"
 msgstr "MATCHED"
 
-#: test_sgettext.rb:42
+#: sgettext.rb:42
 msgid "AAA|CCC|BBB"
 msgstr ""

data/test/po/ja/test1.po

@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: testlib1.rb:10
+#: simple.rb:10
 msgid "language"
 msgstr "japanese"
 
-#: testlib1.rb:14
+#: simple.rb:14
 msgid "one is %d."
 msgstr "ONE IS %d."

data/test/test_class_info.rb

@@ -0,0 +1,80 @@
+require 'testlib/helper.rb'
+require 'gettext/class_info'
+
+module M1; end
+module M2; end
+
+module M1
+  module M3
+    include M2
+    module M4; end
+    class C1; end
+  end
+  class C2
+    module M5
+      class C4; end
+    end
+    class C3; end
+  end
+end
+
+module M1::M6
+  include M1::M3::M4
+  module M7; end
+end
+
+module M8
+  module M9
+  end
+  include M9
+end
+
+# Anonymous module
+@@anon = Module.new
+class @@anon::AC1; end
+module @@anon::AM1; end
+
+class TestClassInfo < Test::Unit::TestCase
+  include GetText::ClassInfo
+
+  def test_normalize_class
+    assert_equal M1::M3, normalize_class(M1::M3)
+    assert_equal M1::M3::C1, normalize_class(M1::M3::C1)
+    assert_equal M1::M3::C1, normalize_class(M1::M3::C1.new)
+
+    assert_equal NilClass, normalize_class(nil)
+    assert_equal TestClassInfo, normalize_class(self)
+  end
+
+  def test_normalize_class_anonymous_module
+    assert_equal Object, normalize_class(@@anon)
+    assert_equal Object, normalize_class(@@anon)
+    assert_equal Object, normalize_class(@@anon::AC1)
+    assert_equal Object, normalize_class(@@anon::AM1)
+  end
+
+  def test_related_classes
+    assert_equal [M1, Object], related_classes(M1)
+    assert_equal [M1::M3, M1, M2, Object], related_classes(M1::M3)
+    assert_equal [M1::M3::M4, M1::M3, M1, M2, Object], related_classes(M1::M3::M4)
+    assert_equal [M1::M3::C1, M1::M3, M1, M2, Object], related_classes(M1::M3::C1)
+    assert_equal [M1::C2, M1, Object], related_classes(M1::C2)
+    assert_equal [M1::C2::M5::C4, M1::C2::M5, M1::C2, M1, Object], related_classes(M1::C2::M5::C4)
+    assert_equal [M1::C2::C3, M1::C2, M1, Object], related_classes(M1::C2::C3)
+    assert_equal [M1::M6, M1, M1::M3::M4, M1::M3, M2, Object], related_classes(M1::M6)
+    assert_equal [M1::M6::M7, M1::M6, M1, M1::M3::M4, M1::M3, M2, Object], related_classes(M1::M6::M7)
+  end
+
+  def test_rellated_classes_with_all_classes
+    # Evertime Object is returned as the fallback object.
+    assert_equal [M1, Object], related_classes(M1, [M1])
+    assert_equal [M1, Object], related_classes(M1::M3::M4, [M1])
+    assert_equal [M1::M3, Object], related_classes(M1::M3::M4, [M1::M3])
+    assert_equal [M1::M3, M1, Object], related_classes(M1::M3::M4, [M1::M3, M1])
+  end
+
+  def test_related_classes_loop_mixin
+    assert_equal [M8, M8::M9, Object], related_classes(M8)
+  end
+
+end

data/test/test_gettext.rb

@@ -1,12 +1,6 @@
-require 'test/unit'
+require 'testlib/helper.rb'
 
-require 'gettext.rb'
-
-require 'testlib/testlib1.rb'
-require 'testlib/testlib2.rb'
-require 'testlib/testlib3.rb'
-require 'testlib/testlib4.rb'
-require 'testlib/testlib6.rb'
+require 'testlib/simple.rb'
 require 'testlib/gettext.rb'
 require 'testlib/sgettext.rb'
 require 'testlib/nsgettext.rb'
@@ -14,213 +8,169 @@ require 'testlib/pgettext.rb'
 require 'testlib/npgettext.rb'
 
 class TestGetText < Test::Unit::TestCase
-  include GetText
-
-  def test_bindtextdomain
-    GetText.locale = nil
-    return if /linux/ !~ RUBY_PLATFORM
-
-    GetText.bindtextdomain("libc")
-    assert_equal("終了しました", GetText._("Terminated"))
-
-    GetText.locale = nil
-    GetText.bindtextdomain("test1", "locale")
-
-    assert_equal("japanese", GetText._("language"))
-    GetText.bindtextdomain("libc", "/usr/share/locale")
-    assert_equal("終了しました", GetText._("Terminated"))
-
-    GetText.bindtextdomain("test2", "locale")
-    assert_equal("JAPANESE", GetText._("LANGUAGE"))
-
-    GetText.bindtextdomain("libc", "/usr/share/locale/")
-    assert_equal("終了しました", GetText._("Terminated"))
-
-    GetText.locale = nil
-    GetText.bindtextdomain("libc", "/usr/share/locale", "de")
-    assert_equal("Beendet", GetText._("Terminated"))
-
-    GetText.bindtextdomain("test1", "locale")
-
-    GetText.locale = "fr"
-    assert_equal("french", GetText._("language"))
 
+  def setup
+    ENV["LC_ALL"] = "ja_JP.UTF-8"
+    ENV["LANG"] = "ja_JP.UTF-8"
     GetText.locale = nil
-    GetText.bindtextdomain("test1", "locale", "ja")
-    assert_equal("japanese", GetText._("language"))
   end
 
-  def test_bindtextdomain_include_module
+  def test_change_locale
     GetText.locale = nil
-    bindtextdomain("test1", "locale")
-    assert_equal("japanese", _("language"))
+    bindtextdomain("test2", "locale")
+    test = Simple.new
+    assert_equal("japanese", test.test)
+    set_locale("fr")
+    assert_equal("french", test.test) # influence of previous line
+    assert_equal("FRENCH:ONE IS 1.", test.test_formatted_string)
+    set_locale("ja")
+    assert_equal("JAPANESE", _("LANGUAGE")) # influence of previous line
+    assert_equal("japanese", test.test)
+ end
+
+  def test_no_msgstr
+    bindtextdomain("test1", :path => "locale")
+    assert_equal("nomsgstr", _("nomsgstr"))
   end
 
   def test_empty
-    set_locale(nil)
     bindtextdomain("test1", "locale")
     assert_equal("japanese", gettext("language"))
     assert_equal("", gettext(""))
     assert_equal("", gettext(nil))
   end
 
-  def test_class
-    GetText.locale = "ja_JP.eucJP"
-    bindtextdomain("test2", "locale")
-    testlib6 = TestLib6.new
-    assert_equal("japanese", testlib6.test)
-    set_locale("fr")
-    assert_equal("japanese", testlib6.test) #no influence of previous line
-    assert_equal("ONE IS 1.", testlib6.test_formatted_string)
-    testlib6.setlocale("ja")
-    assert_equal("FRENCH", _("LANGUAGE")) #no influence of previous line
-    assert_equal("japanese", testlib6.test)
- end
-
-  def test_subclass
-    GetText.locale = nil
-    testlib2 = TestLib2.new
-    assert_equal("JAPANESE", testlib2.test2)
-    assert_equal("japanese", testlib2.test)
-  end
-
-  def test_nested_module
-    GetText.locale = nil
-    testlib3 = TestLib3::Test3.new
-    assert_equal("JAPANESE", testlib3.test3)
-  end
-
-  def test_no_msgstr
-    GetText.locale = nil
-    bindtextdomain("test1", "locale", "ja")
-    assert_equal("nomsgstr", _("nomsgstr"))
-  end
-
-  def test_complex
-    GetText.locale = nil
-    testlib4 = TestRubyParser.new
-    assert_equal("AAA", testlib4.test_1)
-    assert_equal("AAA\n", testlib4.test_2)
-    assert_equal("BBB\nCCC", testlib4.test_3)
+  def test_gettext
+    test = TestRubyParser.new
+    assert_equal("AAA", test.test_1)
+    assert_equal("AAA\n", test.test_2)
+    assert_equal("BBB\nCCC", test.test_3)
     assert_equal("BBB
 CCC
 DDD
-", testlib4.test_4)
-    assert_equal("EEE", testlib4.test_5)
-    assert_equal("EEEfooFFF", testlib4.test_6)
-    assert_equal("GGGHHHIII", testlib4.test_7)
+", test.test_4)
+    assert_equal("EEE", test.test_5)
+    assert_equal("EEEfooFFF", test.test_6)
+    assert_equal("GGGHHHIII", test.test_7)
   end
 
-  def test_noop
-    GetText.locale = nil
+  def test_N_
     assert_equal("test", N_("test"))
   end
 
   def test_sgettext
-    GetText.locale = nil
-    testlib5 = TestSGetText.new
-
-    assert_equal("MATCHED", testlib5.test_1)
-    assert_equal("MATCHED", testlib5.test_2)
-    assert_equal("AAA", testlib5.test_3)
-    assert_equal("CCC", testlib5.test_4)
-    assert_equal("CCC", testlib5.test_5)
-    assert_equal("BBB", testlib5.test_6)
-    assert_equal("B|BB", testlib5.test_7)
-    assert_equal("MATCHED", testlib5.test_8)
-    assert_equal("BBB", testlib5.test_9)
+    test = TestSGetText.new
+
+    assert_equal("MATCHED", test.test_1)
+    assert_equal("MATCHED", test.test_2)
+    assert_equal("AAA", test.test_3)
+    assert_equal("CCC", test.test_4)
+    assert_equal("CCC", test.test_5)
+    assert_equal("BBB", test.test_6)
+    assert_equal("B|BB", test.test_7)
+    assert_equal("MATCHED", test.test_8)
+    assert_equal("BBB", test.test_9)
+  end
+
+  def test_s_uses_no_seperator_when_nil_is_given
+    assert_equal "AAA|BBB", s_("AAA|BBB", nil)
   end
 
   def test_pgettext
     GetText.locale = nil
-    testlib6 = TestPGetText.new
+    test = TestPGetText.new
 
-    assert_equal("えーびー", testlib6.test_1)
-    assert_equal("えーびー", testlib6.test_2)
-    assert_equal("えーびーしー", testlib6.test_3)
-    assert_equal("CCC", testlib6.test_4)
-    assert_equal("しーびー", testlib6.test_5)
-    assert_equal("びー", testlib6.test_6)
+    assert_equal("えーびー", test.test_1)
+    assert_equal("えーびー", test.test_2)
+    assert_equal("えーびーしー", test.test_3)
+    assert_equal("CCC", test.test_4)
+    assert_equal("しーびー", test.test_5)
+    assert_equal("びー", test.test_6)
 
     GetText.locale = "en"
-    testlib6 = TestPGetText.new
-
-    assert_equal("BBB", testlib6.test_1)
-    assert_equal("BBB", testlib6.test_2)
-    assert_equal("CCC", testlib6.test_3)
-    assert_equal("CCC", testlib6.test_4)
-    assert_equal("BBB", testlib6.test_5)
-    assert_equal("BBB", testlib6.test_6)
+    test = TestPGetText.new
+
+    assert_equal("BBB", test.test_1)
+    assert_equal("BBB", test.test_2)
+    assert_equal("CCC", test.test_3)
+    assert_equal("CCC", test.test_4)
+    assert_equal("BBB", test.test_5)
+    assert_equal("BBB", test.test_6)
   end
+
   def test_npgettext
     GetText.locale = nil
-    testlib7 = TestNPGetText.new
-    assert_equal(["一つの本", "%{num}の本たち"], testlib7.test_1)
-    assert_equal(["一つの本", "%{num}の本たち"], testlib7.test_2)
-    assert_equal(["一つのハードカバー本", "%{num}のハードカバー本たち"], testlib7.test_3)
-    assert_equal(["マガジンを1冊持ってます。", "マガジンたちを%{num}冊持ってます。"], testlib7.test_4)
-    assert_equal(["a picture", "%{num} pictures"], testlib7.test_5)
+    test = TestNPGetText.new
+    assert_equal(["一つの本", "%{num}の本たち"], test.test_1)
+    assert_equal(["一つの本", "%{num}の本たち"], test.test_2)
+    assert_equal(["一つのハードカバー本", "%{num}のハードカバー本たち"], test.test_3)
+    assert_equal(["マガジンを1冊持ってます。", "マガジンたちを%{num}冊持ってます。"], test.test_4)
+    assert_equal(["a picture", "%{num} pictures"], test.test_5)
+  end
+
+  def test_n_defaults_to_1_when_number_is_missing
+    assert_equal n_("aaa","aaa2",1), "aaa"
   end
 
   def test_nsgettext
     GetText.locale = nil
-    testlib5 = TestNSGetText.new
-    assert_equal(["single", "plural"], testlib5.test_1)
-    assert_equal(["single", "plural"], testlib5.test_2)
-    assert_equal(["AAA", "BBB"], testlib5.test_3)
-    assert_equal(["CCC", "DDD"], testlib5.test_4)
-    assert_equal(["CCC", "DDD"], testlib5.test_5)
-    assert_equal(["BBB", "CCC"], testlib5.test_6)
-    assert_equal(["B|BB", "CCC"], testlib5.test_7)
-    assert_equal(["single", "plural"], testlib5.test_8)
-    assert_equal(["BBB", "DDD"], testlib5.test_9)
+    test = TestNSGetText.new
+    assert_equal(["single", "plural"], test.test_1)
+    assert_equal(["single", "plural"], test.test_2)
+    assert_equal(["AAA", "BBB"], test.test_3)
+    assert_equal(["CCC", "DDD"], test.test_4)
+    assert_equal(["CCC", "DDD"], test.test_5)
+    assert_equal(["BBB", "CCC"], test.test_6)
+    assert_equal(["B|BB", "CCC"], test.test_7)
+    assert_equal(["single", "plural"], test.test_8)
+    assert_equal(["BBB", "DDD"], test.test_9)
   end
 
   def test_plural
     GetText.locale = nil
-    bindtextdomain("plural", "locale", "ja")
+    bindtextdomain("plural", :path => "locale")
     assert_equal("all", n_("one", "two", 0))
     assert_equal("all", n_("one", "two", 1))
     assert_equal("all", n_("one", "two", 2))
 
-    setlocale("da")
+    set_locale("da")
     assert_equal("da_plural", n_("one", "two", 0))
     assert_equal("da_one", n_("one", "two", 1))
     assert_equal("da_plural", n_("one", "two", 2))
 
-    setlocale("fr")
+    set_locale("fr")
     assert_equal("fr_one", ngettext("one", "two", 0))
     assert_equal("fr_one", ngettext("one", "two", 1))
     assert_equal("fr_plural", ngettext("one", "two", 2))
 
-    setlocale("la")
+    set_locale("la")
     assert_equal("la_one", ngettext("one", "two", 21))
     assert_equal("la_one", ngettext("one", "two", 1))
     assert_equal("la_plural", ngettext("one", "two", 2))
     assert_equal("la_zero", ngettext("one", "two", 0))
 
-    setlocale("ir")
+    set_locale("ir")
     assert_equal("ir_one", ngettext("one", "two", 1))
     assert_equal("ir_two", ngettext("one", "two", 2))
     assert_equal("ir_plural", ngettext("one", "two", 3))
     assert_equal("ir_plural", ngettext("one", "two", 0))
 
-    setlocale("li")
+    set_locale("li")
     assert_equal("li_one", ngettext("one", "two", 1))
     assert_equal("li_two", ngettext("one", "two", 22))
     assert_equal("li_three", ngettext("one", "two", 11))
 
-    setlocale("cr")
+    set_locale("cr")
     assert_equal("cr_one", ngettext("one", "two", 1))
     assert_equal("cr_two", ngettext("one", "two", 2))
     assert_equal("cr_three", ngettext("one", "two", 5))
 
-    setlocale("po")
+    set_locale("po")
     assert_equal("po_one", ngettext("one", "two", 1))
     assert_equal("po_two", ngettext("one", "two", 2))
     assert_equal("po_three", ngettext("one", "two", 5))
 
-    setlocale("sl")
+    set_locale("sl")
     assert_equal("sl_one", ngettext("one", "two", 1))
     assert_equal("sl_two", ngettext("one", "two", 2))
     assert_equal("sl_three", ngettext("one", "two", 3))
@@ -229,38 +179,37 @@ DDD
   end
 
   def test_plural_format_invalid
-    setlocale(nil)
-    bindtextdomain("plural_error", "locale", "ja")
+    bindtextdomain("plural_error", :path => "locale")
     #If it defines msgstr[0] only, msgstr[0] is used everytime.
-    assert_equal("a", n_("first", "second", 0)) 
-    assert_equal("a", n_("first", "second", 1)) 
-    assert_equal("a", n_("first", "second", 2)) 
+    assert_equal("a", n_("first", "second", 0))
+    assert_equal("a", n_("first", "second", 1))
+    assert_equal("a", n_("first", "second", 2))
     # Use default(plural = 0)
-    setlocale("fr")
-    assert_equal("fr_first", n_("first", "second", 0))   
+    set_locale("fr")
+    assert_equal("fr_first", n_("first", "second", 0))
     assert_equal("fr_first", n_("first", "second", 1))
     assert_equal("fr_first", n_("first", "second", 2))
     setlocale("da")
-    assert_equal("da_first", n_("first", "second", 0))   
+    assert_equal("da_first", n_("first", "second", 0))
     assert_equal("da_first", n_("first", "second", 1))
     assert_equal("da_first", n_("first", "second", 2))
     setlocale("la")
-    assert_equal("la_first", n_("first", "second", 0))   
+    assert_equal("la_first", n_("first", "second", 0))
     assert_equal("la_first", n_("first", "second", 1))
     assert_equal("la_first", n_("first", "second", 2))
   end
 
   def test_plural_array
-    GetText.locale = nil
-    bindtextdomain("plural", "locale", "da")
+    bindtextdomain("plural", :path => "locale")
+    set_locale "da"
     assert_equal("da_plural", n_(["one", "two"], 0))
     assert_equal("da_one", n_(["one", "two"], 1))
     assert_equal("da_plural", n_(["one", "two"], 2))
   end
 
   def test_plural_with_single
-    GetText.locale = nil
-    bindtextdomain("plural", "locale", "ja")
+    bindtextdomain("plural", :path => "locale")
+
     assert_equal("hitotsu", _("single"))
     assert_equal("hitotsu", n_("single", "plural", 1))
     assert_equal("hitotsu", n_("single", "plural", 2))
@@ -268,7 +217,9 @@ DDD
     assert_equal("all", n_("one", "two", 2))
     assert_equal("all", _("one"))
 
-    bindtextdomain("plural", "locale", "fr")
+    bindtextdomain("plural", :path => "locale")
+    set_locale "fr"
+
     assert_equal("fr_hitotsu", _("single"))
     assert_equal("fr_hitotsu", n_("single", "plural", 1))
     assert_equal("fr_fukusu", n_("single", "plural", 2))
@@ -276,95 +227,40 @@ DDD
     assert_equal("fr_plural", n_("one", "two", 2))
     assert_equal("fr_one", _("one"))
 
-    assert_equal("fr_hitotsu", n_("single", "not match", 1))
-    assert_equal("fr_fukusu", n_("single", "not match", 2))
+#    assert_equal("fr_hitotsu", n_("single", "not match", 1))
+#    assert_equal("fr_fukusu", n_("single", "not match", 2))
   end
 
   def test_Nn_
-    GetText.locale = nil
-    bindtextdomain("plural", "locale", "da")
+    GetText.locale = "da"
+    bindtextdomain("plural", :path => "locale")
     assert_equal(["one", "two"], Nn_("one", "two"))
   end
 
-  def test_textdomain
-    GetText.locale = nil
-    Locale.set("ja_JP.eucJP")
-    testlib = TestLib4.new
-    assert_equal("japanese", testlib.test)
-    assert_raises(GetText::NoboundTextDomainError) {
-      GetText.textdomain("nodomainisdefined")
-    }
-    prefix = TextDomain::CONFIG_PREFIX
-    default_locale_dirs = [
-      "#{Config::CONFIG['datadir']}/locale/%{locale}/LC_MESSAGES/%{name}.mo",
-      "#{Config::CONFIG['datadir'].gsub(/\/local/, "")}/locale/%{locale}/LC_MESSAGES/%{name}.mo",
-      "#{prefix}/share/locale/%{locale}/LC_MESSAGES/%{name}.mo",
-      "#{prefix}/local/share/locale/%{locale}/LC_MESSAGES/%{name}.mo"
-    ].uniq
-    assert_equal(default_locale_dirs, GetText::TextDomain::DEFAULT_LOCALE_PATHS)
-    new_path = "/foo/%{locale}/%{name}.mo"
-    GetText::TextDomain.add_default_locale_path(new_path)
-    assert_equal([new_path] + default_locale_dirs, GetText::TextDomain::DEFAULT_LOCALE_PATHS)
-  end
-
   def test_setlocale
-    GetText.locale = nil
-    bindtextdomain("test1", "locale")
+    bindtextdomain("test1", :path => "locale")
     assert_equal("japanese", _("language"))
-    setlocale("en")
+    set_locale("en")
     assert_equal("language", _("language"))
-    setlocale("fr")
+    set_locale("fr")
     assert_equal("french", _("language"))
 
     Locale.set "en"
-    bindtextdomain("test1", "locale")
     assert_equal("language", _("language"))
 
     Locale.set "ja"
-    bindtextdomain("test1", "locale")
     assert_equal("japanese", _("language"))
 
     # Confirm to set Locale::Object.
-    loc = Locale::Object.new("ja_JP.eucJP")
+    loc = Locale::Tag::Posix.parse("ja_JP.UTF-8")
     assert_equal(loc, GetText.locale = loc)
-    assert_equal(Locale::Object, GetText.locale.class)
-  end
-
-  module ::A
-    bindtextdomain("test1", "locale")
-    module B
-      bindtextdomain("test1", "locale")
-      class C
-        bindtextdomain("test1", "locale")
-      end
-    end
-  end
-
-  module A2
-    bindtextdomain("test1", "locale")
-  end
-
-  module ::A::D 
-    bindtextdomain("test1", "locale")
-  end
-  class ::A::D::E
-    bindtextdomain("test1", "locale")
-  end
-
-  class ::F
-    bindtextdomain("test1", "locale")
-  end
-  class ::F::G
-    bindtextdomain("test1", "locale")
-  end
-  class ::F::G::H
-    bindtextdomain("test1", "locale")
+    assert_equal(Locale::Tag::Posix, GetText.locale.class)
   end
 
   # Anonymous
   @@anon = Module.new
   class @@anon::I
-    bindtextdomain("test1", "locale")
+    bindtextdomain("test1", :path => "locale")
     def self.test
       _("language")
     end
@@ -372,50 +268,15 @@ DDD
       _("language")
     end
   end
-  module @@anon::J
-    bindtextdomain("test1", "locale")
-  end
-
-  def test_bound_target
-    assert_equal(TestGetText::A2, GetText.bound_target(::TestGetText::A2))
-    assert_equal(TestGetText::A2, GetText.bound_target(A2))
-    assert_equal(A::B, GetText.bound_target(A::B))
-    # For object
-    assert_equal(A::D::E, GetText.bound_target(A::D::E.new))
-    assert_equal(F::G::H, GetText.bound_target(F::G::H.new))
-
-    # Anonymous classes are bound to GetText
-    assert_equal(Object, GetText.bound_target(@@anon::I))
-    assert_equal(Object, GetText.bound_target(@@anon::I.new))
-  end
-
-  def test_bound_targets
-    GetText.bindtextdomain("test1", "locale")
-    bindtextdomain("test1", "locale")
-    assert_equal([TestGetText::A2, TestGetText, Object], GetText.bound_targets(::TestGetText::A2))
-    assert_equal([TestGetText::A2, TestGetText, Object], GetText.bound_targets(A2))
-
-    assert_equal([A::B, A, Object], GetText.bound_targets(A::B))
-    assert_equal([A::B::C, A::B, A, Object], GetText.bound_targets(A::B::C))
-    assert_equal([A::D::E, A::D, A, Object], GetText.bound_targets(A::D::E))
-    assert_equal([F::G::H, F::G, F, Object], GetText.bound_targets(F::G::H))
-
-    # Anonymous classes/modules are bound to GetText
-    assert_equal([Object], GetText.bound_targets(@@anon::I))
-    assert_equal([Object], GetText.bound_targets(@@anon::J))
-  end
 
   def test_anonymous_module
-    GetText.locale = "ja"
     assert_equal("japanese", @@anon::I.test)
     assert_equal("japanese", @@anon::I.new.test2)
-    
-  end   
 
-  def test_frozen
-    GetText.locale = "ja"
+  end
 
-    GetText.bindtextdomain("test1", "locale")
+  def test_frozen
+    GetText.bindtextdomain("test1", :path => "locale")
     assert(GetText._("language").frozen?)
   end