gettext 2.3.3 → 2.3.4

data/lib/gettext/tools/poparser.rb

@@ -15,10 +15,16 @@
 #
 
 require 'racc/parser.rb'
+
+require "gettext/tools/po"
+require "gettext/tools/msgmerge"
 module GetText
-  class PoParser < Racc::Parser
+  class POParser < Racc::Parser
+
+module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 123)
+  # for backward compatibility.
+  PoParser = POParser
 
-module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 119)
   if GetText.respond_to?(:bindtextdomain)
     include GetText
     GetText.bindtextdomain("gettext")
@@ -58,10 +64,16 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 119)
   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 = []
@@ -124,16 +136,89 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 119)
 
   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)
@@ -155,6 +240,22 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 119)
     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
 ...end poparser.ry/module_eval...
 ##### State transition tables begin ###
@@ -281,7 +382,7 @@ Racc_debug_parser = true
 
 module_eval(<<'.,.,', 'poparser.ry', 26)
   def _reduce_5(val, _values, result)
-        @msgctxt = unescape(val[1]) + "\004"
+        @msgctxt = unescape(val[1])
   
     result
   end
@@ -309,7 +410,7 @@ module_eval(<<'.,.,', 'poparser.ry', 38)
       end
     end
     @fuzzy = false
-    on_message(@msgctxt + msgid, msgstr) if use_message_p
+    on_message(msgid, msgstr) if use_message_p
     result = ""
   
     result
@@ -329,7 +430,8 @@ module_eval(<<'.,.,', 'poparser.ry', 61)
       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 = ""
   
@@ -337,7 +439,7 @@ module_eval(<<'.,.,', 'poparser.ry', 61)
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 81)
+module_eval(<<'.,.,', 'poparser.ry', 82)
   def _reduce_10(val, _values, result)
         if val[0].size > 0
       result = val[0] + "\000" + val[1]
@@ -351,7 +453,7 @@ module_eval(<<'.,.,', 'poparser.ry', 81)
 
 # reduce 11 omitted
 
-module_eval(<<'.,.,', 'poparser.ry', 93)
+module_eval(<<'.,.,', 'poparser.ry', 94)
   def _reduce_12(val, _values, result)
         result = val[2]
   
@@ -359,7 +461,7 @@ module_eval(<<'.,.,', 'poparser.ry', 93)
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 100)
+module_eval(<<'.,.,', 'poparser.ry', 101)
   def _reduce_13(val, _values, result)
         on_comment(val[0])
   
@@ -367,7 +469,7 @@ module_eval(<<'.,.,', 'poparser.ry', 100)
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 108)
+module_eval(<<'.,.,', 'poparser.ry', 109)
   def _reduce_14(val, _values, result)
         result = val.delete_if{|item| item == ""}.join
   
@@ -375,7 +477,7 @@ module_eval(<<'.,.,', 'poparser.ry', 108)
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 112)
+module_eval(<<'.,.,', 'poparser.ry', 113)
   def _reduce_15(val, _values, result)
         result = val[0]
   
@@ -387,7 +489,7 @@ def _reduce_none(val, _values, result)
   val[0]
 end
 
-  end   # class PoParser
+  end   # class POParser
 end   # module GetText
 
 

data/lib/gettext/tools/xgettext.rb

@@ -89,40 +89,40 @@ module GetText
       #       File.extname(path) == ".foo"  # *.foo file only.
       #     end
       #     def parse(path)
-      #       po_messages = []
-      #       # Simple message
-      #       message = PoMessage.new(:normal)
-      #       message.msgid = "hello"
-      #       message.sources = ["foo.rb:200", "bar.rb:300"]
-      #       message.add_comment("Comment for the message")
-      #       po_messages << message
-      #       # Plural message
-      #       message = PoMessage.new(:plural)
-      #       message.msgid = "An apple"
-      #       message.msgid_plural = "Apples"
-      #       message.sources = ["foo.rb:200", "bar.rb:300"]
-      #       po_messages << message
-      #       # Simple message with the message context
-      #       message = PoMessage.new(:msgctxt)
-      #       message.msgctxt = "context"
-      #       message.msgid = "hello"
-      #       message.sources = ["foo.rb:200", "bar.rb:300"]
-      #       po_messages << message
-      #       # Plural message with the message context.
-      #       message = PoMessage.new(:msgctxt_plural)
-      #       message.msgctxt = "context"
-      #       message.msgid = "An apple"
-      #       message.msgid_plural = "Apples"
-      #       message.sources = ["foo.rb:200", "bar.rb:300"]
-      #       po_messages << message
-      #       return po_messages
+      #       po = []
+      #       # Simple entry
+      #       entry = POEntry.new(:normal)
+      #       entry.msgid = "hello"
+      #       entry.references = ["foo.rb:200", "bar.rb:300"]
+      #       entry.add_comment("Comment for the entry")
+      #       po << entry
+      #       # Plural entry
+      #       entry = POEntry.new(:plural)
+      #       entry.msgid = "An apple"
+      #       entry.msgid_plural = "Apples"
+      #       entry.references = ["foo.rb:200", "bar.rb:300"]
+      #       po << entry
+      #       # Simple entry with the entry context
+      #       entry = POEntry.new(:msgctxt)
+      #       entry.msgctxt = "context"
+      #       entry.msgid = "hello"
+      #       entry.references = ["foo.rb:200", "bar.rb:300"]
+      #       po << entry
+      #       # Plural entry with the message context.
+      #       entry = POEntry.new(:msgctxt_plural)
+      #       entry.msgctxt = "context"
+      #       entry.msgid = "An apple"
+      #       entry.msgid_plural = "Apples"
+      #       entry.references = ["foo.rb:200", "bar.rb:300"]
+      #       po << entry
+      #       return po
       #     end
       #   end
       #
       #   GetText::XGetText.add_parser(FooParser.new)
       #
       # @param [#target?, #parse] parser
-      #   It parses target file and extracts translate target messages from the
+      #   It parses target file and extracts translate target entries from the
       #   target file. If there are multiple target files, parser.parse is
       #   called multiple times.
       # @return [void]
@@ -157,26 +157,26 @@ EOH
       end
 
       def generate_pot(paths) # :nodoc:
-        po_messages = parse(paths)
-        str = ""
-        po_messages.each do |target|
-          str << encode(target.to_po_str)
+        po = parse(paths)
+        entries = []
+        po.each do |target|
+          entries << encode(target.to_s)
         end
-        str
+        entries.join("\n")
       end
 
       def parse(paths) # :nodoc:
-        po_messages = []
+        po = []
         paths = [paths] if paths.kind_of?(String)
         paths.each do |path|
           begin
-            parse_path(path, po_messages)
+            parse_path(path, po)
           rescue
             puts(_("Error parsing %{path}") % {:path => path})
             raise
           end
         end
-        po_messages
+        po
       end
 
       def check_command_line_options(*options) # :nodoc:
@@ -267,18 +267,16 @@ EOH
         check_command_line_options(*options)
 
         @output_encoding ||= "UTF-8"
-
-        pot_header = generate_pot_header
-        pot_messages = generate_pot(@input_files)
+        pot = generate_pot_header
+        pot << "\n"
+        pot << generate_pot(@input_files)
 
         if @output.is_a?(String)
           File.open(File.expand_path(@output), "w+") do |file|
-            file.puts(pot_header)
-            file.puts(pot_messages)
+            file.puts(pot)
           end
         else
-          @output.puts(pot_header)
-          @output.puts(pot_messages)
+          @output.puts(pot)
         end
         self
       end
@@ -288,21 +286,21 @@ EOH
         Time.now
       end
 
-      def parse_path(path, po_messages)
+      def parse_path(path, po)
         @parsers.each do |parser|
           next unless parser.target?(path)
 
-          extracted_po_messages = parser.parse(path)
-          extracted_po_messages.each do |po_message|
-            if po_message.kind_of?(Array)
-              po_message = PoMessage.new_from_ary(po_message)
+          extracted_po = parser.parse(path)
+          extracted_po.each do |po_entry|
+            if po_entry.kind_of?(Array)
+              po_entry = POEntry.new_from_ary(po_entry)
             end
 
-            if po_message.msgid.empty?
+            if po_entry.msgid.empty?
               warn _("Warning: The empty \"\" msgid is reserved by " +
                        "gettext. So gettext(\"\") doesn't returns " +
                        "empty string but the header entry in po file.")
-              # TODO: add pommesage.source to the pot header as below:
+              # TODO: add pommesage.reference to the pot header as below:
               # # SOME DESCRIPTIVE TITLE.
               # # Copyright (C) YEAR THE COPYRIGHT HOLDER
               # # This file is distributed under the same license as the PACKAGE package.
@@ -316,8 +314,8 @@ EOH
 
             if @output.is_a?(String)
               base_path = Pathname.new(@output).dirname.expand_path
-              po_message.sources = po_message.sources.collect do |source|
-                path, line, = source.split(/:(\d+)\z/, 2)
+              po_entry.references = po_entry.references.collect do |reference|
+                path, line, = reference.split(/:(\d+)\z/, 2)
                 absolute_path = Pathname.new(path).expand_path
                 begin
                   path = absolute_path.relative_path_from(base_path).to_s
@@ -329,18 +327,18 @@ EOH
             end
 
             # Save the previous target
-            if po_messages.empty?
+            if po.empty?
               existing = nil
             else
-              message = po_messages.find {|t| t == po_message}
-              existing = po_messages.index(message)
+              entry = po.find {|t| t.mergeable?(po_entry)}
+              existing = po.index(entry)
             end
 
             if existing
-              po_message = po_messages[existing].merge(po_message)
-              po_messages[existing] = po_message
+              po_entry = po[existing].merge(po_entry)
+              po[existing] = po_entry
             else
-              po_messages << po_message
+              po << po_entry
             end
           end
           break

data/lib/gettext/version.rb

@@ -9,5 +9,5 @@
 =end
 
 module GetText
-  VERSION = "2.3.3"
+  VERSION = "2.3.4"
 end

data/samples/po/hello.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/hello2.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"