gettext 2.3.9 → 3.0.0

data/test/fixtures/_/multiple_messages_in_same_line.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+#
+# License: Ruby's or LGPL
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module Fixtures
+  module Method_
+    class MultipleMessagesInSameLine
+      include GetText
+
+      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+
+      def message
+        _("multiple") + " messages " + _("in same line")
+      end
+    end
+  end
+end

data/test/fixtures/_/multiple_same_messages.rb

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+#
+# License: Ruby's or LGPL
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module Fixtures
+  module Method_
+    class MultipleSameMessages
+      include GetText
+
+      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+
+      def message
+        _("multiple same messages")
+      end
+
+      def same_message
+        _("multiple same messages")
+      end
+    end
+  end
+end

data/{lib/gettext/runtime/mofile.rb → test/fixtures/_/one_new_line.rb}

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
+# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -17,10 +17,16 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require "gettext/runtime/mo"
+module Fixtures
+  module Method_
+    class OneNewLine
+      include GetText
 
-# Just for backward compatibility.
-module GetText
-  MoFile = MO
-  MOFile = MO
+      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+
+      def message
+        _("one new line\n")
+      end
+    end
+  end
 end

data/test/fixtures/{multi_textdomain.rb → multi_text_domain.rb}

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
 module MultiTextDomain
   class C11

data/test/fixtures/non_ascii.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
 require 'gettext'
 

data/test/fixtures/simple.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
 require 'gettext'
 

data/test/fixtures/untranslated.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
 require 'gettext'
 

data/test/gettext-test-utils.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -22,10 +22,6 @@ require "tmpdir"
 require "tempfile"
 require "time"
 
-unless String.method_defined?(:encode)
-  require "iconv"
-end
-
 require "gettext"
 
 module GetTextTestUtils
@@ -45,23 +41,4 @@ module GetTextTestUtils
   def teardown_tmpdir
     FileUtils.rm_rf(@tmpdir, :secure => true) if @tmpdir
   end
-
-  def need_encoding
-    unless defined?(Encoding)
-      omit("This test needs encoding.")
-    end
-  end
-
-  def set_encoding(string, encoding)
-    return unless string.respond_to?(:force_encoding)
-    string.force_encoding(encoding)
-  end
-
-  def encode(string, encoding)
-    if string.respond_to?(:encode)
-      string.encode(encoding)
-    else
-      Iconv.iconv(encoding, "UTF-8", string).join("")
-    end
-  end
 end

data/test/po/ja/_.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-19 23:15+0900\n"
-"PO-Revision-Date: 2012-08-19 17:43+0900\n"
+"POT-Creation-Date: 2013-08-30 23:15+0900\n"
+"PO-Revision-Date: 2013-08-30 23:17+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,18 @@ msgid "aaa"
 msgstr "AAA"
 
 #: ../fixtures/_.rb:34
-msgid "aaa\n"
-msgstr "AAA\n"
+msgid ""
+"aaa\n"
+msgstr ""
+"AAA\n"
 
 #: ../fixtures/_.rb:38
-msgid "bbb\nccc"
-msgstr "BBB\nCCC"
+msgid ""
+"bbb\n"
+"ccc"
+msgstr ""
+"BBB\n"
+"CCC"
 
 #: ../fixtures/_.rb:42
 msgid ""
@@ -69,7 +75,9 @@ msgid "lllmmm"
 msgstr ""
 
 #: ../fixtures/_.rb:84
-msgid "nnn\nooo"
+msgid ""
+"nnn\n"
+"ooo"
 msgstr ""
 
 #: ../fixtures/_.rb:88 ../fixtures/_.rb:92
@@ -77,7 +85,7 @@ msgid "#"
 msgstr ""
 
 #: ../fixtures/_.rb:96
-msgid "	aaa"
+msgid "\taaa"
 msgstr ""
 
 #: ../fixtures/_.rb:100
@@ -86,29 +94,71 @@ msgid ""
 "Here document2\n"
 msgstr ""
 
-#. This is a proper name.  See the gettext
+#. TRANSLATORS: This is a proper name.  See the gettext
 #. manual, section Names.  Note this is actually a non-ASCII
 #. name: The first name is (with Unicode escapes)
 #. "Fran\u00e7ois" or (with HTML entities) "Fran&ccedil;ois".
 #. Pronunciation is like "fraa-swa pee-nar".
 #. This is an example from GNU gettext documentation.
-#: ../fixtures/_.rb:119
+#: ../fixtures/_.rb:120
 msgid "Francois Pinard"
 msgstr ""
 
-#: ../fixtures/_.rb:122
+#: ../fixtures/_.rb:123
 msgid "No TRANSLATORS comment"
 msgstr ""
 
-#: ../fixtures/_.rb:127
+#: ../fixtures/_.rb:128
 msgid "self explaining"
 msgstr ""
 
-#: ../fixtures/_.rb:131
+#: ../fixtures/_.rb:132
 msgid "This is a # including string."
 msgstr ""
 
+#: ../fixtures/_/double_quote_in_double_quote.rb:28
+msgid "double \"quote\" in double quote"
+msgstr ""
+
+#: ../fixtures/_/double_quote_in_single_quote.rb:28
+msgid "double \"quote\" in single quote"
+msgstr ""
+
+#: ../fixtures/_/literal_concatenation_with_continuation_line.rb:28
+msgid "literal concatenation with continuation line"
+msgstr ""
+
+#: ../fixtures/_/middle_new_line.rb:28
+msgid ""
+"middle\n"
+"new line"
+msgstr ""
+
+#: ../fixtures/_/multiple_lines_literal.rb:28
+msgid ""
+"multiple\n"
+"lines\n"
+"literal\n"
+msgstr ""
+
+#: ../fixtures/_/multiple_messages_in_same_line.rb:28
+msgid "in same line"
+msgstr ""
+
+#: ../fixtures/_/multiple_messages_in_same_line.rb:28
+msgid "multiple"
+msgstr ""
+
+#: ../fixtures/_/multiple_same_messages.rb:28
+#: ../fixtures/_/multiple_same_messages.rb:32
+msgid "multiple same messages"
+msgstr ""
+
 #: ../fixtures/_/one_line.rb:28
 msgid "one line"
 msgstr "ONE LINE"
 
+#: ../fixtures/_/one_new_line.rb:28
+msgid ""
+"one new line\n"
+msgstr ""

data/test/po/ja/non_ascii.po

@@ -3,11 +3,10 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-03-31 19:22+0900\n"
+"POT-Creation-Date: 2013-08-30 22:00+0900\n"
 "PO-Revision-Date: 2012-03-31 19:22+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: test/fixtures/non_ascii.rb:10
+#: ../fixtures/non_ascii.rb:10
 msgid "こんにちは"
 msgstr "Hello in Japanese"

data/test/po/ja/untranslated.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-11 11:11+0900\n"
+"POT-Creation-Date: 2013-08-30 22:00+0900\n"
 "PO-Revision-Date: 2012-09-11 11:11+0900\n"
 "Last-Translator: Haruka Yoshihara <yoshihara@clear-code.com>\n"
 "Language-Team: Japanese\n"

data/test/test_class_info.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
-require 'gettext/runtime/class_info'
+require 'gettext/class_info'
 
 module M1; end
 module M2; end

data/test/test_gettext.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2009-2010  Masao Mutoh
 # Copyright (C) 2009  OZAWA Sakuro <github@2238club.org>
 # Copyright (C) 2009  grosser <grosser.michael@gmail.com>
@@ -20,13 +20,13 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require 'fixtures/simple.rb'
-require 'fixtures/_.rb'
+require 'fixtures/simple'
+require 'fixtures/_'
 require "fixtures/_/one_line"
-require 'fixtures/s_.rb'
-require 'fixtures/ns_.rb'
-require 'fixtures/p_.rb'
-require 'fixtures/np_.rb'
+require 'fixtures/s_'
+require 'fixtures/ns_'
+require 'fixtures/p_'
+require 'fixtures/np_'
 
 class TestGetText < Test::Unit::TestCase
 
@@ -236,16 +236,16 @@ DDD
     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") # Invalid Plural-Forms.
+    set_locale("da") # Invalid Plural-Forms.
     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") # wrong number of msgstr.
+    set_locale("la") # wrong number of msgstr.
     assert_equal("la_first", n_("first", "second", 0))
     assert_equal("la_first", n_("first", "second", 1))
     assert_equal("la_first", n_("first", "second", 2))
 
-    setlocale("li") # Invalid Plural-Forms: nplurals is set, but wrong plural=.
+    set_locale("li") # Invalid Plural-Forms: nplurals is set, but wrong plural=.
     assert_equal("li_first", n_("first", "second", 0))
     assert_equal("li_first", n_("first", "second", 1))
     assert_equal("li_first", n_("first", "second", 2))
@@ -292,7 +292,7 @@ DDD
     assert_equal(["one", "two"], Nn_("one", "two"))
   end
 
-  def test_setlocale
+  def test_set_locale
     bindtextdomain("test1", :path => "locale")
     assert_equal("japanese", _("language"))
     set_locale("en")

data/test/test_mo.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
-require 'gettext/runtime/mo'
+require 'gettext/mo'
 
 class TestMo < Test::Unit::TestCase
   def test_not_exist_msgid

data/test/test_parser.rb

@@ -1,7 +1,7 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2010  masone (Christian Felder) <ema@rh-productions.ch>
 # Copyright (C) 2009  Vladimir Dobriakov <vladimir@geekq.net>
 # Copyright (C) 2009-2010  Masao Mutoh
@@ -22,127 +22,124 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require "tempfile"
-require 'gettext/tools/parser/ruby'
-require 'gettext/tools/parser/glade'
-require 'gettext/tools/parser/erb'
+require "gettext/tools/parser/ruby"
+require "gettext/tools/parser/glade"
+require "gettext/tools/parser/erb"
 
-require 'gettext/tools/xgettext'
+require "gettext/tools/xgettext"
 
 class TestGetTextParser < Test::Unit::TestCase
   def setup
     @xgettext = GetText::Tools::XGetText.new
   end
 
-  def test_ruby
-    @ary = @xgettext.parse(['fixtures/_.rb'])
-
-    assert_target 'aaa\n', ['fixtures/_.rb:34']
-    assert_target 'bbb\nccc', ['fixtures/_.rb:38']
-    assert_target 'bbb\nccc\nddd\n', ['fixtures/_.rb:42']
-    assert_target 'eee', ['fixtures/_.rb:49', 'fixtures/_.rb:53']
-    assert_target 'fff', ['fixtures/_.rb:53']
-    assert_target 'ggghhhiii', ['fixtures/_.rb:57']
-    assert_target 'a"b"c"', ['fixtures/_.rb:63']
-    assert_target 'd"e"f"', ['fixtures/_.rb:67']
-    assert_target 'jjj', ['fixtures/_.rb:71']
-    assert_target 'kkk', ['fixtures/_.rb:72']
-    assert_target 'lllmmm', ['fixtures/_.rb:76']
-    assert_target 'nnn\nooo', ['fixtures/_.rb:84']
-    assert_target "\#", ['fixtures/_.rb:88', 'fixtures/_.rb:92']
-    assert_target "\\taaa", ['fixtures/_.rb:96']
-    assert_target "Here document1\\nHere document2\\n", ['fixtures/_.rb:100']
-    assert_target "Francois Pinard", ['fixtures/_.rb:120'] do |t|
-      assert_match(/proper name/, t.extracted_comment)
-      assert_match(/Pronunciation/, t.extracted_comment)
-    end
+  class TestRuby < self
+    def test__
+      @xgettext.parse_options[:comment_tag] = "TRANSLATORS:"
+      @ary = @xgettext.parse(['fixtures/_.rb'])
+
+      assert_target 'jjj', ['fixtures/_.rb:71']
+      assert_target 'kkk', ['fixtures/_.rb:72']
+      assert_target 'lllmmm', ['fixtures/_.rb:76']
+      assert_target "nnn\nooo", ['fixtures/_.rb:84']
+      assert_target "\#", ['fixtures/_.rb:88', 'fixtures/_.rb:92']
+      assert_target "\\taaa", ['fixtures/_.rb:96']
+      assert_target "Here document1\nHere document2\n", ['fixtures/_.rb:100']
+      assert_target "Francois Pinard", ['fixtures/_.rb:120'] do |t|
+        assert_match(/proper name/, t.extracted_comment)
+        assert_match(/Pronunciation/, t.extracted_comment)
+      end
 
-    assert_target("No TRANSLATORS comment", ["fixtures/_.rb:123"]) do |t|
-      assert_nil(t.comment)
-    end
+      assert_target("No TRANSLATORS comment", ["fixtures/_.rb:123"]) do |t|
+        assert_nil(t.comment)
+      end
 
-    assert_target "self explaining", ['fixtures/_.rb:128'] do |t|
-      assert_nil t.comment
-    end
+      assert_target "self explaining", ['fixtures/_.rb:128'] do |t|
+        assert_nil t.comment
+      end
 
-    assert_target "This is a # including string.", ["fixtures/_.rb:132"]
+      assert_target "This is a # including string.", ["fixtures/_.rb:132"]
 
-    # TODO: assert_target "in_quote", ['fixtures/_.rb:118']
-  end
+      # TODO: assert_target "in_quote", ['fixtures/_.rb:118']
+    end
 
-  def test_ruby_N
-    @ary = @xgettext.parse(['fixtures/N_.rb'])
-
-    assert_target 'aaa', ['fixtures/N_.rb:10']
-    assert_target 'aaa\n', ['fixtures/N_.rb:14']
-    assert_target 'bbb\nccc', ['fixtures/N_.rb:18']
-    assert_target 'bbb\nccc\nddd\n', ['fixtures/N_.rb:22']
-    assert_target 'eee', ['fixtures/N_.rb:29', 'fixtures/N_.rb:33']
-    assert_target 'fff', ['fixtures/N_.rb:33']
-    assert_target 'ggghhhiii', ['fixtures/N_.rb:37']
-    assert_target 'a"b"c"', ['fixtures/N_.rb:43']
-    assert_target 'd"e"f"', ['fixtures/N_.rb:47']
-    assert_target 'jjj', ['fixtures/N_.rb:51']
-    assert_target 'kkk', ['fixtures/N_.rb:52']
-    assert_target 'lllmmm', ['fixtures/N_.rb:56']
-    assert_target 'nnn\nooo', ['fixtures/N_.rb:64']
-  end
+    def test_N_
+      @ary = @xgettext.parse(['fixtures/N_.rb'])
+
+      assert_target 'aaa', ['fixtures/N_.rb:10']
+      assert_target "aaa\n", ['fixtures/N_.rb:14']
+      assert_target "bbb\nccc", ['fixtures/N_.rb:18']
+      assert_target "bbb\nccc\nddd\n", ['fixtures/N_.rb:22']
+      assert_target 'eee', ['fixtures/N_.rb:29', 'fixtures/N_.rb:33']
+      assert_target 'fff', ['fixtures/N_.rb:33']
+      assert_target 'ggghhhiii', ['fixtures/N_.rb:37']
+      assert_target 'a"b"c"', ['fixtures/N_.rb:43']
+      assert_target 'd"e"f"', ['fixtures/N_.rb:47']
+      assert_target 'jjj', ['fixtures/N_.rb:51']
+      assert_target 'kkk', ['fixtures/N_.rb:52']
+      assert_target 'lllmmm', ['fixtures/N_.rb:56']
+      assert_target "nnn\nooo", ['fixtures/N_.rb:64']
+    end
 
-  def test_ruby_n
-    @ary = @xgettext.parse(['fixtures/n_.rb'])
-    assert_plural_target "aaa", "aaa2", ['fixtures/n_.rb:29']
-    assert_plural_target "bbb\\n", "ccc2\\nccc2", ['fixtures/n_.rb:33']
-    assert_plural_target "ddd\\nddd", "ddd2\\nddd2", ['fixtures/n_.rb:37']
-    assert_plural_target "eee\\neee\\n", "eee2\\neee2\\n", ['fixtures/n_.rb:42']
-    assert_plural_target "ddd\\neee\\n", "ddd\\neee2", ['fixtures/n_.rb:48']
-    assert_plural_target "fff", "fff2", ['fixtures/n_.rb:55', 'fixtures/n_.rb:59']
-    assert_plural_target "ggg", "ggg2", ['fixtures/n_.rb:59']
-    assert_plural_target "ggghhhiii", "jjjkkklll", ['fixtures/n_.rb:63']
-    assert_plural_target "a\"b\"c\"", "a\"b\"c\"2", ['fixtures/n_.rb:72']
-    assert_plural_target "mmmmmm", "mmm2mmm2", ['fixtures/n_.rb:80']
-    assert_plural_target "nnn", "nnn2", ['fixtures/n_.rb:81']
-    assert_plural_target "comment", "comments", ['fixtures/n_.rb:97'] do |t|
-      assert_equal "please provide translations for all\n the plural forms!",
-                     t.extracted_comment
+    def test_n_
+      @xgettext.parse_options[:comment_tag] = "TRANSLATORS:"
+      @ary = @xgettext.parse(['fixtures/n_.rb'])
+      assert_plural_target "aaa", "aaa2", ['fixtures/n_.rb:29']
+      assert_plural_target "bbb\n", "ccc2\nccc2", ['fixtures/n_.rb:33']
+      assert_plural_target "ddd\nddd", "ddd2\nddd2", ['fixtures/n_.rb:37']
+      assert_plural_target "eee\neee\n", "eee2\neee2\n", ['fixtures/n_.rb:42']
+      assert_plural_target "ddd\neee\n", "ddd\neee2", ['fixtures/n_.rb:48']
+      assert_plural_target "fff", "fff2", ['fixtures/n_.rb:55', 'fixtures/n_.rb:59']
+      assert_plural_target "ggg", "ggg2", ['fixtures/n_.rb:59']
+      assert_plural_target "ggghhhiii", "jjjkkklll", ['fixtures/n_.rb:63']
+      assert_plural_target "a\"b\"c\"", "a\"b\"c\"2", ['fixtures/n_.rb:72']
+      assert_plural_target "mmmmmm", "mmm2mmm2", ['fixtures/n_.rb:80']
+      assert_plural_target "nnn", "nnn2", ['fixtures/n_.rb:81']
+      assert_plural_target "comment", "comments", ['fixtures/n_.rb:97'] do |t|
+        assert_equal "TRANSLATORS:please provide translations for all\n the plural forms!",
+                       t.extracted_comment
+      end
     end
-  end
 
-  def test_ruby_p
-    @ary = @xgettext.parse(['fixtures/p_.rb'])
-    assert_target_in_context "AAA", "BBB", ["fixtures/p_.rb:29", "fixtures/p_.rb:33"]
-    assert_target_in_context "AAA|BBB", "CCC", ["fixtures/p_.rb:37"]
-    assert_target_in_context "AAA", "CCC", ["fixtures/p_.rb:41"]
-    assert_target_in_context "CCC", "BBB", ["fixtures/p_.rb:45"]
-    assert_target_in_context "program", "name", ['fixtures/p_.rb:55'] do |t|
-      assert_equal "please translate 'name' in the context of 'program'.\n Hint: the translation should NOT contain the translation of 'program'.", t.extracted_comment
+    def test_p_
+      @xgettext.parse_options[:comment_tag] = "TRANSLATORS:"
+      @ary = @xgettext.parse(['fixtures/p_.rb'])
+      assert_target_in_context "AAA", "BBB", ["fixtures/p_.rb:29", "fixtures/p_.rb:33"]
+      assert_target_in_context "AAA|BBB", "CCC", ["fixtures/p_.rb:37"]
+      assert_target_in_context "AAA", "CCC", ["fixtures/p_.rb:41"]
+      assert_target_in_context "CCC", "BBB", ["fixtures/p_.rb:45"]
+      assert_target_in_context "program", "name", ['fixtures/p_.rb:55'] do |t|
+        assert_equal "TRANSLATORS:please translate 'name' in the context of 'program'.\n Hint: the translation should NOT contain the translation of 'program'.", t.extracted_comment
+      end
     end
   end
 
-  def test_glade
-    # Old style (~2.0.4)
-    ary = GetText::GladeParser.parse('fixtures/gladeparser.glade')
-
-    assert_equal(['window1', 'fixtures/gladeparser.glade:8'], ary[0])
-    assert_equal(['normal text', 'fixtures/gladeparser.glade:29'], ary[1])
-    assert_equal(['1st line\n2nd line\n3rd line', 'fixtures/gladeparser.glade:50'], ary[2])
-    assert_equal(['<span color="red" weight="bold" size="large">markup </span>', 'fixtures/gladeparser.glade:73'], ary[3])
-    assert_equal(['<span color="red">1st line markup </span>\n<span color="blue">2nd line markup</span>', 'fixtures/gladeparser.glade:94'], ary[4])
-    assert_equal(['<span>&quot;markup&quot; with &lt;escaped strings&gt;</span>', 'fixtures/gladeparser.glade:116'], ary[5])
-    assert_equal(['duplicated', 'fixtures/gladeparser.glade:137', 'fixtures/gladeparser.glade:158'], ary[6])
+  class TestGlade < self
+    def test_old_style
+      # Old style (~2.0.4)
+      ary = GetText::GladeParser.parse('fixtures/gladeparser.glade')
+
+      assert_equal(['window1', 'fixtures/gladeparser.glade:8'], ary[0])
+      assert_equal(['normal text', 'fixtures/gladeparser.glade:29'], ary[1])
+      assert_equal(['1st line\n2nd line\n3rd line', 'fixtures/gladeparser.glade:50'], ary[2])
+      assert_equal(['<span color="red" weight="bold" size="large">markup </span>', 'fixtures/gladeparser.glade:73'], ary[3])
+      assert_equal(['<span color="red">1st line markup </span>\n<span color="blue">2nd line markup</span>', 'fixtures/gladeparser.glade:94'], ary[4])
+      assert_equal(['<span>&quot;markup&quot; with &lt;escaped strings&gt;</span>', 'fixtures/gladeparser.glade:116'], ary[5])
+      assert_equal(['duplicated', 'fixtures/gladeparser.glade:137', 'fixtures/gladeparser.glade:158'], ary[6])
+    end
   end
 
   class TestErbParser < self
     include GetTextTestUtils
 
     def test_detect_encoding
-      need_encoding
-
       euc_file = Tempfile.new("euc-jp.rhtml")
       euc_file.open
       euc_file.puts("<%#-*- coding: euc-jp -*-%>")
       euc_file.close
 
       erb_source = ERB.new(File.read(euc_file.path)).src
-      encoding = GetText::ErbParser.detect_encoding(erb_source)
+      encoding = GetText::ErbParser.new(euc_file.path).detect_encoding(erb_source)
 
       assert_equal("EUC-JP", encoding)
     end
@@ -151,7 +148,7 @@ class TestGetTextParser < Test::Unit::TestCase
       @ary = GetText::ErbParser.parse('fixtures/erb/ascii.rhtml')
 
       assert_target 'aaa', ['fixtures/erb/ascii.rhtml:8']
-      assert_target 'aaa\n', ['fixtures/erb/ascii.rhtml:11']
+      assert_target "aaa\n", ['fixtures/erb/ascii.rhtml:11']
       assert_target 'bbb', ['fixtures/erb/ascii.rhtml:12']
       assert_plural_target "ccc1", "ccc2", ['fixtures/erb/ascii.rhtml:13']
     end
@@ -168,13 +165,13 @@ class TestGetTextParser < Test::Unit::TestCase
     GetText::ErbParser.init(:extnames => ['.rhtml', '.rxml'])
     @ary = @xgettext.parse(['fixtures/erb/ascii.rhtml'])
     assert_target 'aaa', ['fixtures/erb/ascii.rhtml:8']
-    assert_target 'aaa\n', ['fixtures/erb/ascii.rhtml:11']
+    assert_target "aaa\n", ['fixtures/erb/ascii.rhtml:11']
     assert_target 'bbb', ['fixtures/erb/ascii.rhtml:12']
     assert_plural_target "ccc1", "ccc2", ['fixtures/erb/ascii.rhtml:13']
 
     @ary = @xgettext.parse(['fixtures/erb/ascii.rxml'])
     assert_target 'aaa', ['fixtures/erb/ascii.rxml:9']
-    assert_target 'aaa\n', ['fixtures/erb/ascii.rxml:12']
+    assert_target "aaa\n", ['fixtures/erb/ascii.rxml:12']
     assert_target 'bbb', ['fixtures/erb/ascii.rxml:13']
     assert_plural_target "ccc1", "ccc2", ['fixtures/erb/ascii.rxml:14']