gettext 2.3.3 → 2.3.4

data/samples/po/hello_glade2.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.3\n"
+"Project-Id-Version: gettext 2.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 10:26+0900\n"
-"PO-Revision-Date: 2012-10-17 10:26+0900\n"
+"POT-Creation-Date: 2012-11-15 10:50+0900\n"
+"PO-Revision-Date: 2012-11-15 10:50+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/samples/po/hello_gtk2.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.3\n"
+"Project-Id-Version: gettext 2.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 10:26+0900\n"
-"PO-Revision-Date: 2012-10-17 10:26+0900\n"
+"POT-Creation-Date: 2012-11-15 10:50+0900\n"
+"PO-Revision-Date: 2012-11-15 10:50+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/samples/po/hello_noop.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.3\n"
+"Project-Id-Version: gettext 2.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 10:26+0900\n"
-"PO-Revision-Date: 2012-10-17 10:26+0900\n"
+"POT-Creation-Date: 2012-11-15 10:50+0900\n"
+"PO-Revision-Date: 2012-11-15 10:50+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/samples/po/hello_plural.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.3\n"
+"Project-Id-Version: gettext 2.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 10:26+0900\n"
-"PO-Revision-Date: 2012-10-17 10:26+0900\n"
+"POT-Creation-Date: 2012-11-15 10:50+0900\n"
+"PO-Revision-Date: 2012-11-15 10:50+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/samples/po/hello_tk.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.3\n"
+"Project-Id-Version: gettext 2.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 10:26+0900\n"
-"PO-Revision-Date: 2012-10-17 10:26+0900\n"
+"POT-Creation-Date: 2012-11-15 10:50+0900\n"
+"PO-Revision-Date: 2012-11-15 10:50+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/src/poparser.ry

@@ -9,7 +9,7 @@
 #  You may redistribute it and/or modify it under the same
 #  license terms as Ruby or LGPL.
 
-class GetText::PoParser
+class GetText::POParser
   token COMMENT MSGID MSGCTXT MSGID_PLURAL MSGSTR STRING PLURAL_NUM
 
   rule
@@ -24,7 +24,7 @@ class GetText::PoParser
   msgctxt
   : MSGCTXT string_list
   {
-    @msgctxt = unescape(val[1]) + "\004"
+    @msgctxt = unescape(val[1])
   }
   ;
 
@@ -52,7 +52,7 @@ class GetText::PoParser
       end
     end
     @fuzzy = false
-    on_message(@msgctxt + msgid, msgstr) if use_message_p
+    on_message(msgid, msgstr) if use_message_p
     result = ""
   }
 
@@ -70,7 +70,8 @@ class GetText::PoParser
       end
       @fuzzy = false
     else
-      on_message(@msgctxt + unescape(val[1]) + "\000" + unescape(val[3]), unescape(val[4]))
+      @msgid_plural = unescape(val[3])
+      on_message(unescape(val[1]), unescape(val[4]))
     end
     result = ""
   }
@@ -115,7 +116,13 @@ class GetText::PoParser
   ;
 end
 
+---- header
+require "gettext/tools/po"
+require "gettext/tools/msgmerge"
 ---- inner
+  # for backward compatibility.
+  PoParser = POParser
+
   if GetText.respond_to?(:bindtextdomain)
     include GetText
     GetText.bindtextdomain("gettext")
@@ -155,10 +162,16 @@ end
   private :unescape_string
 
   def parse(str, data)
+    @translator_comments = []
+    @extracted_comments = []
+    @references = []
+    @flag = []
+    @previous = []
     @comments = []
     @data = data
     @fuzzy = false
-    @msgctxt = ""
+    @msgctxt = nil
+    @msgid_plural = nil
 
     str.strip!
     @q = []
@@ -221,16 +234,89 @@ end
 
   def on_message(msgid, msgstr)
     msgstr = nil if msgstr.empty?
-    @data[msgid] = msgstr
-    @data.set_comment(msgid, @comments.join("\n"))
 
+    if @data.instance_of?(PO) or
+        @data.instance_of?(GetText::Tools::MsgMerge::PoData)
+      type = detect_entry_type
+      entry = POEntry.new(type)
+      entry.translator_comment = format_comment(@translator_comments)
+      entry.extracted_comment = format_comment(@extracted_comments)
+      entry.flag = format_comment(@flag)
+      entry.previous = format_comment(@previous)
+      entry.references = @references
+      entry.msgctxt = @msgctxt
+      entry.msgid = msgid
+      entry.msgid_plural = @msgid_plural
+      entry.msgstr = msgstr
+
+      if @data.instance_of?(PO)
+        @data[@msgctxt, msgid] = entry
+      elsif @data.instance_of?(GetText::Tools::MsgMerge::PoData)
+        id = ""
+        id << "#{@msgctxt}\004" unless @msgctxt.nil?
+        id << msgid
+        id << "\000#{@msgid_plural}" unless @msgid_plural.nil?
+        @data[id] = entry
+      end
+    else
+      options = {}
+      options[:msgctxt] = @msgctxt
+      options[:msgid_plural] = @msgid_plural
+      @data.store(msgid, msgstr, options)
+      @data.set_comment(msgid, format_comment(@comments))
+    end
+
+    @translator_comments = []
+    @extracted_comments = []
+    @references = []
+    @flag = []
+    @previous = []
+    @references = []
     @comments.clear
-    @msgctxt = ""
+    @msgctxt = nil
+    @msgid_plural = nil
   end
 
+  def format_comment(comments)
+    return "" if comments.empty?
+
+    comment = comments.join("\n")
+    comment << "\n" if comments.last.empty?
+    comment
+  end
+
+  TRANSLATOR_COMMENT_MARK = "# "
+  EXTRACTED_COMMENT_MARK = "#."
+  FLAG_MARK = "#,"
+  PREVIOUS_MSGID_COMMENT_MARK = "#|"
+  REFERENCE_COMMENT_MARK = "#:"
   def on_comment(comment)
     @fuzzy = true if (/fuzzy/ =~ comment)
-    @comments << comment
+    if @data.instance_of?(PO) or
+        @data.instance_of?(GetText::Tools::MsgMerge::PoData)
+      if comment == "#"
+        @translator_comments << ""
+      elsif /\A(#.)\s*(.*)\z/ =~ comment
+        mark = $1
+        content = $2
+        case mark
+        when TRANSLATOR_COMMENT_MARK
+          @translator_comments << content
+        when EXTRACTED_COMMENT_MARK
+          @extracted_comments << content
+        when REFERENCE_COMMENT_MARK
+          @references << content
+        when FLAG_MARK
+          @flag << content
+        when PREVIOUS_MSGID_COMMENT_MARK
+          @previous << content
+        else
+          @comments << comment
+        end
+      end
+    else
+      @comments << comment
+    end
   end
 
   def parse_file(po_file, data)
@@ -252,5 +338,21 @@ end
     end
     Encoding.default_external
   end
+
+  def detect_entry_type
+    if @msgctxt.nil?
+      if @msgid_plural.nil?
+        :normal
+      else
+        :plural
+      end
+    else
+      if @msgid_plural.nil?
+        :msgctxt
+      else
+        :msgctxt_plural
+      end
+    end
+  end
   private :detect_file_encoding
 ---- footer

data/test/parser/test_ruby.rb

@@ -41,27 +41,29 @@ class TestRubyParser < Test::Unit::TestCase
       default = {
         :msgid        => nil,
         :msgid_plural => nil,
+        :msgstr       => nil,
         :separator    => nil,
-        :sources      => nil,
+        :references      => nil,
       }
       default.merge(message)
     end
   end
 
-  def normalize_actual(po_messages)
-    po_messages.collect do |po_message|
+  def normalize_actual(po)
+    po.collect do |po_entry|
       {
-        :msgid        => po_message.msgid,
-        :msgid_plural => po_message.msgid_plural,
-        :separator    => po_message.separator,
-        :sources      => normalize_sources(po_message.sources),
+        :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_sources(sources)
-    sources.collect do |source|
-      source.sub(/\A#{Regexp.escape(fixture_path)}\//, "")
+  def normalize_references(references)
+    references.collect do |reference|
+      reference.sub(/\A#{Regexp.escape(fixture_path)}\//, "")
     end
   end
 
@@ -117,7 +119,7 @@ class TestRubyParser < Test::Unit::TestCase
       assert_parse([
                      {
                        :msgid => "one line",
-                       :sources => ["one_line.rb:28"],
+                       :references => ["one_line.rb:28"],
                      }
                    ],
                    "one_line.rb")
@@ -134,8 +136,9 @@ class TestRubyParser < Test::Unit::TestCase
       assert_parse([
                      {
                        :msgid     => "context|context$message",
+                       :msgstr    => nil,
                        :separator => "$",
-                       :sources   => ["custom.rb:28"],
+                       :references   => ["custom.rb:28"],
                      }
                    ],
                    "custom.rb")
@@ -153,8 +156,9 @@ class TestRubyParser < Test::Unit::TestCase
                      {
                        :msgid        => "context|context$message",
                        :msgid_plural => "context|context$messages",
+                       :msgstr       => nil,
                        :separator    => "$",
-                       :sources      => ["custom.rb:28"],
+                       :references      => ["custom.rb:28"],
                      }
                    ],
                    "custom.rb")

data/test/po/_.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.3\n"
+"Project-Id-Version: gettext 2.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 10:26+0900\n"
-"PO-Revision-Date: 2012-10-17 10:26+0900\n"
+"POT-Creation-Date: 2012-11-15 12:08+0900\n"
+"PO-Revision-Date: 2012-11-15 12:08+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/backslash.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.3\n"
+"Project-Id-Version: gettext 2.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 10:26+0900\n"
-"PO-Revision-Date: 2012-10-17 10:26+0900\n"
+"POT-Creation-Date: 2012-11-15 12:08+0900\n"
+"PO-Revision-Date: 2012-11-15 12:08+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/non_ascii.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.3\n"
+"Project-Id-Version: gettext 2.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 10:26+0900\n"
-"PO-Revision-Date: 2012-10-17 10:26+0900\n"
+"POT-Creation-Date: 2012-11-15 12:08+0900\n"
+"PO-Revision-Date: 2012-11-15 12:08+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: gettext 2.3.3\n"
+"Project-Id-Version: gettext 2.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 10:26+0900\n"
-"PO-Revision-Date: 2012-10-17 10:26+0900\n"
+"POT-Creation-Date: 2012-11-15 12:08+0900\n"
+"PO-Revision-Date: 2012-11-15 12:08+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -18,7 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../fixtures/np_.rb:28 ../fixtures/np_.rb:29 ../fixtures/np_.rb:33 ../fixtures/np_.rb:34
+#: ../fixtures/np_.rb:28 ../fixtures/np_.rb:29 ../fixtures/np_.rb:33
+#: ../fixtures/np_.rb:34
 msgctxt "Magazine"
 msgid "a book"
 msgid_plural "%{num} books"

data/test/po/ns_.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.3\n"
+"Project-Id-Version: gettext 2.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 10:26+0900\n"
-"PO-Revision-Date: 2012-10-17 10:26+0900\n"
+"POT-Creation-Date: 2012-11-15 12:08+0900\n"
+"PO-Revision-Date: 2012-11-15 12:08+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/p_.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.3\n"
+"Project-Id-Version: gettext 2.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 10:26+0900\n"
-"PO-Revision-Date: 2012-10-17 10:26+0900\n"
+"POT-Creation-Date: 2012-11-15 12:08+0900\n"
+"PO-Revision-Date: 2012-11-15 12:08+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/s_.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.3\n"
+"Project-Id-Version: gettext 2.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 10:26+0900\n"
-"PO-Revision-Date: 2012-10-17 10:26+0900\n"
+"POT-Creation-Date: 2012-11-15 12:08+0900\n"
+"PO-Revision-Date: 2012-11-15 12:08+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/untranslated.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.3\n"
+"Project-Id-Version: gettext 2.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 10:26+0900\n"
-"PO-Revision-Date: 2012-10-17 10:26+0900\n"
+"POT-Creation-Date: 2012-11-15 12:08+0900\n"
+"PO-Revision-Date: 2012-11-15 12:08+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"