gettext 3.3.8 → 3.4.9

data/samples/po/ru/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/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/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/fixtures/simple.rb

@@ -13,4 +13,8 @@ class Simple
   def test_formatted_string
     _("one is %d.") % 1
   end
+
+  def test_plural
+    n_("There is an apple.", "There are %{num} apples.", 5) % {:num => 5}
+  end
 end

data/test/po/_.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: _ 3.3.8\n"
+"Project-Id-Version: _ 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/backslash.pot

@@ -1,16 +1,18 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the backslash package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-19 22:58+0900\n"
-"PO-Revision-Date: 2012-08-19 22:58+0900\n"
+"Project-Id-Version: backslash 3.4.4\n"
+"Report-Msgid-Bugs-To: \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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

data/test/po/fr/test1.po

@@ -13,6 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
+"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
 
 #: simple.rb:10
 msgid "language"
@@ -21,3 +22,9 @@ msgstr "french"
 #: simple.rb:14
 msgid "one is %d."
 msgstr "FRENCH:ONE IS %d."
+
+#: simple.rb:18
+msgid "There is an apple."
+msgid_plural "There are %{num} apples."
+msgstr[0] "FRENCH:Il y a une pomme."
+msgstr[1] "FRENCH:Il y a %{num} pommes."

data/test/po/fr_BE/test1.po

@@ -0,0 +1,24 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2002-01-01 02:24:56+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: ENCODING\n"
+"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
+
+#: simple.rb:10
+msgid "language"
+msgstr "french-Belgium"
+
+#: simple.rb:14
+msgid "one is %d."
+msgstr "FRENCH-BELGIUM:ONE IS %d."

data/test/po/fr_BE_Foo/test1.po

@@ -0,0 +1,20 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2002-01-01 02:24:56+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: ENCODING\n"
+"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
+
+#: simple.rb:10
+msgid "language"
+msgstr "french-Belgium-Foo"

data/test/po/hello.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hello 3.1.7\n"
+"Project-Id-Version: hello 3.4.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-22 14:05+0900\n"
-"PO-Revision-Date: 2015-09-22 14:05+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/ja/_.edit.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2018-06-17 07:37+0900\n"
+"PO-Revision-Date: 2023-10-22 06:37+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -84,8 +84,8 @@ msgid "#"
 msgstr ""
 
 #: ../fixtures/_.rb:96
-msgid "\taaa'bbb\\ccc"
-msgstr ""
+msgid "\\taaa'bbb\\ccc"
+msgstr "AAA"
 
 #: ../fixtures/_.rb:100
 msgid ""

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/po/ja/hello.edit.po

@@ -7,7 +7,6 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 3.1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-22 14:05+0900\n"
 "PO-Revision-Date: 2015-09-22 14:06+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Japanese\n"

data/test/po/non_ascii.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 non_ascii package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 3.0.0\n"
+"Project-Id-Version: non_ascii 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/po/np_.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: np_ 3.3.8\n"
+"Project-Id-Version: np_ 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"