gettext 3.2.9 → 3.4.9

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.edit.po

@@ -17,3 +17,18 @@ 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"
+
+#: ../hello_gtk_builder.ui:7
+msgid "window1"
+msgstr ""
+
+#: ../hello_gtk_builder.ui:16
+msgid ""
+"first line\n"
+"second line\n"
+"third line"
+msgstr ""
+
+#: ../hello_gtk_builder.ui:28
+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.edit.po

@@ -16,3 +16,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "\n"
+
+#: ../hello_gtk_builder.ui:7
+msgid "window1"
+msgstr ""
+
+#: ../hello_gtk_builder.ui:16
+msgid ""
+"first line\n"
+"second line\n"
+"third line"
+msgstr ""
+
+#: ../hello_gtk_builder.ui:28
+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.edit.po

@@ -17,3 +17,18 @@ 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"
+
+#: ../hello_gtk_builder.ui:7
+msgid "window1"
+msgstr ""
+
+#: ../hello_gtk_builder.ui:16
+msgid ""
+"first line\n"
+"second line\n"
+"third line"
+msgstr ""
+
+#: ../hello_gtk_builder.ui:28
+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.edit.po

@@ -16,3 +16,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "\n"
+
+#: ../hello_gtk_builder.ui:7
+msgid "window1"
+msgstr ""
+
+#: ../hello_gtk_builder.ui:16
+msgid ""
+"first line\n"
+"second line\n"
+"third line"
+msgstr ""
+
+#: ../hello_gtk_builder.ui:28
+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.edit.po

@@ -16,3 +16,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "\n"
+
+#: ../hello_gtk_builder.ui:7
+msgid "window1"
+msgstr ""
+
+#: ../hello_gtk_builder.ui:16
+msgid ""
+"first line\n"
+"second line\n"
+"third line"
+msgstr ""
+
+#: ../hello_gtk_builder.ui:28
+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.edit.po

@@ -16,3 +16,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "\n"
+
+#: ../hello_gtk_builder.ui:7
+msgid "window1"
+msgstr ""
+
+#: ../hello_gtk_builder.ui:16
+msgid ""
+"first line\n"
+"second line\n"
+"third line"
+msgstr ""
+
+#: ../hello_gtk_builder.ui:28
+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/_/backtick.rb

@@ -0,0 +1,30 @@
+# Copyright (C) 2020  Kitaiti Makoto <KitaitiMakoto@gmail.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/>.
+
+module Fixtures
+  module Method_
+    class Backtick
+      include GetText
+
+      bindtextdomain("_", :path => Helper::Path.locale_path)
+
+      def backtick
+        _(`echo hello world`)
+      end
+    end
+  end
+end

data/test/fixtures/_/block_parameter.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2017-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -20,7 +20,7 @@ module Fixtures
     class BlockParameter
       include GetText
 
-      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+      bindtextdomain("_", :path => Helper::Path.locale_path)
 
       def message
         message_generator = lambda do |_|

data/test/fixtures/_/double_quote_in_double_quote.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -22,7 +22,7 @@ module Fixtures
     class DoubleQuoteInDoubleQuote
       include GetText
 
-      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+      bindtextdomain("_", :path => Helper::Path.locale_path)
 
       def message
         _("double \"quote\" in double quote")

data/test/fixtures/_/double_quote_in_single_quote.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -22,7 +22,7 @@ module Fixtures
     class DoubleQuoteInSingleQuote
       include GetText
 
-      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+      bindtextdomain("_", :path => Helper::Path.locale_path)
 
       def message
         _('double "quote" in single quote')

data/test/fixtures/_/literal_concatenation_with_continuation_line.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -22,7 +22,7 @@ module Fixtures
     class LiteralConcatenationWithContinuationLine
       include GetText
 
-      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+      bindtextdomain("_", :path => Helper::Path.locale_path)
 
       def message
         _("literal " \

data/test/fixtures/_/middle_new_line.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -22,7 +22,7 @@ module Fixtures
     class MiddleNewLine
       include GetText
 
-      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+      bindtextdomain("_", :path => Helper::Path.locale_path)
 
       def message
         _("middle\nnew line")

data/test/fixtures/_/multiple_lines_literal.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -22,7 +22,7 @@ module Fixtures
     class MultipleLinesLiteral
       include GetText
 
-      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+      bindtextdomain("_", :path => Helper::Path.locale_path)
 
       def message
         _("multiple

data/test/fixtures/_/multiple_messages_in_same_line.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -22,7 +22,7 @@ module Fixtures
     class MultipleMessagesInSameLine
       include GetText
 
-      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+      bindtextdomain("_", :path => Helper::Path.locale_path)
 
       def message
         _("multiple") + " messages " + _("in same line")

data/test/fixtures/_/multiple_same_messages.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -22,7 +22,7 @@ module Fixtures
     class MultipleSameMessages
       include GetText
 
-      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+      bindtextdomain("_", :path => Helper::Path.locale_path)
 
       def message
         _("multiple same messages")

data/test/fixtures/_/one_line.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -22,7 +22,7 @@ module Fixtures
     class OneLine
       include GetText
 
-      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+      bindtextdomain("_", :path => Helper::Path.locale_path)
 
       def message
         _("one line")

data/test/fixtures/_/one_new_line.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -22,7 +22,7 @@ module Fixtures
     class OneNewLine
       include GetText
 
-      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+      bindtextdomain("_", :path => Helper::Path.locale_path)
 
       def message
         _("one new line\n")

data/test/fixtures/_/percent_strings.rb

@@ -0,0 +1,55 @@
+# Copyright (C) 2020  Kitaiti Makoto <KitaitiMakoto@gmail.com>
+# 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/>.
+
+module Fixtures
+  module Method_
+    class PercentStrings
+      include GetText
+
+      bindtextdomain("_", :path => Helper::Path.locale_path)
+
+      def symbol_array
+        _(%i(hello world))
+      end
+
+      def in_symbol_array
+        %I(before#{_("in_symbol_array")}after)
+      end
+
+      def symbol
+        _(%s(hello world))
+      end
+
+      def string
+        _(%(hello world))
+      end
+
+      def string_array
+        _(%w(hello world))
+      end
+
+      def in_string_array
+        %W(before#{_("in_string_array")}after)
+      end
+
+      def execute
+        _(%x(echo hello world))
+      end
+    end
+  end
+end