gettext 3.3.6 → 3.4.0

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
 #
@@ -314,6 +312,11 @@ EOF
   end
 
   class TestPluralForms < self
+    def setup
+      super
+      omit("Red Datasets is required") unless defined?(Datasets::CLDRPlurals)
+    end
+
     def run_msginit(pot_header_options={})
       create_pot_file("test.pot", pot_header_options)
       po_file_path = "output.po"
@@ -327,5 +330,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext
 version: !ruby/object:Gem::Version
-  version: 3.3.6
+  version: 3.4.0
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-03 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: locale
@@ -40,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: kramdown
+  name: red-datasets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,6 +123,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Gettext is a GNU gettext-like program for Ruby.
   The catalog file(po-file) is same format with GNU gettext.
@@ -1519,7 +1533,8 @@ files:
 - test/fixtures/erb/ascii.rxml
 - test/fixtures/erb/minus.rhtml
 - test/fixtures/erb/non_ascii.rhtml
-- test/fixtures/gladeparser.glade
+- test/fixtures/glade/2.glade
+- test/fixtures/glade/3.glade
 - test/fixtures/gtk_builder_ui_definitions.ui
 - test/fixtures/gtk_builder_ui_definitions.ui~
 - test/fixtures/hello.rb
@@ -1530,15 +1545,16 @@ files:
 - test/fixtures/ns_.rb
 - test/fixtures/ns_/custom.rb
 - test/fixtures/p_.rb
-- test/fixtures/ruby/percent_I.rb
-- test/fixtures/ruby/percent_W.rb
-- test/fixtures/ruby/percent_i.rb
-- test/fixtures/ruby/percent_w.rb
+- test/fixtures/ruby/percent_lower_i.rb
+- test/fixtures/ruby/percent_lower_w.rb
+- test/fixtures/ruby/percent_upper_i.rb
+- test/fixtures/ruby/percent_upper_w.rb
 - test/fixtures/s_.rb
 - test/fixtures/s_/custom.rb
 - test/fixtures/simple.rb
 - test/fixtures/untranslated.rb
 - test/fixtures/upper_n_.rb
+- test/fixtures/upper_nn_.rb
 - test/helper.rb
 - test/locale/cr/LC_MESSAGES/plural.mo
 - test/locale/da/LC_MESSAGES/plural.mo
@@ -1650,6 +1666,7 @@ files:
 - test/tools/files/simple_2.po
 - test/tools/files/simple_translation.rb
 - test/tools/files/version.po
+- test/tools/parser/test_glade.rb
 - test/tools/parser/test_gtk_builder_ui_definitions.rb
 - test/tools/parser/test_ruby.rb
 - test/tools/test.pot
@@ -1677,7 +1694,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
+rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
 summary: Gettext is a pure Ruby libary and tools to localize messages.