gettext 2.2.1 → 2.3.0

data/lib/gettext/tools/parser/ruby.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/ruby
 =begin
   parser/ruby.rb - parser for ruby script
 
@@ -21,7 +20,7 @@ module GetText
     def parse
       until (  (tk = token).kind_of?(RubyToken::TkEND_OF_SCRIPT) && !@continue or tk.nil?  )
         s = get_readed
-        if RubyToken::TkSTRING === tk
+        if RubyToken::TkSTRING === tk or RubyToken::TkDSTRING === tk
           def tk.value
             @value
           end
@@ -44,7 +43,7 @@ module GetText
         end
 
         if $DEBUG
-          if tk.is_a? TkSTRING
+          if tk.is_a? TkSTRING or tk.is_a? TkDSTRING
             $stderr.puts("#{tk}: #{tk.value}")
           elsif tk.is_a? TkIDENTIFIER
             $stderr.puts("#{tk}: #{tk.name}")
@@ -136,8 +135,11 @@ module GetText
       line_no = nil
       last_comment = ''
       reset_comment = false
+      ignore_next_comma = false
       rl.parse do |tk|
         begin
+          ignore_current_comma = ignore_next_comma
+          ignore_next_comma = false
           case tk
           when RubyToken::TkIDENTIFIER, RubyToken::TkCONSTANT
             store_pomessage(pomessages, pomessage, path, line_no, last_comment)
@@ -153,15 +155,20 @@ module GetText
               pomessage = nil
             end
             line_no = tk.line_no.to_s
-          when RubyToken::TkSTRING
+          when RubyToken::TkSTRING, RubyToken::TkDSTRING
             pomessage.set_current_attribute tk.value if pomessage
           when RubyToken::TkPLUS, RubyToken::TkNL
             #do nothing
+          when RubyToken::TkINTEGER
+            ignore_next_comma = true
           when RubyToken::TkCOMMA
-            pomessage.advance_to_next_attribute if pomessage
+            unless ignore_current_comma
+              pomessage.advance_to_next_attribute if pomessage
+            end
           else
             if store_pomessage(pomessages, pomessage, path, line_no, last_comment)
               pomessage = nil
+              last_comment = ""
             end
           end
         rescue
@@ -212,15 +219,3 @@ module GetText
     end
   end
 end
-
-if __FILE__ == $0
-  require 'pp'
-  ARGV.each do |path|
-    pp GetText::RubyParser.parse(path)
-  end
-
-  #rl = GetText::RubyLexX.new; rl.set_input(ARGF)
-  #rl.parse do |tk|
-  #p tk
-  #end
-end

data/lib/gettext/tools/pomessage.rb

@@ -1,4 +1,23 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010  masone (Christian Felder) <ema@rh-productions.ch>
+# Copyright (C) 2009  Masao Mutoh
+#
+# 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 GetText
   class ParseError < StandardError
@@ -8,12 +27,25 @@ module GetText
   # is to be translated.
   class PoMessage
     PARAMS = {
-      :normal => [:msgid],
-      :plural => [:msgid, :msgid_plural],
+      :normal => [:msgid, :separator],
+      :plural => [:msgid, :msgid_plural, :separator],
       :msgctxt => [:msgctxt, :msgid],
       :msgctxt_plural => [:msgctxt, :msgid, :msgid_plural]
     }
 
+    class << self
+      def escape(string)
+        string.gsub(/([\\"\n])/) do
+          special_character = $1
+          if special_character == "\n"
+            "\\n"
+          else
+            "\\#{special_character}"
+          end
+        end
+      end
+    end
+
     @@max_line_length = 70
 
     # Sets the max line length.
@@ -31,6 +63,7 @@ module GetText
     attr_accessor :msgid
     # Options
     attr_accessor :msgid_plural
+    attr_accessor :separator
     attr_accessor :msgctxt
     attr_accessor :sources    # ["file1:line1", "file2:line2", ...]
     attr_accessor :comment
@@ -56,7 +89,7 @@ module GetText
     # and other purposes.
     def escaped(param_name)
       orig = self.send param_name
-      orig.gsub(/"/, '\"').gsub(/\r/, '')
+      self.class.escape(orig.gsub(/\r/, ""))
     end
 
     # Checks if the other translation target is mergeable with

data/lib/gettext/tools/poparser.rb

@@ -10,7 +10,7 @@
 
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.8
+# This file is automatically generated by Racc 1.4.9
 # from Racc grammer file "".
 #
 
@@ -18,7 +18,7 @@ require 'racc/parser.rb'
 module GetText
   class PoParser < Racc::Parser
 
-module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 114)
+module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 119)
   if GetText.respond_to?(:bindtextdomain)
     include GetText
     GetText.bindtextdomain("rgettext")
@@ -123,10 +123,9 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 114)
   end
 
   def on_message(msgid, msgstr)
-    if msgstr.size > 0
-      @data[msgid] = msgstr
-      @data.set_comment(msgid, @comments.join("\n"))
-    end
+    @data[msgid] = msgstr
+    @data.set_comment(msgid, @comments.join("\n"))
+
     @comments.clear
     @msgctxt = ""
   end
@@ -279,7 +278,7 @@ Racc_debug_parser = true
 
 # reduce 4 omitted
 
-module_eval(<<'.,.,', 'poparser.ry', 25)
+module_eval(<<'.,.,', 'poparser.ry', 26)
   def _reduce_5(val, _values, result)
         @msgctxt = unescape(val[1]) + "\004"
   
@@ -291,30 +290,34 @@ module_eval(<<'.,.,', 'poparser.ry', 25)
 
 # reduce 7 omitted
 
-module_eval(<<'.,.,', 'poparser.ry', 37)
+module_eval(<<'.,.,', 'poparser.ry', 38)
   def _reduce_8(val, _values, result)
-        if @fuzzy and ignore_fuzzy?
-      if val[1] != ""
-        if report_warning?
+        msgid_raw = val[1]
+    msgid = unescape(msgid_raw)
+    msgstr = unescape(val[3])
+    use_message_p = true
+    if @fuzzy and not msgid.empty?
+      use_message_p = (not ignore_fuzzy?)
+      if report_warning?
+        if ignore_fuzzy?
           $stderr.print _("Warning: fuzzy message was ignored.\n")
-          $stderr.print "  #{@po_file}: msgid '#{val[1]}'\n"
+        else
+          $stderr.print _("Warning: fuzzy message was used.\n")
         end
-      else
-        on_message('', unescape(val[3]))
+        $stderr.print "  #{@po_file}: msgid '#{msgid_raw}'\n"
       end
-      @fuzzy = false
-    else
-      on_message(@msgctxt + unescape(val[1]), unescape(val[3]))
     end
+    @fuzzy = false
+    on_message(@msgctxt + msgid, msgstr) if use_message_p
     result = ""
   
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 56)
+module_eval(<<'.,.,', 'poparser.ry', 61)
   def _reduce_9(val, _values, result)
-        if @fuzzy and $ignore_fuzzy
+        if @fuzzy and ignore_fuzzy?
       if val[1] != ""
         if report_warning?
           $stderr.print _("Warning: fuzzy message was ignored.\n")
@@ -333,7 +336,7 @@ module_eval(<<'.,.,', 'poparser.ry', 56)
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 76)
+module_eval(<<'.,.,', 'poparser.ry', 81)
   def _reduce_10(val, _values, result)
         if val[0].size > 0
       result = val[0] + "\000" + val[1]
@@ -347,7 +350,7 @@ module_eval(<<'.,.,', 'poparser.ry', 76)
 
 # reduce 11 omitted
 
-module_eval(<<'.,.,', 'poparser.ry', 88)
+module_eval(<<'.,.,', 'poparser.ry', 93)
   def _reduce_12(val, _values, result)
         result = val[2]
   
@@ -355,7 +358,7 @@ module_eval(<<'.,.,', 'poparser.ry', 88)
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 95)
+module_eval(<<'.,.,', 'poparser.ry', 100)
   def _reduce_13(val, _values, result)
         on_comment(val[0])
   
@@ -363,7 +366,7 @@ module_eval(<<'.,.,', 'poparser.ry', 95)
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 103)
+module_eval(<<'.,.,', 'poparser.ry', 108)
   def _reduce_14(val, _values, result)
         result = val.delete_if{|item| item == ""}.join
   
@@ -371,7 +374,7 @@ module_eval(<<'.,.,', 'poparser.ry', 103)
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 107)
+module_eval(<<'.,.,', 'poparser.ry', 112)
   def _reduce_15(val, _values, result)
         result = val[0]
   

data/lib/gettext/tools/xgettext.rb

@@ -0,0 +1,327 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
+# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2003-2010  Masao Mutoh
+# Copyright (C) 2001,2002  Yasushi Shoji, Masao Mutoh
+#
+# 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/>.
+
+require "pathname"
+require "optparse"
+require "gettext"
+
+module GetText
+  module Tools
+    class XGetText #:nodoc:
+      class << self
+        def run(*arguments)
+          new.run(*arguments)
+        end
+      end
+
+      include GetText
+
+      bindtextdomain("rgettext")
+
+      def initialize #:nodoc:
+        @ex_parsers = []
+        parsers = [
+          ["glade.rb", "GladeParser"],
+          ["erb.rb", "ErbParser"],
+          # ["ripper.rb", "RipperParser"],
+          ["ruby.rb", "RubyParser"] # Default parser.
+        ]
+        parsers.each do |f, klass|
+          begin
+            require "gettext/tools/parser/#{f}"
+            @ex_parsers << GetText.const_get(klass)
+          rescue
+            $stderr.puts(_("'%{klass}' is ignored.") % {:klass => klass})
+            $stderr.puts($!) if $DEBUG
+          end
+        end
+
+        @input_files = nil
+        @output = nil
+
+        @package_name = nil
+        @package_version = nil
+        @msgid_bugs_address = nil
+        @copyright_holder = nil
+      end
+
+      # How to add your option parser
+      # The option parser module requires to have target?(file) and
+      # parser(file, ary) method.
+      #
+      #  require "gettext/tools/xgettext"
+      #  module FooParser
+      #    module_function
+      #    def target?(file)
+      #      File.extname(file) == ".foo"  # *.foo file only.
+      #    end
+      #    def parse(file)
+      #      :
+      #      ary = []
+      #      # Simple message
+      #      po = PoMessage.new(:normal)
+      #      po.msgid = "hello"
+      #      po.sources = ["foo.rb:200", "bar.rb:300"]
+      #      po.add_comment("Comment for the message")
+      #      ary << po
+      #      # Plural message
+      #      po = PoMessage.new(:plural)
+      #      po.msgid = "An apple"
+      #      po.msgid_plural = "Apples"
+      #      po.sources = ["foo.rb:200", "bar.rb:300"]
+      #      ary << po
+      #      # Simple message with the message context
+      #      po = PoMessage.new(:msgctxt)
+      #      po.msgctxt = "context"
+      #      po.msgid = "hello"
+      #      po.sources = ["foo.rb:200", "bar.rb:300"]
+      #      ary << po
+      #      # Plural message with the message context.
+      #      po = PoMessage.new(:msgctxt_plural)
+      #      po.msgctxt = "context"
+      #      po.msgid = "An apple"
+      #      po.msgid_plural = "Apples"
+      #      po.sources = ["foo.rb:200", "bar.rb:300"]
+      #      ary << po
+      #      return ary
+      #    end
+      #  end
+      #
+      #  GetText::XGetText.add_parser(FooParser)
+      def add_parser(klass)
+        @ex_parsers.insert(0, klass)
+      end
+
+      def generate_pot_header # :nodoc:
+        time = now.strftime("%Y-%m-%d %H:%M%z")
+
+        <<EOH
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR #{@copyright_holder}
+# This file is distributed under the same license as the #{@package_name} package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: #{@package_name} #{@package_version}\\n"
+"Report-Msgid-Bugs-To: #{@msgid_bugs_address}\\n"
+"POT-Creation-Date: #{time}\\n"
+"PO-Revision-Date: #{time}\\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"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n"
+EOH
+      end
+
+      def generate_pot(paths) # :nodoc:
+        pomessages = parse(paths)
+        str = ""
+        pomessages.each do |target|
+          str << target.to_po_str
+        end
+        str
+      end
+
+      def parse(paths) # :nodoc:
+        pomessages = []
+        paths = [paths] if paths.kind_of?(String)
+        paths.each do |path|
+          begin
+            @ex_parsers.each do |klass|
+              next unless klass.target?(path)
+
+              if klass.method(:parse).arity == 1
+                targets = klass.parse(path)
+              else
+                # For backward compatibility
+                targets = klass.parse(path, [])
+              end
+
+              targets.each do |pomessage|
+                if pomessage.kind_of?(Array)
+                  pomessage = PoMessage.new_from_ary(pomessage)
+                end
+
+                if pomessage.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:
+                  # # SOME DESCRIPTIVE TITLE.
+                  # # Copyright (C) YEAR THE COPYRIGHT HOLDER
+                  # # This file is distributed under the same license as the PACKAGE package.
+                  # # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+                  # #
+                  # #: test/test_gettext.rb:65
+                  # #, fuzzy
+                  # "#: test/test_gettext.rb:65" line is added.
+                  next
+                end
+
+                if @output.is_a?(String)
+                  base_path = Pathname.new(@output).dirname.expand_path
+                  pomessage.sources = pomessage.sources.collect do |source|
+                    path, line, = source.split(/:(\d+)\z/, 2)
+                    absolute_path = Pathname.new(path).expand_path
+                    begin
+                      path = absolute_path.relative_path_from(base_path).to_s
+                    rescue ArgumentError
+                      raise # Should we ignore it?
+                    end
+                    "#{path}:#{line}"
+                  end
+                end
+
+                # Save the previous target
+                if pomessages.empty?
+                  existing = nil
+                else
+                  message = pomessages.find {|t| t == pomessage}
+                  existing = pomessages.index(message)
+                end
+
+                if existing
+                  pomessage = pomessages[existing].merge(pomessage)
+                  pomessages[existing] = pomessage
+                else
+                  pomessages << pomessage
+                end
+              end
+              break
+            end
+          rescue
+            puts(_("Error parsing %{path}") % {:path => path})
+            raise
+          end
+        end
+        pomessages
+      end
+
+      # constant values
+      VERSION = GetText::VERSION
+
+      def check_command_line_options(*options) # :nodoc:
+        input_files, output = parse_arguments(*options)
+
+        if input_files.empty?
+          raise ArgumentError, _("no input files")
+        end
+
+        output ||= STDOUT
+
+        @input_files = input_files
+        @output = output
+
+        @package_name ||= "PACKAGE"
+        @package_version ||= "VERSION"
+        @msgid_bugs_address ||= ""
+        @copyright_holder ||= "THE PACKAGE'S COPYRIGHT HOLDER"
+      end
+
+      def parse_arguments(*options) #:nodoc:
+        output = nil
+
+        parser = OptionParser.new
+        banner = _("Usage: %s input.rb [-r parser.rb] [-o output.pot]") % $0
+        parser.banner = banner
+        parser.separator("")
+        description = _("Extract translatable strings from given input files.")
+        parser.separator(description)
+        parser.separator("")
+        parser.separator(_("Specific options:"))
+
+        parser.on("-o", "--output=FILE",
+                  _("write output to specified file")) do |out|
+          output = out
+        end
+
+        parser.on("--package-name=PACKAGE",
+                  _("set package name in output")) do |out|
+          @package_name = out
+        end
+
+        parser.on("--package-version=VERSION",
+                  _("set package version in output")) do |out|
+          @package_version = out
+        end
+
+        parser.on("--msgid-bugs-address=EMAIL",
+                  _("set report address for msgid bugs")) do |out|
+          @msgid_bugs_address = out
+        end
+
+        parser.on("--copyright-holder=STRING",
+                  _("set copyright holder in output")) do |out|
+          @copyright_holder = out
+        end
+
+        parser.on("-r", "--require=library",
+                  _("require the library before executing xgettext")) do |out|
+          require out
+        end
+
+        parser.on("-d", "--debug", _("run in debugging mode")) do
+          $DEBUG = true
+        end
+
+        parser.on("-h", "--help", _("display this help and exit")) do
+          puts(parser.help)
+          exit(true)
+        end
+
+        parser.on_tail("--version", _("display version information and exit")) do
+          puts(VERSION)
+          exit(true)
+        end
+
+        parser.parse!(options)
+
+        [options, output]
+      end
+
+      def run(*options)  # :nodoc:
+        check_command_line_options(*options)
+
+        if @output.is_a?(String)
+          File.open(File.expand_path(@output), "w+") do |file|
+            file.puts(generate_pot_header)
+            file.puts(generate_pot(@input_files))
+          end
+        else
+          @output.puts(generate_pot_header)
+          @output.puts(generate_pot(@input_files))
+        end
+        self
+      end
+
+      private
+      def now
+        Time.now
+      end
+    end
+  end
+end