gettext 3.4.2 → 3.5.2

data/samples/po/nl/hello_gtk_builder.po

@@ -16,3 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "\n"
+
+msgid "window1"
+msgstr ""
+
+msgid ""
+"first line\n"
+"second line\n"
+"third line"
+msgstr ""
+
+msgid "<Hello world>"
+msgstr ""

data/samples/po/pt_BR/hello_gtk_builder.po

@@ -16,3 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "\n"
+
+msgid "window1"
+msgstr ""
+
+msgid ""
+"first line\n"
+"second line\n"
+"third line"
+msgstr ""
+
+msgid "<Hello world>"
+msgstr ""

data/samples/po/ru/hello_gtk_builder.po

@@ -17,3 +17,15 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4"
 " && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "\n"
+
+msgid "window1"
+msgstr ""
+
+msgid ""
+"first line\n"
+"second line\n"
+"third line"
+msgstr ""
+
+msgid "<Hello world>"
+msgstr ""

data/samples/po/sr/hello_gtk_builder.po

@@ -17,3 +17,15 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4"
 " && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "\n"
+
+msgid "window1"
+msgstr ""
+
+msgid ""
+"first line\n"
+"second line\n"
+"third line"
+msgstr ""
+
+msgid "<Hello world>"
+msgstr ""

data/samples/po/sv/hello_gtk_builder.po

@@ -16,3 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "\n"
+
+msgid "window1"
+msgstr ""
+
+msgid ""
+"first line\n"
+"second line\n"
+"third line"
+msgstr ""
+
+msgid "<Hello world>"
+msgstr ""

data/samples/po/uk/hello_gtk_builder.po

@@ -17,3 +17,15 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4"
 " && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "\n"
+
+msgid "window1"
+msgstr ""
+
+msgid ""
+"first line\n"
+"second line\n"
+"third line"
+msgstr ""
+
+msgid "<Hello world>"
+msgstr ""

data/samples/po/vi/hello_gtk_builder.po

@@ -16,3 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "\n"
+
+msgid "window1"
+msgstr ""
+
+msgid ""
+"first line\n"
+"second line\n"
+"third line"
+msgstr ""
+
+msgid "<Hello world>"
+msgstr ""

data/samples/po/zh/hello_gtk_builder.po

@@ -16,3 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "\n"
+
+msgid "window1"
+msgstr ""
+
+msgid ""
+"first line\n"
+"second line\n"
+"third line"
+msgstr ""
+
+msgid "<Hello world>"
+msgstr ""

data/samples/po/zh_TW/hello_gtk_builder.po

@@ -16,3 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "\n"
+
+msgid "window1"
+msgstr ""
+
+msgid ""
+"first line\n"
+"second line\n"
+"third line"
+msgstr ""
+
+msgid "<Hello world>"
+msgstr ""

data/src/po_parser.ry

@@ -2,9 +2,9 @@
 #
 #  po_parser.ry - ruby version of msgfmt
 #
-#  Copyright (C) 2002-2008 Masao Mutoh <mutomasa at gmail.com>
-#  Copyright (C) 2012-2017 Kouhei Sutou <kou@clear-code.com>
-#  Copyright (C) 2012-2013 Haruka Yoshihara <yoshihara@clear-code.com>
+#  Copyright (C) 2002-2008  Masao Mutoh <mutomasa at gmail.com>
+#  Copyright (C) 2012-2023  Sutou Kouhei <kou@clear-code.com>
+#  Copyright (C) 2012-2013  Haruka Yoshihara <yoshihara@clear-code.com>
 #
 #  You may redistribute it and/or modify it under the same
 #  license terms as Ruby or LGPL.
@@ -24,7 +24,7 @@ class GetText::POParser
   msgctxt
   : MSGCTXT string_list
   {
-    @msgctxt = unescape(val[1])
+    @msgctxt = val[1]
   }
   ;
 
@@ -36,9 +36,8 @@ class GetText::POParser
   single_message
   : MSGID string_list MSGSTR string_list
   {
-    msgid_raw = val[1]
-    msgid = unescape(msgid_raw)
-    msgstr = unescape(val[3])
+    msgid = val[1]
+    msgstr = val[3]
     use_message_p = true
     if @fuzzy and not msgid.empty?
       use_message_p = (not ignore_fuzzy?)
@@ -48,11 +47,15 @@ class GetText::POParser
         else
           $stderr.print _("Warning: fuzzy message was used.\n")
         end
-        $stderr.print "  #{@po_file}: msgid '#{msgid_raw}'\n"
+        $stderr.print "  #{@po_file}: msgid '#{msgid}'\n"
       end
     end
     @fuzzy = false
-    on_message(msgid, msgstr) if use_message_p
+    if use_message_p
+      on_message(msgid, msgstr)
+    else
+      clear
+    end
     result = ""
   }
 
@@ -144,31 +147,26 @@ require "gettext/po"
     @report_warning
   end
 
-  def unescape(orig)
-    ret = orig.gsub(/\\n/, "\n")
-    ret.gsub!(/\\t/, "\t")
-    ret.gsub!(/\\r/, "\r")
-    ret.gsub!(/\\"/, "\"")
-    ret
+  def unescape(string)
+    string.gsub(/\\(.)/) do
+      escaped_character = $1
+      case escaped_character
+      when "t"
+        "\t"
+      when "r"
+        "\r"
+      when "n"
+        "\n"
+      else
+        escaped_character
+      end
+    end
   end
   private :unescape
 
-  def unescape_string(string)
-    string.gsub(/\\\\/, "\\")
-  end
-  private :unescape_string
-
   def parse(str, data)
-    @translator_comments = []
-    @extracted_comments = []
-    @references = []
-    @flags = []
-    @previous = []
-    @comments = []
+    clear
     @data = data
-    @fuzzy = false
-    @msgctxt = nil
-    @msgid_plural = nil
 
     str = str.strip
     @q = []
@@ -202,7 +200,7 @@ require "gettext/po"
         @q.push [:COMMENT, $&]
         str = $'
       when /\A\"(.*)\"/
-        @q.push [:STRING, unescape_string($1)]
+        @q.push [:STRING, unescape($1)]
         str = $'
       else
         #c = str[0,1]
@@ -254,15 +252,7 @@ require "gettext/po"
       @data.set_comment(msgid, format_comment(@comments))
     end
 
-    @translator_comments = []
-    @extracted_comments = []
-    @references = []
-    @flags = []
-    @previous = []
-    @references = []
-    @comments.clear
-    @msgctxt = nil
-    @msgid_plural = nil
+    clear
   end
 
   def format_comment(comments)
@@ -274,7 +264,11 @@ require "gettext/po"
   end
 
   def on_comment(comment)
-    @fuzzy = true if (/fuzzy/ =~ comment)
+    if comment.start_with?(POFormat::FLAG_MARK)
+      content = comment[POFormat::FLAG_MARK.size..-1]
+      flags = parse_flags_line(content)
+      @fuzzy = flags.include?("fuzzy")
+    end
     if @data.instance_of?(PO)
       if comment == "#"
         @translator_comments << ""
@@ -289,7 +283,7 @@ require "gettext/po"
         when POFormat::REFERENCE_COMMENT_MARK
           @references.concat(parse_references_line(content))
         when POFormat::FLAG_MARK
-          @flags.concat(parse_flags_line(content))
+          @flags.concat(flags)
         when POFormat::PREVIOUS_COMMENT_MARK
           @previous << content
         else
@@ -358,7 +352,19 @@ require "gettext/po"
   end
 
   def parse_flags_line(line)
-    line.split(/\s+/)
+    line.split(",").collect(&:strip)
+  end
+
+  def clear
+    @translator_comments = []
+    @extracted_comments = []
+    @references = []
+    @flags = []
+    @previous = []
+    @references = []
+    @comments = []
+    @msgctxt = nil
+    @msgid_plural = nil
   end
 ---- footer
 

data/test/fixtures/erb/case.rhtml

@@ -0,0 +1,16 @@
+<%
+  require 'gettext'
+  include GetText
+  bindtextdomain("helloerb", :path => "locale")
+%>
+<html>
+<head>
+<title></title>
+</head>
+<body>
+  <%= _('Hello') %>
+  <% case 1 %>
+  <% end %>
+  <%= _('World') %>
+</body>
+</html>

data/test/po/ja/_.po

@@ -133,3 +133,18 @@ msgstr "ONE LINE"
 msgid ""
 "one new line\n"
 msgstr ""
+
+msgid "in_symbol_array"
+msgstr ""
+
+msgid "hello world"
+msgstr ""
+
+msgid "in_string_array"
+msgstr ""
+
+msgid "Hello"
+msgstr ""
+
+msgid "World"
+msgstr ""

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