gettext 3.3.6 → 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/_.rb

@@ -24,7 +24,7 @@ require 'gettext'
 include GetText
 
 class MessageFixture
-  bindtextdomain("rubyparser", :path => "locale")
+  bindtextdomain("rubyparser", :path => Helper::Path.locale_path)
 
   def test_1
     _("aaa")

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/{gtk_builder_ui_definitions.ui~ → glade/3.glade}

@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk+" version="3.24"/>
   <object class="GtkWindow">
-    <property name="can_focus">False</property>
-    <child>
-      <placeholder/>
-    </child>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="context" comments="comment">label with context</property>
+            <property name="can-focus">False</property>
+            <property name="label">untranslatable label</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -27,8 +24,8 @@
         <child>
           <object class="GtkLabel">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">label simple</property>
+            <property name="can-focus">False</property>
+            <property name="label" translatable="yes" comments="comment for translator">label with comment</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -39,8 +36,8 @@
         <child>
           <object class="GtkLabel">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label">not trnanslatable label</property>
+            <property name="can-focus">False</property>
+            <property name="label" translatable="yes">label without comment</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -51,10 +48,8 @@
         <child>
           <object class="GtkLabel">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">multiple
-lines
-label</property>
+            <property name="can-focus">False</property>
+            <property name="label" translatable="yes" context="context">label with context</property>
           </object>
           <packing>
             <property name="expand">False</property>

data/test/fixtures/multi_text_domain.rb

@@ -4,8 +4,8 @@ module MultiTextDomain
   class C11
     include GetText
     def initialize
-      bindtextdomain("test1", :path => "locale")
-      bindtextdomain("test2", :path => "locale")
+      bindtextdomain("test1", :path => Helper::Path.locale_path)
+      bindtextdomain("test2", :path => Helper::Path.locale_path)
     end
     def test
       _("language")
@@ -17,8 +17,8 @@ module MultiTextDomain
 
   class C12
     include GetText
-    bindtextdomain("test1", :path => "locale")
-    bindtextdomain("test2", :path => "locale")
+    bindtextdomain("test1", :path => Helper::Path.locale_path)
+    bindtextdomain("test2", :path => Helper::Path.locale_path)
 
     def test
       _("language")
@@ -36,7 +36,7 @@ module MultiTextDomain
 
   module M1
     include GetText
-    bindtextdomain("test1", :path => "locale")
+    bindtextdomain("test1", :path => Helper::Path.locale_path)
 
     module_function
     def test
@@ -57,7 +57,7 @@ module MultiTextDomain
 
     class M1C1
       include GetText
-      bindtextdomain("test2", :path => "locale")
+      bindtextdomain("test2", :path => Helper::Path.locale_path)
       def test
         _("language")
       end
@@ -69,7 +69,7 @@ module MultiTextDomain
     class M1C2
       include GetText
       def initialize
-        bindtextdomain("test2", :path => "locale")
+        bindtextdomain("test2", :path => Helper::Path.locale_path)
       end
       def test
         _("language")
@@ -84,7 +84,7 @@ module MultiTextDomain
   class C2
     include GetText
     def initialize
-      bindtextdomain("test1", :path => "locale")
+      bindtextdomain("test1", :path => Helper::Path.locale_path)
     end
 
     def test
@@ -98,7 +98,7 @@ module MultiTextDomain
 
   class C3
     include GetText
-    bindtextdomain("test1", :path => "locale")
+    bindtextdomain("test1", :path => Helper::Path.locale_path)
 
     def test
       _("language")
@@ -110,7 +110,7 @@ module MultiTextDomain
   end
 
   class C4 < C3
-    bindtextdomain("test2", :path => "locale")
+    bindtextdomain("test2", :path => Helper::Path.locale_path)
 
     def test2
       _("LANGUAGE")
@@ -123,13 +123,13 @@ module MultiTextDomain
 
   class C51
     include GetText
-    bindtextdomain("test3", :path => "locale")
+    bindtextdomain("test3", :path => Helper::Path.locale_path)
     def test
       _("language")
     end
   end
 
   class C52 < C12
-    bindtextdomain("test3", :path => "locale")
+    bindtextdomain("test3", :path => Helper::Path.locale_path)
   end
 end

data/test/fixtures/np_.rb

@@ -22,7 +22,7 @@ require 'gettext'
 
 class TestNPGetText
   include GetText
-  bindtextdomain("np_", :path => "locale")
+  bindtextdomain("np_", :path => Helper::Path.locale_path)
 
   def test_1
     [np_("Magazine", "a book", "%{num} books", 1),

data/test/fixtures/ns_.rb

@@ -22,7 +22,7 @@ require 'gettext'
 
 class TestNSGetText
   include GetText
-  bindtextdomain("ns_", :path => "locale")
+  bindtextdomain("ns_", :path => Helper::Path.locale_path)
 
   def test_1
     [ns_("AAA|BBB", "CCC", 1), ns_("AAA|BBB", "CCC", 2)]

data/test/fixtures/p_.rb

@@ -23,7 +23,7 @@ require 'gettext'
 
 class TestPGetText
   include GetText
-  bindtextdomain("p_", :path => "locale")
+  bindtextdomain("p_", :path => Helper::Path.locale_path)
 
   def test_1
     p_("AAA", "BBB")

data/test/fixtures/s_.rb

@@ -22,7 +22,7 @@ require 'gettext'
 
 class TestSGetText
   include GetText
-  bindtextdomain("s_", :path => "locale")
+  bindtextdomain("s_", :path => Helper::Path.locale_path)
 
   def test_1
     s_("AAA|BBB")

data/test/fixtures/simple.rb

@@ -4,7 +4,7 @@ require 'gettext'
 
 class Simple
   include GetText
-  bindtextdomain("test1", :path => "locale")
+  bindtextdomain("test1", :path => Helper::Path.locale_path)
 
   def test
     _("language")
@@ -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