gettext 3.3.6 → 3.4.0

data/test/fixtures/multi_text_domain.rb

@@ -4,8 +4,8 @@ module MultiTextDomain
   class C11
     include GetText
     def initialize
-      bindtextdomain("test1", :path => "locale")
-      bindtextdomain("test2", :path => "locale")
+      bindtextdomain("test1", :path => Helper::Path.locale_path)
+      bindtextdomain("test2", :path => Helper::Path.locale_path)
     end
     def test
       _("language")
@@ -17,8 +17,8 @@ module MultiTextDomain
 
   class C12
     include GetText
-    bindtextdomain("test1", :path => "locale")
-    bindtextdomain("test2", :path => "locale")
+    bindtextdomain("test1", :path => Helper::Path.locale_path)
+    bindtextdomain("test2", :path => Helper::Path.locale_path)
 
     def test
       _("language")
@@ -36,7 +36,7 @@ module MultiTextDomain
 
   module M1
     include GetText
-    bindtextdomain("test1", :path => "locale")
+    bindtextdomain("test1", :path => Helper::Path.locale_path)
 
     module_function
     def test
@@ -57,7 +57,7 @@ module MultiTextDomain
 
     class M1C1
       include GetText
-      bindtextdomain("test2", :path => "locale")
+      bindtextdomain("test2", :path => Helper::Path.locale_path)
       def test
         _("language")
       end
@@ -69,7 +69,7 @@ module MultiTextDomain
     class M1C2
       include GetText
       def initialize
-        bindtextdomain("test2", :path => "locale")
+        bindtextdomain("test2", :path => Helper::Path.locale_path)
       end
       def test
         _("language")
@@ -84,7 +84,7 @@ module MultiTextDomain
   class C2
     include GetText
     def initialize
-      bindtextdomain("test1", :path => "locale")
+      bindtextdomain("test1", :path => Helper::Path.locale_path)
     end
 
     def test
@@ -98,7 +98,7 @@ module MultiTextDomain
 
   class C3
     include GetText
-    bindtextdomain("test1", :path => "locale")
+    bindtextdomain("test1", :path => Helper::Path.locale_path)
 
     def test
       _("language")
@@ -110,7 +110,7 @@ module MultiTextDomain
   end
 
   class C4 < C3
-    bindtextdomain("test2", :path => "locale")
+    bindtextdomain("test2", :path => Helper::Path.locale_path)
 
     def test2
       _("LANGUAGE")
@@ -123,13 +123,13 @@ module MultiTextDomain
 
   class C51
     include GetText
-    bindtextdomain("test3", :path => "locale")
+    bindtextdomain("test3", :path => Helper::Path.locale_path)
     def test
       _("language")
     end
   end
 
   class C52 < C12
-    bindtextdomain("test3", :path => "locale")
+    bindtextdomain("test3", :path => Helper::Path.locale_path)
   end
 end

data/test/fixtures/np_.rb

@@ -22,7 +22,7 @@ require 'gettext'
 
 class TestNPGetText
   include GetText
-  bindtextdomain("np_", :path => "locale")
+  bindtextdomain("np_", :path => Helper::Path.locale_path)
 
   def test_1
     [np_("Magazine", "a book", "%{num} books", 1),

data/test/fixtures/ns_.rb

@@ -22,7 +22,7 @@ require 'gettext'
 
 class TestNSGetText
   include GetText
-  bindtextdomain("ns_", :path => "locale")
+  bindtextdomain("ns_", :path => Helper::Path.locale_path)
 
   def test_1
     [ns_("AAA|BBB", "CCC", 1), ns_("AAA|BBB", "CCC", 2)]

data/test/fixtures/p_.rb

@@ -23,7 +23,7 @@ require 'gettext'
 
 class TestPGetText
   include GetText
-  bindtextdomain("p_", :path => "locale")
+  bindtextdomain("p_", :path => Helper::Path.locale_path)
 
   def test_1
     p_("AAA", "BBB")

data/test/fixtures/s_.rb

@@ -22,7 +22,7 @@ require 'gettext'
 
 class TestSGetText
   include GetText
-  bindtextdomain("s_", :path => "locale")
+  bindtextdomain("s_", :path => Helper::Path.locale_path)
 
   def test_1
     s_("AAA|BBB")

data/test/fixtures/simple.rb

@@ -4,7 +4,7 @@ require 'gettext'
 
 class Simple
   include GetText
-  bindtextdomain("test1", :path => "locale")
+  bindtextdomain("test1", :path => Helper::Path.locale_path)
 
   def test
     _("language")

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.3.8\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: 2021-06-09 11:31+0900\n"
+"PO-Revision-Date: 2021-06-09 11:31+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/ja/_.edit.po

@@ -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/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.3.8\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-06-09 11:31+0900\n"
+"PO-Revision-Date: 2021-06-09 11:31+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.3.8\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-06-09 11:31+0900\n"
+"PO-Revision-Date: 2021-06-09 11:31+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.3.8\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: 2021-06-09 11:31+0900\n"
+"PO-Revision-Date: 2021-06-09 11:31+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.3.8\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-06-09 11:31+0900\n"
+"PO-Revision-Date: 2021-06-09 11:31+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/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,7 +23,6 @@
 
 require "tempfile"
 require "gettext/tools/parser/ruby"
-require "gettext/tools/parser/glade"
 require "gettext/tools/parser/erb"
 
 require "gettext/tools/xgettext"
@@ -97,6 +96,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 +177,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