gettext 3.3.8 → 3.4.9

data/test/po/ns_.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ns_ 3.3.8\n"
+"Project-Id-Version: ns_ 3.4.4\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"
+"POT-Creation-Date: 2023-06-11 06:20+0900\n"
+"PO-Revision-Date: 2023-06-11 06:20+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/p_.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: p_ 3.3.8\n"
+"Project-Id-Version: p_ 3.4.4\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"
+"POT-Creation-Date: 2023-06-11 06:20+0900\n"
+"PO-Revision-Date: 2023-06-11 06:20+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/s_.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: s_ 3.3.8\n"
+"Project-Id-Version: s_ 3.4.4\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"
+"POT-Creation-Date: 2023-06-11 06:20+0900\n"
+"PO-Revision-Date: 2023-06-11 06:20+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/untranslated.pot

@@ -1,15 +1,15 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the gettext package.
+# This file is distributed under the same license as the untranslated package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 3.0.0\n"
+"Project-Id-Version: untranslated 3.4.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-30 22:00+0900\n"
-"PO-Revision-Date: 2013-08-30 22:00+0900\n"
+"POT-Creation-Date: 2023-06-11 06:20+0900\n"
+"PO-Revision-Date: 2023-06-11 06:20+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/test_gettext.rb

@@ -59,6 +59,29 @@ class TestGetText < Test::Unit::TestCase
     assert_equal("nomsgstr", _("nomsgstr"))
   end
 
+  def test_fallbacks
+    bindtextdomain("test1", "locale")
+    test = Simple.new
+
+    # Translation present in all candidates
+    GetText.set_current_locale("fr_BE_Foo")
+    assert_equal("french-Belgium-Foo", test.test)
+    GetText.set_current_locale("fr_BE")
+    assert_equal("french-Belgium", test.test)
+    GetText.set_current_locale("fr")
+    assert_equal("french", test.test)
+
+    # Translation Missing in fr_BE_Foo (fallback to fr_BE)
+    GetText.set_current_locale("fr_BE_Foo")
+    assert_equal("FRENCH-BELGIUM:ONE IS 1.", test.test_formatted_string)
+
+    # Translation Missing in fr_BE_Foo *and* fr_BE (both languages fallback to fr)
+    GetText.set_current_locale("fr_BE_Foo")
+    assert_equal("FRENCH:Il y a 5 pommes.", test.test_plural)
+    GetText.set_current_locale("fr_BE")
+    assert_equal("FRENCH:Il y a 5 pommes.", test.test_plural)
+  end
+
   def test_empty
     bindtextdomain("test1", "locale")
     assert_equal("japanese", gettext("language"))

data/test/test_locale_path.rb

@@ -53,9 +53,11 @@ class TestLocalePath < Test::Unit::TestCase
     testdir = File.dirname(File.expand_path(__FILE__))
     path = GetText::LocalePath.new("test1", "#{testdir}/locale")
     assert_equal({
-                   "ja"      => "#{testdir}/locale/ja/LC_MESSAGES/test1.mo",
-                   "fr"      => "#{testdir}/locale/fr/LC_MESSAGES/test1.mo",
-                   "zh_Hant" => "#{testdir}/locale/zh_Hant/LC_MESSAGES/test1.mo"
+                   "ja"        => "#{testdir}/locale/ja/LC_MESSAGES/test1.mo",
+                   "fr"        => "#{testdir}/locale/fr/LC_MESSAGES/test1.mo",
+                   "fr_BE"     => "#{testdir}/locale/fr_BE/LC_MESSAGES/test1.mo",
+                   "fr_BE_Foo" => "#{testdir}/locale/fr_BE_Foo/LC_MESSAGES/test1.mo",
+                   "zh_Hant"   => "#{testdir}/locale/zh_Hant/LC_MESSAGES/test1.mo"
                  },
                  path.locale_paths)
     assert_equal("#{testdir}/locale/ja/LC_MESSAGES/test1.mo",
@@ -66,6 +68,12 @@ class TestLocalePath < Test::Unit::TestCase
                  path.current_path(Locale::Tag.parse("ja_JP.UTF-8")))
     assert_equal(nil,
                  path.current_path(Locale::Tag.parse("en")))
+    assert_equal("#{testdir}/locale/fr/LC_MESSAGES/test1.mo",
+                 path.current_path(Locale::Tag.parse("fr")))
+    assert_equal("#{testdir}/locale/fr_BE/LC_MESSAGES/test1.mo",
+                 path.current_path(Locale::Tag.parse("fr-BE")))
+    assert_equal("#{testdir}/locale/fr_BE_Foo/LC_MESSAGES/test1.mo",
+                 path.current_path(Locale::Tag.parse("fr-BE-Foo")))
     assert_equal("#{testdir}/locale/zh_Hant/LC_MESSAGES/test1.mo",
                  path.current_path(Locale::Tag.parse("zh-Hant")))
   end
@@ -73,7 +81,7 @@ class TestLocalePath < Test::Unit::TestCase
   def test_supported_locales
     testdir = File.dirname(File.expand_path(__FILE__))
     path = GetText::LocalePath.new("test1", "#{testdir}/locale")
-    assert_equal ["fr", "ja", "zh_Hant"], path.supported_locales
+    assert_equal ["fr", "fr_BE", "fr_BE_Foo", "ja", "zh_Hant"], path.supported_locales
 
     path = GetText::LocalePath.new("plural", "#{testdir}/locale")
     assert_equal ["cr", "da", "fr", "ir", "ja", "la", "li", "po", "sl"], path.supported_locales

data/test/test_parser.rb

@@ -24,6 +24,7 @@
 require "tempfile"
 require "gettext/tools/parser/ruby"
 require "gettext/tools/parser/erb"
+require "gettext/tools/parser/erubi"
 
 require "gettext/tools/xgettext"
 
@@ -215,6 +216,67 @@ class TestGetTextParser < Test::Unit::TestCase
 
       assert_target("Hello", ["#{path}:8"])
     end
+
+    def test_case
+      path = fixture_path("erb", "case.rhtml")
+      @ary = GetText::ErbParser.parse(path)
+
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
+        assert_target("Hello", ["#{path}:11"])
+        assert_target("World", ["#{path}:14"])
+      else
+        assert_target("Hello", ["#{path}:11"])
+        assert_nil(@ary.detect {|elem| elem.msgid == 'World'}) # Not detected. see PR #91
+      end
+    end
+  end
+
+  class TestErubiParser < self
+    include Helper::Path
+
+    def test_detect_encoding
+      euc_file = Tempfile.new("euc-jp.rhtml")
+      euc_file.open
+      euc_file.puts("<%#-*- coding: euc-jp -*-%>")
+      euc_file.close
+
+      euc_file_content = File.read(euc_file.path)
+      encoding = GetText::ErubiParser.new(euc_file.path).detect_encoding(euc_file_content)
+
+      assert_equal("EUC-JP", encoding)
+    end
+
+    def test_ascii
+      path = fixture_path("erb", "ascii.rhtml")
+      @ary = GetText::ErubiParser.parse(path)
+
+      assert_target 'aaa', ["#{path}:8"]
+      assert_target "aaa\n", ["#{path}:11"]
+      assert_target 'bbb', ["#{path}:12"]
+      assert_plural_target "ccc1", "ccc2", ["#{path}:13"]
+    end
+
+    def test_non_ascii
+      path = fixture_path("erb", "non_ascii.rhtml")
+      @ary = GetText::ErubiParser.parse(path)
+
+      assert_target('わたし', ["#{path}:12"])
+    end
+
+    def test_minus
+      path = fixture_path("erb", "minus.rhtml")
+      @ary = GetText::ErubiParser.parse(path)
+
+      assert_target("Hello", ["#{path}:8"])
+    end
+
+    def test_case
+      path = fixture_path("erb", "case.rhtml")
+      @ary = GetText::ErubiParser.parse(path)
+
+      assert_target("Hello", ["#{path}:11"])
+      assert_target("World", ["#{path}:14"]) # Detected with Erubi
+    end
   end
 
   def test_xgettext_parse

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/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,5 +1,5 @@
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2021  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -312,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"
@@ -359,7 +364,7 @@ EOF
     def test_ro
       assert_equal("nplurals=3; " +
                    "plural=(n == 1) ? 0 : " +
-                   "(n == 0) || ((n % 100) >= 2 && (n % 100) <= 19) ? 1 : 2;",
+                   "(n == 0) || (n != 1) && ((n % 100) >= 1 && (n % 100) <= 19) ? 1 : 2;",
                    @msginit.__send__(:plural_forms, "ro"))
     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

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