gettext 3.3.6 → 3.4.9

data/test/fixtures/upper_nn_.rb

@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+
+require 'gettext'
+include GetText
+
+class TestRubyParser_Nn
+  bindtextdomain("testNn_rubyparser", :path => "locale")
+
+  def testNn_1
+    Nn_("aaa", "aaas")
+  end
+
+  def testNn_2
+    Nn_("aaa\n", "aaas\n")
+  end
+
+  def testNn_3
+    Nn_("bbb\nccc", "bbbs\ncccs")
+  end
+
+  def testNn_4
+    Nn_("bbb
+ccc
+ddd
+",
+        "bbbs
+cccs
+ddds
+")
+  end
+
+  def testNn_5
+    Nn_("eee", "eees")
+  end
+
+  def testNn_6
+    Nn_("eee", "eees") + "foo" + Nn_("fff", "fffs")
+  end
+
+  def testNn_7
+    Nn_("ggg"\
+        "hhh"\
+        "iii",
+        "gggs"\
+        "hhhs"\
+        "iiis")
+  end
+
+  def testNn_8
+    Nn_('a"b"c"', 'as"bs"cs"')
+  end
+
+  def testNn_9
+    Nn_("d\"e\"f\"", "ds\"es\"fs\"")
+  end
+
+  def testNn_10
+    Nn_("jjj", "jjjs") +
+      Nn_("kkk", "kkks")
+  end
+
+  def testNn_11
+    Nn_("lll" + "mmm", "llls" + "mmms")
+  end
+
+  def testNn_12
+    puts Nn_(msg, msgs), "ppp"  #Ignored
+  end
+
+  def testNn_13
+    Nn_("nnn\n" +
+        "ooo",
+        "nnns\n" +
+        "ooos")
+  end
+end
+

data/test/po/_.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: _ 3.3.2\n"
+"Project-Id-Version: _ 3.4.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-12 15:00+0900\n"
-"PO-Revision-Date: 2020-01-12 15:00+0900\n"
+"POT-Creation-Date: 2023-06-11 06:20+0900\n"
+"PO-Revision-Date: 2023-06-11 06:20+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -165,6 +165,22 @@ msgid ""
 "one new line\n"
 msgstr ""
 
-#: ../fixtures/_/percent_strings.rb:34
+#: ../fixtures/_/percent_strings.rb:31
+msgid "in_symbol_array"
+msgstr ""
+
+#: ../fixtures/_/percent_strings.rb:39
 msgid "hello world"
 msgstr ""
+
+#: ../fixtures/_/percent_strings.rb:47
+msgid "in_string_array"
+msgstr ""
+
+#: ../fixtures/_/pipe.rb:26
+msgid "Hello"
+msgstr ""
+
+#: ../fixtures/_/pipe.rb:28
+msgid "World"
+msgstr ""

data/test/po/backslash.pot

@@ -1,16 +1,18 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the backslash package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-19 22:58+0900\n"
-"PO-Revision-Date: 2012-08-19 22:58+0900\n"
+"Project-Id-Version: backslash 3.4.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-11 06:20+0900\n"
+"PO-Revision-Date: 2023-06-11 06:20+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

data/test/po/fr/test1.po

@@ -13,6 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
+"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
 
 #: simple.rb:10
 msgid "language"
@@ -21,3 +22,9 @@ msgstr "french"
 #: simple.rb:14
 msgid "one is %d."
 msgstr "FRENCH:ONE IS %d."
+
+#: simple.rb:18
+msgid "There is an apple."
+msgid_plural "There are %{num} apples."
+msgstr[0] "FRENCH:Il y a une pomme."
+msgstr[1] "FRENCH:Il y a %{num} pommes."

data/test/po/fr_BE/test1.po

@@ -0,0 +1,24 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2002-01-01 02:24:56+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: ENCODING\n"
+"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
+
+#: simple.rb:10
+msgid "language"
+msgstr "french-Belgium"
+
+#: simple.rb:14
+msgid "one is %d."
+msgstr "FRENCH-BELGIUM:ONE IS %d."

data/test/po/fr_BE_Foo/test1.po

@@ -0,0 +1,20 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2002-01-01 02:24:56+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: ENCODING\n"
+"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
+
+#: simple.rb:10
+msgid "language"
+msgstr "french-Belgium-Foo"

data/test/po/hello.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hello 3.1.7\n"
+"Project-Id-Version: hello 3.4.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-22 14:05+0900\n"
-"PO-Revision-Date: 2015-09-22 14:05+0900\n"
+"POT-Creation-Date: 2023-06-11 06:20+0900\n"
+"PO-Revision-Date: 2023-06-11 06:20+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/ja/_.edit.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2018-06-17 07:37+0900\n"
+"PO-Revision-Date: 2023-10-22 06:37+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -84,8 +84,8 @@ msgid "#"
 msgstr ""
 
 #: ../fixtures/_.rb:96
-msgid "\taaa'bbb\\ccc"
-msgstr ""
+msgid "\\taaa'bbb\\ccc"
+msgstr "AAA"
 
 #: ../fixtures/_.rb:100
 msgid ""
@@ -93,6 +93,10 @@ msgid ""
 "Here document2\n"
 msgstr ""
 
+#: ../fixtures/_.rb:109
+msgid "in_quote"
+msgstr ""
+
 #. 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)
@@ -160,3 +164,23 @@ msgstr "ONE LINE"
 msgid ""
 "one new line\n"
 msgstr ""
+
+#: ../fixtures/_/percent_strings.rb:31
+msgid "in_symbol_array"
+msgstr ""
+
+#: ../fixtures/_/percent_strings.rb:39
+msgid "hello world"
+msgstr ""
+
+#: ../fixtures/_/percent_strings.rb:47
+msgid "in_string_array"
+msgstr ""
+
+#: ../fixtures/_/pipe.rb:26
+msgid "Hello"
+msgstr ""
+
+#: ../fixtures/_/pipe.rb:28
+msgid "World"
+msgstr ""

data/test/po/ja/_.po

@@ -133,3 +133,18 @@ msgstr "ONE LINE"
 msgid ""
 "one new line\n"
 msgstr ""
+
+msgid "in_symbol_array"
+msgstr ""
+
+msgid "hello world"
+msgstr ""
+
+msgid "in_string_array"
+msgstr ""
+
+msgid "Hello"
+msgstr ""
+
+msgid "World"
+msgstr ""

data/test/po/ja/hello.edit.po

@@ -7,7 +7,6 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 3.1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-22 14:05+0900\n"
 "PO-Revision-Date: 2015-09-22 14:06+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Japanese\n"

data/test/po/non_ascii.pot

@@ -1,15 +1,15 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the gettext package.
+# This file is distributed under the same license as the non_ascii package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 3.0.0\n"
+"Project-Id-Version: non_ascii 3.4.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-30 22:00+0900\n"
-"PO-Revision-Date: 2013-08-30 22:00+0900\n"
+"POT-Creation-Date: 2023-06-11 06:20+0900\n"
+"PO-Revision-Date: 2023-06-11 06:20+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/np_.pot

@@ -1,22 +1,25 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the np_ package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-19 22:14+0900\n"
-"PO-Revision-Date: 2012-08-19 22:14+0900\n"
+"Project-Id-Version: np_ 3.4.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-11 06:20+0900\n"
+"PO-Revision-Date: 2023-06-11 06:20+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../fixtures/np_.rb:28 ../fixtures/np_.rb:29 ../fixtures/np_.rb:33 ../fixtures/np_.rb:34
+#: ../fixtures/np_.rb:28 ../fixtures/np_.rb:29 ../fixtures/np_.rb:33
+#: ../fixtures/np_.rb:34
 msgctxt "Magazine"
 msgid "a book"
 msgid_plural "%{num} books"

data/test/po/ns_.pot

@@ -1,16 +1,18 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the ns_ package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-19 22:38+0900\n"
-"PO-Revision-Date: 2012-08-19 22:38+0900\n"
+"Project-Id-Version: ns_ 3.4.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-11 06:20+0900\n"
+"PO-Revision-Date: 2023-06-11 06:20+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

data/test/po/p_.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: p_ 3.1.3\n"
+"Project-Id-Version: p_ 3.4.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-09 15:25+0900\n"
-"PO-Revision-Date: 2014-07-09 15:25+0900\n"
+"POT-Creation-Date: 2023-06-11 06:20+0900\n"
+"PO-Revision-Date: 2023-06-11 06:20+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/s_.pot

@@ -1,16 +1,18 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the s_ package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-19 22:25+0900\n"
-"PO-Revision-Date: 2012-08-19 22:25+0900\n"
+"Project-Id-Version: s_ 3.4.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-11 06:20+0900\n"
+"PO-Revision-Date: 2023-06-11 06:20+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

data/test/po/untranslated.pot

@@ -1,15 +1,15 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the gettext package.
+# This file is distributed under the same license as the untranslated package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 3.0.0\n"
+"Project-Id-Version: untranslated 3.4.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-30 22:00+0900\n"
-"PO-Revision-Date: 2013-08-30 22:00+0900\n"
+"POT-Creation-Date: 2023-06-11 06:20+0900\n"
+"PO-Revision-Date: 2023-06-11 06:20+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/test_gettext.rb

@@ -59,6 +59,29 @@ class TestGetText < Test::Unit::TestCase
     assert_equal("nomsgstr", _("nomsgstr"))
   end
 
+  def test_fallbacks
+    bindtextdomain("test1", "locale")
+    test = Simple.new
+
+    # Translation present in all candidates
+    GetText.set_current_locale("fr_BE_Foo")
+    assert_equal("french-Belgium-Foo", test.test)
+    GetText.set_current_locale("fr_BE")
+    assert_equal("french-Belgium", test.test)
+    GetText.set_current_locale("fr")
+    assert_equal("french", test.test)
+
+    # Translation Missing in fr_BE_Foo (fallback to fr_BE)
+    GetText.set_current_locale("fr_BE_Foo")
+    assert_equal("FRENCH-BELGIUM:ONE IS 1.", test.test_formatted_string)
+
+    # Translation Missing in fr_BE_Foo *and* fr_BE (both languages fallback to fr)
+    GetText.set_current_locale("fr_BE_Foo")
+    assert_equal("FRENCH:Il y a 5 pommes.", test.test_plural)
+    GetText.set_current_locale("fr_BE")
+    assert_equal("FRENCH:Il y a 5 pommes.", test.test_plural)
+  end
+
   def test_empty
     bindtextdomain("test1", "locale")
     assert_equal("japanese", gettext("language"))

data/test/test_locale_path.rb

@@ -53,9 +53,11 @@ class TestLocalePath < Test::Unit::TestCase
     testdir = File.dirname(File.expand_path(__FILE__))
     path = GetText::LocalePath.new("test1", "#{testdir}/locale")
     assert_equal({
-                   "ja"      => "#{testdir}/locale/ja/LC_MESSAGES/test1.mo",
-                   "fr"      => "#{testdir}/locale/fr/LC_MESSAGES/test1.mo",
-                   "zh_Hant" => "#{testdir}/locale/zh_Hant/LC_MESSAGES/test1.mo"
+                   "ja"        => "#{testdir}/locale/ja/LC_MESSAGES/test1.mo",
+                   "fr"        => "#{testdir}/locale/fr/LC_MESSAGES/test1.mo",
+                   "fr_BE"     => "#{testdir}/locale/fr_BE/LC_MESSAGES/test1.mo",
+                   "fr_BE_Foo" => "#{testdir}/locale/fr_BE_Foo/LC_MESSAGES/test1.mo",
+                   "zh_Hant"   => "#{testdir}/locale/zh_Hant/LC_MESSAGES/test1.mo"
                  },
                  path.locale_paths)
     assert_equal("#{testdir}/locale/ja/LC_MESSAGES/test1.mo",
@@ -66,6 +68,12 @@ class TestLocalePath < Test::Unit::TestCase
                  path.current_path(Locale::Tag.parse("ja_JP.UTF-8")))
     assert_equal(nil,
                  path.current_path(Locale::Tag.parse("en")))
+    assert_equal("#{testdir}/locale/fr/LC_MESSAGES/test1.mo",
+                 path.current_path(Locale::Tag.parse("fr")))
+    assert_equal("#{testdir}/locale/fr_BE/LC_MESSAGES/test1.mo",
+                 path.current_path(Locale::Tag.parse("fr-BE")))
+    assert_equal("#{testdir}/locale/fr_BE_Foo/LC_MESSAGES/test1.mo",
+                 path.current_path(Locale::Tag.parse("fr-BE-Foo")))
     assert_equal("#{testdir}/locale/zh_Hant/LC_MESSAGES/test1.mo",
                  path.current_path(Locale::Tag.parse("zh-Hant")))
   end
@@ -73,7 +81,7 @@ class TestLocalePath < Test::Unit::TestCase
   def test_supported_locales
     testdir = File.dirname(File.expand_path(__FILE__))
     path = GetText::LocalePath.new("test1", "#{testdir}/locale")
-    assert_equal ["fr", "ja", "zh_Hant"], path.supported_locales
+    assert_equal ["fr", "fr_BE", "fr_BE_Foo", "ja", "zh_Hant"], path.supported_locales
 
     path = GetText::LocalePath.new("plural", "#{testdir}/locale")
     assert_equal ["cr", "da", "fr", "ir", "ja", "la", "li", "po", "sl"], path.supported_locales

data/test/test_parser.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2021  Sutou Kouhei <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
@@ -23,8 +23,8 @@
 
 require "tempfile"
 require "gettext/tools/parser/ruby"
-require "gettext/tools/parser/glade"
 require "gettext/tools/parser/erb"
+require "gettext/tools/parser/erubi"
 
 require "gettext/tools/xgettext"
 
@@ -97,6 +97,40 @@ class TestGetTextParser < Test::Unit::TestCase
                     ['fixtures/upper_n_.rb:64'])
     end
 
+    def test_Nn_
+      @ary = @xgettext.parse(['fixtures/upper_nn_.rb'])
+
+      assert_plural_target('aaa', 'aaas',
+                           ['fixtures/upper_nn_.rb:10'])
+      assert_plural_target("aaa\n", "aaas\n",
+                           ['fixtures/upper_nn_.rb:14'])
+      assert_plural_target("bbb\nccc", "bbbs\ncccs",
+                           ['fixtures/upper_nn_.rb:18'])
+      assert_plural_target("bbb\nccc\nddd\n", "bbbs\ncccs\nddds\n",
+                           ['fixtures/upper_nn_.rb:22'])
+      assert_plural_target('eee', 'eees',
+                           [
+                             'fixtures/upper_nn_.rb:33',
+                             'fixtures/upper_nn_.rb:37',
+                           ])
+      assert_plural_target('fff', 'fffs',
+                           ['fixtures/upper_nn_.rb:37'])
+      assert_plural_target('ggghhhiii', 'gggshhhsiiis',
+                           ['fixtures/upper_nn_.rb:41'])
+      assert_plural_target('a"b"c"', 'as"bs"cs"',
+                           ['fixtures/upper_nn_.rb:50'])
+      assert_plural_target('d"e"f"', 'ds"es"fs"',
+                           ['fixtures/upper_nn_.rb:54'])
+      assert_plural_target('jjj', 'jjjs',
+                           ['fixtures/upper_nn_.rb:58'])
+      assert_plural_target('kkk', 'kkks',
+                           ['fixtures/upper_nn_.rb:59'])
+      assert_plural_target('lllmmm', 'lllsmmms',
+                           ['fixtures/upper_nn_.rb:63'])
+      assert_plural_target("nnn\nooo", "nnns\nooos",
+                           ['fixtures/upper_nn_.rb:71'])
+    end
+
     def test_n_
       @xgettext.parse_options[:comment_tag] = "TRANSLATORS:"
       @ary = @xgettext.parse(['fixtures/lower_n_.rb'])
@@ -144,21 +178,6 @@ class TestGetTextParser < Test::Unit::TestCase
     end
   end
 
-  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 Helper::Path
 
@@ -197,6 +216,67 @@ class TestGetTextParser < Test::Unit::TestCase
 
       assert_target("Hello", ["#{path}:8"])
     end
+
+    def test_case
+      path = fixture_path("erb", "case.rhtml")
+      @ary = GetText::ErbParser.parse(path)
+
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
+        assert_target("Hello", ["#{path}:11"])
+        assert_target("World", ["#{path}:14"])
+      else
+        assert_target("Hello", ["#{path}:11"])
+        assert_nil(@ary.detect {|elem| elem.msgid == 'World'}) # Not detected. see PR #91
+      end
+    end
+  end
+
+  class TestErubiParser < self
+    include Helper::Path
+
+    def test_detect_encoding
+      euc_file = Tempfile.new("euc-jp.rhtml")
+      euc_file.open
+      euc_file.puts("<%#-*- coding: euc-jp -*-%>")
+      euc_file.close
+
+      euc_file_content = File.read(euc_file.path)
+      encoding = GetText::ErubiParser.new(euc_file.path).detect_encoding(euc_file_content)
+
+      assert_equal("EUC-JP", encoding)
+    end
+
+    def test_ascii
+      path = fixture_path("erb", "ascii.rhtml")
+      @ary = GetText::ErubiParser.parse(path)
+
+      assert_target 'aaa', ["#{path}:8"]
+      assert_target "aaa\n", ["#{path}:11"]
+      assert_target 'bbb', ["#{path}:12"]
+      assert_plural_target "ccc1", "ccc2", ["#{path}:13"]
+    end
+
+    def test_non_ascii
+      path = fixture_path("erb", "non_ascii.rhtml")
+      @ary = GetText::ErubiParser.parse(path)
+
+      assert_target('わたし', ["#{path}:12"])
+    end
+
+    def test_minus
+      path = fixture_path("erb", "minus.rhtml")
+      @ary = GetText::ErubiParser.parse(path)
+
+      assert_target("Hello", ["#{path}:8"])
+    end
+
+    def test_case
+      path = fixture_path("erb", "case.rhtml")
+      @ary = GetText::ErubiParser.parse(path)
+
+      assert_target("Hello", ["#{path}:11"])
+      assert_target("World", ["#{path}:14"]) # Detected with Erubi
+    end
   end
 
   def test_xgettext_parse