gettext 3.2.9 → 3.4.9

data/test/tools/test_msgcat.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014-2023  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -243,6 +243,7 @@ msgstr ""
         @po = <<-PO
 # translator comment
 #: a.rb:1
+#: a.rb:2
 msgid "Hello"
 msgstr ""
         PO
@@ -252,6 +253,25 @@ msgstr ""
         assert_equal(<<-PO, run_msgcat([@po], "--no-location"))
 # translator comment
 msgid "Hello"
+msgstr ""
+        PO
+      end
+
+      def test_wrap
+        assert_equal(<<-PO, run_msgcat([@po], "--wrap"))
+# translator comment
+#: a.rb:1 a.rb:2
+msgid "Hello"
+msgstr ""
+        PO
+      end
+
+      def test_use_one_line_per_reference
+        assert_equal(<<-PO, run_msgcat([@po], "--wrap", "--use-one-line-per-reference"))
+# translator comment
+#: a.rb:1
+#: a.rb:2
+msgid "Hello"
 msgstr ""
         PO
       end

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-2023  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 != 1) && ((n % 100) >= 1 && (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

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2010  Eddie Lau <tatonlto@gmail.com>
 #
 # License: Ruby's or LGPL
@@ -292,7 +290,6 @@ msgstr "bonjour"
         @pot[new_msgid] = ""
         merged_po = merge
 
-        puts merged_po
         assert_equal("bonjour", merged_po[new_msgid].msgstr)
         assert_equal("fuzzy", merged_po[new_msgid].flag)
       end
@@ -364,7 +361,7 @@ EOC
   end
 
   class TestCommand < self
-    include GetTextTestUtils
+    include Helper::Tmpdir
 
     def setup
       @msgmerge = GetText::Tools::MsgMerge.new
@@ -481,6 +478,8 @@ EOP
       end
 
       class TestMessage < self
+        include Helper::Warning
+
         def po_content
           <<-PO
 #{po_header(@po_formatted_time, @po_formatted_time)}
@@ -492,7 +491,9 @@ msgstr "Translated World"
         end
 
         def test_merge_metadata
-          @msgmerge.run("--update", @po_file_path, @pot_file_path)
+          suppress_warning do
+            @msgmerge.run("--update", @po_file_path, @pot_file_path)
+          end
           assert_equal(<<-PO, File.read(@po_file_path))
 #{po_header(@pot_formatted_time, @po_formatted_time)}
 #: hello.rb:1
@@ -651,6 +652,46 @@ msgstr ""
       end
     end
 
+    class TestUseOneLinePerReference < self
+      def pot_content
+        super + <<-POT
+
+#: hello.rb:10
+#: hello.rb:20
+#: hello.rb:30
+msgid "Good morning"
+msgstr ""
+        POT
+      end
+
+      def test_with_wrap
+        @msgmerge.run("--update",
+                      "--wrap",
+                      "--use-one-line-per-reference",
+                      @po_file_path, @pot_file_path)
+        assert_equal(<<-PO, File.read(@po_file_path))
+#{po_header(@pot_formatted_time, @po_formatted_time)}
+#: hello.rb:1
+msgid "Hello"
+msgstr ""
+
+#: hello.rb:2
+msgid "World"
+msgstr "Translated World"
+
+#: hello.rb:3
+msgid "Good-bye"
+msgstr ""
+
+#: hello.rb:10
+#: hello.rb:20
+#: hello.rb:30
+msgid "Good morning"
+msgstr ""
+        PO
+      end
+    end
+
     class TestWidth < self
       def pot_content
         <<-POT
@@ -781,6 +822,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

data/test/tools/test_xgettext.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
 #
 # License: Ruby's or LGPL
@@ -22,7 +20,7 @@ require "locale"
 require "gettext/tools/xgettext"
 
 class TestToolsXGetText < Test::Unit::TestCase
-  include GetTextTestUtils
+  include Helper::Tmpdir
 
   def setup
     @xgettext = GetText::Tools::XGetText.new
@@ -116,6 +114,105 @@ msgid "Hello"
 msgstr ""
 EOP
     end
+
+    def test_use_one_line_per_reference
+      pot_content = generate(<<-RUBY, "--use-one-line-per-reference")
+_("Hello")
+_("Hello")
+      RUBY
+      assert_equal(<<-POT, pot_content)
+#{header}
+#: ../lib/xgettext.rb:1
+#: ../lib/xgettext.rb:2
+msgid "Hello"
+msgstr ""
+      POT
+    end
+  end
+
+  class TestParser < self
+    # Default ERB parser (don't find anything after "case")
+    def test_erb
+      rhtml = <<-EOR
+<div>
+  <%= _('Hello') %>
+  <% case 1 %>
+  <% end %>
+  <%= _('World') %>
+</div>
+EOR
+
+      File.open(@rhtml_file_path, "w") do |rhtml_file|
+        rhtml_file.puts(rhtml)
+      end
+
+      @xgettext.run(
+        "--output", @pot_file_path,
+        @rhtml_file_path
+      )
+
+      pot_content = File.read(@pot_file_path)
+
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
+        expected_content = <<-EOP
+#{header}
+#: ../templates/xgettext.rhtml:2
+msgid "Hello"
+msgstr ""
+
+#: ../templates/xgettext.rhtml:5
+msgid "World"
+msgstr ""
+EOP
+      else
+        # "World" not detected. see PR #91
+        expected_content = <<-EOP
+#{header}
+#: ../templates/xgettext.rhtml:2
+msgid "Hello"
+msgstr ""
+EOP
+      end
+
+      assert_equal(expected_content, pot_content)
+    end
+
+    # Optional Erubi parser (find text after "case")
+    def test_erubi
+      rhtml = <<-EOR
+<div>
+  <%= _('Hello') %>
+  <% case 1 %>
+  <% end %>
+  <%= _('World') %>
+</div>
+EOR
+
+      File.open(@rhtml_file_path, "w") do |rhtml_file|
+        rhtml_file.puts(rhtml)
+      end
+
+      @xgettext.run(
+        "--output", @pot_file_path,
+        '--require', 'gettext/tools/parser/erubi',
+        '--parser', 'GetText::ErubiParser',
+        @rhtml_file_path
+      )
+
+      pot_content = File.read(@pot_file_path)
+      expected_content = <<-EOP
+#{header}
+#: ../templates/xgettext.rhtml:2
+msgid "Hello"
+msgstr ""
+
+#: ../templates/xgettext.rhtml:5
+msgid "World"
+msgstr ""
+EOP
+
+      assert_equal(expected_content, pot_content)
+    end
   end
 
   class TestEncoding < self
@@ -414,6 +511,7 @@ msgid "World"
 msgstr ""
 
 #: ../lib/xgettext.rb:2
+msgctxt "context"
 msgid "Hello"
 msgstr ""
 
@@ -443,6 +541,7 @@ msgid "World"
 msgstr ""
 
 #: ../lib/xgettext.rb:2
+msgctxt "context"
 msgid "Hello"
 msgstr ""
         POT
@@ -456,6 +555,7 @@ msgid "World"
 msgstr ""
 
 #: ../lib/xgettext.rb:2
+msgctxt "context"
 msgid "Hello"
 msgstr ""
 
@@ -481,6 +581,7 @@ msgid "ABC"
 msgstr ""
 
 #: ../lib/xgettext.rb:2
+msgctxt "context"
 msgid "Hello"
 msgstr ""
 
@@ -502,7 +603,7 @@ msgstr ""
         File.open(@rb_file_path, "w") do |rb_file|
           rb_file.puts(<<-RUBY)
 _('World')
-_('Hello')
+p_('context', 'Hello')
           RUBY
         end
 

metadata

@@ -1,16 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: gettext
 version: !ruby/object:Gem::Version
-  version: 3.2.9
+  version: 3.4.9
 platform: ruby
 authors:
 - Kouhei Sutou
 - Masao Mutoh
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2023-10-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: erubi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: locale
   requirement: !ruby/object:Gem::Requirement
@@ -26,27 +40,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.5
 - !ruby/object:Gem::Dependency
-  name: text
+  name: prime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: racc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -54,7 +68,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: racc
+  name: text
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,7 +96,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,7 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: kramdown
+  name: red-datasets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,7 +138,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit-notify
+  name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -124,7 +152,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit-rr
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -145,11 +173,11 @@ email:
 - kou@clear-code.com
 - mutomasa at gmail.com
 executables:
-- rmsginit
-- rmsgfmt
 - rmsgcat
-- rxgettext
+- rmsgfmt
+- rmsginit
 - rmsgmerge
+- rxgettext
 extensions: []
 extra_rdoc_files: []
 files:
@@ -184,8 +212,9 @@ files:
 - lib/gettext/tools/msginit.rb
 - lib/gettext/tools/msgmerge.rb
 - lib/gettext/tools/parser/erb.rb
+- lib/gettext/tools/parser/erubi.rb
 - lib/gettext/tools/parser/glade.rb
-- lib/gettext/tools/parser/haml.rb
+- lib/gettext/tools/parser/gtk_builder_ui_definitions.rb
 - lib/gettext/tools/parser/ruby.rb
 - lib/gettext/tools/task.rb
 - lib/gettext/tools/xgettext.rb
@@ -1514,6 +1543,7 @@ files:
 - samples/po/zh_TW/hello_tk.po.time_stamp
 - src/po_parser.ry
 - test/fixtures/_.rb
+- test/fixtures/_/backtick.rb
 - test/fixtures/_/block_parameter.rb
 - test/fixtures/_/double_quote_in_double_quote.rb
 - test/fixtures/_/double_quote_in_single_quote.rb
@@ -1524,11 +1554,18 @@ files:
 - test/fixtures/_/multiple_same_messages.rb
 - test/fixtures/_/one_line.rb
 - test/fixtures/_/one_new_line.rb
+- test/fixtures/_/percent_strings.rb
+- test/fixtures/_/pipe.rb
+- test/fixtures/_/quoted_symbol.rb
 - test/fixtures/backslash.rb
 - test/fixtures/erb/ascii.rhtml
 - test/fixtures/erb/ascii.rxml
+- test/fixtures/erb/case.rhtml
+- 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/hello.rb
 - test/fixtures/lower_n_.rb
 - test/fixtures/multi_text_domain.rb
@@ -1537,12 +1574,17 @@ files:
 - test/fixtures/ns_.rb
 - test/fixtures/ns_/custom.rb
 - test/fixtures/p_.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/gettext-test-utils.rb
+- test/fixtures/upper_nn_.rb
+- test/helper.rb
 - test/locale/cr/LC_MESSAGES/plural.mo
 - test/locale/da/LC_MESSAGES/plural.mo
 - test/locale/da/LC_MESSAGES/plural_error.mo
@@ -1550,6 +1592,8 @@ files:
 - test/locale/fr/LC_MESSAGES/plural_error.mo
 - test/locale/fr/LC_MESSAGES/test1.mo
 - test/locale/fr/LC_MESSAGES/test2.mo
+- test/locale/fr_BE/LC_MESSAGES/test1.mo
+- test/locale/fr_BE_Foo/LC_MESSAGES/test1.mo
 - test/locale/ir/LC_MESSAGES/plural.mo
 - test/locale/ja/LC_MESSAGES/_.mo
 - test/locale/ja/LC_MESSAGES/backslash.mo
@@ -1582,6 +1626,8 @@ files:
 - test/po/fr/plural_error.po
 - test/po/fr/test1.po
 - test/po/fr/test2.po
+- test/po/fr_BE/test1.po
+- test/po/fr_BE_Foo/test1.po
 - test/po/hello.pot
 - test/po/ir/plural.po
 - test/po/ja/_.edit.po
@@ -1653,6 +1699,8 @@ 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
 - test/tools/test_msgcat.rb
@@ -1660,11 +1708,12 @@ files:
 - test/tools/test_msgmerge.rb
 - test/tools/test_task.rb
 - test/tools/test_xgettext.rb
-homepage: http://ruby-gettext.github.com/
+homepage: https://ruby-gettext.github.io/
 licenses:
-- Ruby or LGPLv3+
+- Ruby
+- LGPL-3.0+
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1672,30 +1721,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: gettext
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.5.0.dev
+signing_key:
 specification_version: 4
 summary: Gettext is a pure Ruby libary and tools to localize messages.
 test_files:
+- test/test_class_info.rb
+- test/test_gettext.rb
 - test/test_locale_path.rb
+- test/test_mo.rb
 - test/test_parser.rb
-- test/test_class_info.rb
-- test/test_text_domain_toplevel.rb
+- test/test_po.rb
 - test/test_po_entry.rb
-- test/test_text_domain.rb
-- test/test_mo.rb
+- test/test_po_parser.rb
 - test/test_string.rb
-- test/test_po.rb
-- test/test_gettext.rb
+- test/test_text_domain.rb
 - test/test_text_domain_bind.rb
-- test/test_thread.rb
 - test/test_text_domain_multi.rb
-- test/test_po_parser.rb
+- test/test_text_domain_toplevel.rb
+- test/test_thread.rb