gettext 3.3.6 → 3.4.9

data/test/test_po_entry.rb

@@ -233,13 +233,15 @@ EOE
       class TestEscape < self
         def test_normal
           entry = GetText::POEntry.new(:normal)
-          entry.msgid = "He said \"hello.\""
-          entry.msgstr = "Il a dit \"bonjour.\""
+          entry.msgid = "He said \"hello.\"\r\n"
+          entry.msgstr = "Il a dit \"bonjour.\"\r\n"
           entry.references = ["file1:1", "file2:10"]
           expected_po = <<-EOE
 #: file1:1 file2:10
-msgid "He said \\"hello.\\""
-msgstr "Il a dit \\"bonjour.\\""
+msgid ""
+"He said \\"hello.\\"\\r\\n"
+msgstr ""
+"Il a dit \\"bonjour.\\"\\r\\n"
 EOE
           assert_equal(expected_po, entry.to_s)
         end
@@ -342,6 +344,20 @@ EOP
       assert_equal(expected_po, entry.to_s)
     end
 
+    def test_multiple_flags
+      entry = GetText::POEntry.new(:normal)
+      entry.msgid = "msgid"
+      entry.msgstr = "msgstr"
+      entry.flags = ["It's the flag.", "fuzzy"]
+
+      expected_po = <<-EOP
+#, It's the flag., fuzzy
+msgid "msgid"
+msgstr "msgstr"
+EOP
+      assert_equal(expected_po, entry.to_s)
+    end
+
     def test_previous
       entry = GetText::POEntry.new(:normal)
       entry.msgid = "msgid"

data/test/test_po_parser.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2020  Sutou Kouhei <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
@@ -62,6 +62,16 @@ EOP
   class TestPO < self
     include Helper::Warning
 
+    def test_msgid_escape
+      po_file = create_po_file(<<-'EOP')
+msgid "\\\\r \\r \t \r \n"
+msgstr "\\\\r \\r \t \r \n"
+EOP
+      entries = parse_po_file(po_file)
+      assert_equal("\\\\r \\r \t \r \n",
+                   entries["\\\\r \\r \t \r \n"].msgstr)
+    end
+
     def test_msgstr
       po_file = create_po_file(<<-EOP)
 # This is the comment.
@@ -228,6 +238,39 @@ EOP
       assert_equal("fuzzy", entries["hello"].flag)
     end
 
+    def test_fuzzy_ignore
+      po_file = create_po_file(<<-PO)
+#, fuzzy
+#: file.rb:10
+msgid "hello"
+msgstr "bonjour"
+
+#, c-format, fuzzy , no-sh-format
+#: file.rb:11
+msgid "world"
+msgstr "monde"
+
+# This is not fuzzy
+msgid "non-fuzzy"
+msgstr "non-fuzzy string"
+PO
+      entries = suppress_warning do
+        parse_po_file(po_file)
+      end
+
+      actual = entries.collect do |entry|
+        [
+          entry.msgid,
+          entry.msgstr,
+          entry.flags,
+        ]
+      end
+      assert_equal([
+                     ["non-fuzzy", "non-fuzzy string", []],
+                   ],
+                   actual)
+    end
+
     private
     def parse_po_file(po_file, options={:ignore_fuzzy => true})
       ignore_fuzzy = options[:ignore_fuzzy]

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_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-2020  Sutou Kouhei <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
@@ -654,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
@@ -784,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-2020  Sutou Kouhei <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
@@ -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