gettext 3.2.9 → 3.4.9

data/test/test_parser.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2013  Kouhei Sutou <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,8 +23,8 @@
 
 require "tempfile"
 require "gettext/tools/parser/ruby"
-require "gettext/tools/parser/glade"
 require "gettext/tools/parser/erb"
+require "gettext/tools/parser/erubi"
 
 require "gettext/tools/xgettext"
 
@@ -97,6 +97,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,23 +178,61 @@ 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')
+  class TestErbParser < 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
+
+      erb_source = ERB.new(File.read(euc_file.path)).src
+      encoding = GetText::ErbParser.new(euc_file.path).detect_encoding(erb_source)
+
+      assert_equal("EUC-JP", encoding)
+    end
+
+    def test_ascii
+      path = fixture_path("erb", "ascii.rhtml")
+      @ary = GetText::ErbParser.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::ErbParser.parse(path)
+
+      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
+
+    def test_case
+      path = fixture_path("erb", "case.rhtml")
+      @ary = GetText::ErbParser.parse(path)
 
-      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])
+      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 TestErbParser < self
-    include GetTextTestUtils
+  class TestErubiParser < self
+    include Helper::Path
 
     def test_detect_encoding
       euc_file = Tempfile.new("euc-jp.rhtml")
@@ -168,26 +240,42 @@ class TestGetTextParser < Test::Unit::TestCase
       euc_file.puts("<%#-*- coding: euc-jp -*-%>")
       euc_file.close
 
-      erb_source = ERB.new(File.read(euc_file.path)).src
-      encoding = GetText::ErbParser.new(euc_file.path).detect_encoding(erb_source)
+      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
-      @ary = GetText::ErbParser.parse('fixtures/erb/ascii.rhtml')
+      path = fixture_path("erb", "ascii.rhtml")
+      @ary = GetText::ErubiParser.parse(path)
 
-      assert_target 'aaa', ['fixtures/erb/ascii.rhtml:8']
-      assert_target "aaa\n", ['fixtures/erb/ascii.rhtml:11']
-      assert_target 'bbb', ['fixtures/erb/ascii.rhtml:12']
-      assert_plural_target "ccc1", "ccc2", ['fixtures/erb/ascii.rhtml:13']
+      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
-      fixture_path = "fixtures/erb/non_ascii.rhtml"
-      @ary = GetText::ErbParser.parse(fixture_path)
+      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('わたし', ["#{fixture_path}:11"])
+      assert_target("Hello", ["#{path}:11"])
+      assert_target("World", ["#{path}:14"]) # Detected with Erubi
     end
   end
 

data/test/test_po_entry.rb

@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2019  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2010  masone (Christian Felder) <ema@rh-productions.ch>
 # Copyright (C) 2009  Masao Mutoh
 #
@@ -35,16 +33,6 @@ class TestPOEntry < Test::Unit::TestCase
     end
   end
 
-  def test_attribute_accumulation
-    tt = GetText::POEntry.new(:plural)
-    tt.set_current_attribute 'long'
-    tt.set_current_attribute ' tail'
-    tt.advance_to_next_attribute
-    tt.set_current_attribute 'long tails'
-    assert_equal 'long tail', tt.msgid
-    assert_equal 'long tails', tt.msgid_plural
-  end
-
   class TestSetType < self
     def test_varid_type
       entry = GetText::POEntry.new(:normal)
@@ -245,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
@@ -354,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,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012  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
@@ -62,6 +60,18 @@ EOP
   end
 
   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.
@@ -220,12 +230,47 @@ EOP
 msgid "hello"
 msgstr "bonjour"
 EOP
-      entries = parse_po_file(po_file, :ignore_fuzzy => false)
+      entries = suppress_warning do
+        parse_po_file(po_file, :ignore_fuzzy => false)
+      end
 
       assert_true(entries.has_key?("hello"))
       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/test_string.rb

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
-
 class TestGetTextString < Test::Unit::TestCase
   class TestFormat < self
+    include Helper::Warning
+
     def test_basic
       assert_equal("foo is a number", "%{msg} is a number" % {:msg => "foo"})
       assert_equal("bar is a number", "%s is a number" % ["bar"])
@@ -22,7 +22,9 @@ class TestGetTextString < Test::Unit::TestCase
 
     def test_percent
       assert_equal("% 1", "%% %<num>d" % {:num => 1.0})
-      assert_equal("%{num} %<num>d", "%%{num} %%<num>d" % {:num => 1})
+      suppress_warning do
+        assert_equal("%{num} %<num>d", "%%{num} %%<num>d" % {:num => 1})
+      end
     end
 
     def test_percent_in_replacement
@@ -30,8 +32,10 @@ class TestGetTextString < Test::Unit::TestCase
     end
 
     def test_no_placeholder
-      assert_equal("aaa", "aaa" % {:num => 1})
-      assert_equal("bbb", "bbb" % [1])
+      suppress_warning do
+        assert_equal("aaa", "aaa" % {:num => 1})
+        assert_equal("bbb", "bbb" % [1])
+      end
     end
 
     def test_ruby19_style

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

@@ -0,0 +1,63 @@
+# Copyright (C) 2020  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/gtk_builder_ui_definitions"
+
+class TestGtkBuilderUIDefinitionsParser < Test::Unit::TestCase
+  include Helper::Parser
+
+  def parse(file)
+    GetText::GtkBuilderUIDefinitionsParser.parse(fixture_path(file))
+  end
+
+  def test_ui
+    assert_parse([
+                   {
+                     :msgid => "label with context",
+                     :msgctxt => "context",
+                     :references => ["gtk_builder_ui_definitions.ui:19"],
+                   },
+                   {
+                     :msgid => "label simple",
+                     :references => ["gtk_builder_ui_definitions.ui:31"],
+                   },
+                   {
+                     :msgid => "multiple\n" + "lines\n" + "label",
+                     :references => ["gtk_builder_ui_definitions.ui:55"],
+                   },
+                 ],
+                 "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

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  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
@@ -24,49 +24,12 @@
 require "gettext/tools/parser/ruby"
 
 class TestRubyParser < Test::Unit::TestCase
-  include GetTextTestUtils
+  include Helper::Parser
 
-  private
   def parse(file)
     GetText::RubyParser.parse(fixture_path(file))
   end
 
-  def assert_parse(expected, file)
-    assert_equal(normalize_expected(expected),
-                 normalize_actual(parse(file)))
-  end
-
-  def normalize_expected(messages)
-    messages.collect do |message|
-      default = {
-        :msgid        => nil,
-        :msgid_plural => nil,
-        :msgstr       => nil,
-        :separator    => nil,
-        :references   => nil,
-      }
-      default.merge(message)
-    end
-  end
-
-  def normalize_actual(po)
-    po.collect do |po_entry|
-      {
-        :msgid        => po_entry.msgid,
-        :msgid_plural => po_entry.msgid_plural,
-        :msgstr       => po_entry.msgstr,
-        :separator    => po_entry.separator,
-        :references   => normalize_references(po_entry.references),
-      }
-    end
-  end
-
-  def normalize_references(references)
-    references.collect do |reference|
-      reference.sub(/\A#{Regexp.escape(fixture_path)}\//, "")
-    end
-  end
-
   class TestDetectEncoding < self
     def test_ascii_and_hyphen
       assert_equal("euc-jp", detect_encoding("# coding: euc-jp"))
@@ -227,6 +190,53 @@ class TestRubyParser < Test::Unit::TestCase
                    path)
     end
 
+
+    def test_percent_strings
+      path = "percent_strings.rb"
+      assert_parse([
+                     {
+                       :msgid      => "in_symbol_array",
+                       :references => ["#{path}:31"],
+                     },
+                     {
+                       :msgid      => "hello world",
+                       :references => ["#{path}:39"],
+                     },
+                     {
+                       :msgid      => "in_string_array",
+                       :references => ["#{path}:47"],
+                     },
+                   ],
+                   path)
+    end
+
+    def test_quoted_symbol
+      path = "quoted_symbol.rb"
+      assert_parse([],
+                   path)
+    end
+
+    def test_backtick
+      path = "backtick.rb"
+      assert_parse([],
+                   path)
+    end
+
+    def test_pipe
+      path = "pipe.rb"
+      assert_parse([
+                     {
+                       :msgid      => "Hello",
+                       :references => ["#{path}:26"],
+                     },
+                     {
+                       :msgid      => "World",
+                       :references => ["#{path}:28"],
+                     },
+                   ],
+                   path)
+    end
+
     private
     def fixture_path(*components)
       super("_", *components)
@@ -271,4 +281,31 @@ class TestRubyParser < Test::Unit::TestCase
       super("ns_", *components)
     end
   end
+
+  sub_test_case("parse") do
+    def test_percent_w
+      assert_parse([],
+                   "percent_lower_w.rb")
+    end
+
+    def test_percent_W
+      assert_parse([],
+                   "percent_upper_w.rb")
+    end
+
+    def test_percent_i
+      assert_parse([],
+                   "percent_lower_i.rb")
+    end
+
+    def test_percent_I
+      assert_parse([],
+                   "percent_upper_i.rb")
+    end
+
+    private
+    def fixture_path(*components)
+      super("ruby", *components)
+    end
+  end
 end