gettext 3.3.5 → 3.3.9

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/run-test.rb

@@ -29,7 +29,6 @@ $LOAD_PATH.unshift(lib_dir)
 $LOAD_PATH.unshift(test_dir)
 
 require "test-unit"
-require "test/unit/notify"
 require "test/unit/rr"
 
 require "helper"

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
 
@@ -190,6 +208,13 @@ class TestGetTextParser < Test::Unit::TestCase
 
       assert_target('わたし', ["#{path}:12"])
     end
+
+    def test_minus
+      path = fixture_path("erb", "minus.rhtml")
+      @ary = GetText::ErbParser.parse(path)
+
+      assert_target("Hello", ["#{path}:8"])
+    end
   end
 
   def test_xgettext_parse

data/test/tools/parser/test_glade.rb

@@ -0,0 +1,91 @@
+# Copyright (C) 2009-2010  Masao Mutoh
+# Copyright (C) 2021  Sutou Kouhei <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/>.
+
+require "gettext/tools/parser/glade"
+
+class TestGladeParser < Test::Unit::TestCase
+  include Helper::Parser
+
+  def parse(file)
+    GetText::GladeParser.parse(fixture_path(file))
+  end
+
+  def test_2
+    assert_parse([
+                   {
+                     msgid: "window1",
+                     references: ["glade/2.glade:8"],
+                   },
+                   {
+                     msgid: "normal text",
+                     references: ["glade/2.glade:29"],
+                   },
+                   {
+                     msgid: "1st line\n2nd line\n3rd line",
+                     references: ["glade/2.glade:50"],
+                   },
+                   {
+                     msgid:
+                       "<span color=\"red\" " +
+                       "weight=\"bold\" " +
+                       "size=\"large\">markup </span>",
+                     references: ["glade/2.glade:73"],
+                   },
+                   {
+                     msgid:
+                       "<span color=\"red\">1st line markup </span>\n" +
+                       "<span color=\"blue\">2nd line markup</span>",
+                     references: ["glade/2.glade:94"],
+                   },
+                   {
+                     msgid:
+                       "<span>" +
+                       "&quot;markup&quot; with &lt;escaped strings&gt;" +
+                       "</span>",
+                    references: ["glade/2.glade:116"],
+                   },
+                   {
+                     msgid: "duplicated",
+                     references: [
+                       "glade/2.glade:137",
+                       "glade/2.glade:158",
+                     ],
+                   },
+                 ],
+                 "glade/2.glade")
+  end
+
+
+  class TestDetect < self
+    def target?(file)
+      GetText::GladeParser.target?(fixture_path(file))
+    end
+
+    def test_2
+      assert do
+        target?("glade/2.glade")
+      end
+    end
+
+    def test_3
+      assert do
+        not target?("glade/3.glade")
+      end
+    end
+  end
+end

data/test/tools/parser/test_gtk_builder_ui_definitions.rb

@@ -24,7 +24,7 @@ class TestGtkBuilderUIDefinitionsParser < Test::Unit::TestCase
     GetText::GtkBuilderUIDefinitionsParser.parse(fixture_path(file))
   end
 
-  def test_all
+  def test_ui
     assert_parse([
                    {
                      :msgid => "label with context",
@@ -42,4 +42,22 @@ class TestGtkBuilderUIDefinitionsParser < Test::Unit::TestCase
                  ],
                  "gtk_builder_ui_definitions.ui")
   end
+
+  class TestDetect < self
+    def target?(file)
+      GetText::GtkBuilderUIDefinitionsParser.target?(fixture_path(file))
+    end
+
+    def test_ui
+      assert do
+        target?("gtk_builder_ui_definitions.ui")
+      end
+    end
+
+    def test_glade_3
+      assert do
+        target?("glade/3.glade")
+      end
+    end
+  end
 end

data/test/tools/parser/test_ruby.rb

@@ -285,22 +285,22 @@ class TestRubyParser < Test::Unit::TestCase
   sub_test_case("parse") do
     def test_percent_w
       assert_parse([],
-                   "percent_w.rb")
+                   "percent_lower_w.rb")
     end
 
     def test_percent_W
       assert_parse([],
-                   "percent_W.rb")
+                   "percent_upper_w.rb")
     end
 
     def test_percent_i
       assert_parse([],
-                   "percent_i.rb")
+                   "percent_lower_i.rb")
     end
 
     def test_percent_I
       assert_parse([],
-                   "percent_I.rb")
+                   "percent_upper_i.rb")
     end
 
     private

data/test/tools/test_msginit.rb

@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2021  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -327,5 +325,81 @@ EOF
                      run_msginit(:have_plural_forms => false))
       end
     end
+
+    def test_ja
+      assert_equal("nplurals=1; plural=0;",
+                   @msginit.__send__(:plural_forms, "ja"))
+    end
+
+    def test_en
+      assert_equal("nplurals=2; plural=n != 1;",
+                   @msginit.__send__(:plural_forms, "en"))
+    end
+
+    def test_fr
+      assert_equal("nplurals=2; plural=n > 1;",
+                   @msginit.__send__(:plural_forms, "fr"))
+    end
+
+    def test_lv
+      assert_equal("nplurals=3; " +
+                   "plural=((n % 10) == 1) && ((n % 100) != 11) ? 0 : " +
+                   "((n % 10) == 0) || ((n % 100) >= 11 && (n % 100) <= 19) " +
+                   "? 1 : 2;",
+                   @msginit.__send__(:plural_forms, "lv"))
+    end
+
+    def test_ga
+      assert_equal("nplurals=5; " +
+                   "plural=(n == 1) ? 0 : (n == 2) ? 1 : " +
+                   "(n >= 3 && n <= 6) ? 2 : (n >= 7 && n <= 10) ? 3 : 4;",
+                   @msginit.__send__(:plural_forms, "ga"))
+    end
+
+    def test_ro
+      assert_equal("nplurals=3; " +
+                   "plural=(n == 1) ? 0 : " +
+                   "(n == 0) || ((n % 100) >= 2 && (n % 100) <= 19) ? 1 : 2;",
+                   @msginit.__send__(:plural_forms, "ro"))
+    end
+
+    def test_lt
+      assert_equal("nplurals=3; " +
+                   "plural=((n % 10) == 1) && " +
+                   "((n % 100) < 11 || (n % 100) > 19) ? 0 : " +
+                   "((n % 10) >= 2 && (n % 10) <= 9) && " +
+                   "((n % 100) < 11 || (n % 100) > 19) ? 1 : 2;",
+                   @msginit.__send__(:plural_forms, "lt"))
+    end
+
+    def test_ru
+      assert_equal("nplurals=3; " +
+                   "plural=((n % 10) == 1) && ((n % 100) != 11) ? 0 : " +
+                   "((n % 10) >= 2 && (n % 10) <= 4) && " +
+                   "((n % 100) < 12 || (n % 100) > 14) ? 1 : 2;",
+                   @msginit.__send__(:plural_forms, "ru"))
+    end
+
+    def test_cs
+      assert_equal("nplurals=3; " +
+                   "plural=(n == 1) ? 0 : (n >= 2 && n <= 4) ? 1 : 2;",
+                   @msginit.__send__(:plural_forms, "cs"))
+    end
+
+    def test_pl
+      assert_equal("nplurals=3; " +
+                   "plural=(n == 1) ? 0 : " +
+                   "((n % 10) >= 2 && (n % 10) <= 4) && " +
+                   "((n % 100) < 12 || (n % 100) > 14) ? 1 : 2;",
+                   @msginit.__send__(:plural_forms, "pl"))
+    end
+
+    def test_sl
+      assert_equal("nplurals=4; " +
+                   "plural=((n % 100) == 1) ? 0 : " +
+                   "((n % 100) == 2) ? 1 : " +
+                   "((n % 100) >= 3 && (n % 100) <= 4) ? 2 : 3;",
+                   @msginit.__send__(:plural_forms, "sl"))
+    end
   end
 end

data/test/tools/test_msgmerge.rb

@@ -784,6 +784,40 @@ msgstr ""
       end
     end
 
+    class TestWarning < self
+      def pot_content
+        <<-POT
+msgid "Hello"
+msgstr ""
+        POT
+      end
+
+      def po_content
+        <<-PO
+#, fuzzy
+msgid "Hello!"
+msgstr "Bonjour!"
+        PO
+      end
+
+      def test_default
+        _stdout, stderr = capture_output do
+          @msgmerge.run(@po_file_path, @pot_file_path)
+        end
+        assert_equal(<<-STDERR, stderr)
+Warning: fuzzy message was used.
+  #{@po_file_path}: msgid 'Hello!'
+        STDERR
+      end
+
+      def test_no_report_warning
+        _stdout, stderr = capture_output do
+          @msgmerge.run("--no-report-warning", @po_file_path, @pot_file_path)
+        end
+        assert_equal("", stderr)
+      end
+    end
+
     class TestObsoleteEntries < self
       def pot_content
         <<-POT