gettext 3.3.3 → 3.3.8

data/lib/gettext/tools/msgmerge.rb

@@ -49,6 +49,7 @@ module GetText
         config.parse(command_line)
 
         parser = POParser.new
+        parser.report_warning = config.report_warning?
         parser.ignore_fuzzy = false
         definition_po = PO.new
         reference_pot = PO.new
@@ -313,6 +314,7 @@ module GetText
           }
           @enable_fuzzy_matching = true
           @update = nil
+          @report_warning = true
           @output_obsolete_entries = true
           @backup = ENV["VERSION_CONTROL"]
           @suffix = ENV["SIMPLE_BACKUP_SUFFIX"] || "~"
@@ -337,6 +339,12 @@ module GetText
           @enable_fuzzy_matching
         end
 
+        # @return [Bool] true if reporting warning is enabled,
+        #    false otherwise.
+        def report_warning?
+          @report_warning
+        end
+
         # @return [Bool] true if outputting obsolete entries is
         #    enabled, false otherwise.
         def output_obsolete_entries?
@@ -422,6 +430,11 @@ module GetText
             @enable_fuzzy_matching = boolean
           end
 
+          parser.on("--no-report-warning",
+                    _("Don't report warning messages")) do |report_warning|
+            @report_warning = report_warning
+          end
+
           parser.on("--no-obsolete-entries",
                     _("Don't output obsolete entries")) do |boolean|
             @output_obsolete_entries = boolean

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

@@ -57,12 +57,20 @@ module GetText
       @options = options
     end
 
+    @@erb_accept_keyword_arguments =
+      ERB.instance_method(:initialize).parameters.any? {|type, _| type == :key}
+
     # Extracts messages from @path.
     #
     # @return [Array<POEntry>] Extracted messages
     def parse
       content = IO.read(@path)
-      src = ERB.new(content).src
+      if @@erb_accept_keyword_arguments
+        erb = ERB.new(content, trim_mode: "-")
+      else
+        erb = ERB.new(content, nil, "-")
+      end
+      src = erb.src
 
       # Force the src encoding back to the encoding in magic comment
       # or original content.

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

@@ -1,14 +1,20 @@
-# -*- coding: utf-8 -*-
-
-=begin
-  parser/glade.rb - parser for Glade-2
-
-  Copyright (C) 2013       Kouhei Sutou <kou@clear-code.com>
-  Copyright (C) 2004,2005  Masao Mutoh
-
-  You may redistribute it and/or modify it under the same
-  license terms as Ruby or LGPL.
-=end
+# Copyright (C) 2004,2005  Masao Mutoh
+# Copyright (C) 2013       Kouhei Sutou <kou@clear-code.com>
+#
+# 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 'cgi'
 require 'gettext'
@@ -24,15 +30,11 @@ module GetText
       GLADE_RE = /glade-2.0.dtd/
 
       def target?(file) # :nodoc:
-        data = IO.readlines(file)
-        if XML_RE =~ data[0] and GLADE_RE =~ data[1]
-          true
-        else
-          if File.extname(file) == '.glade'
-            raise _("`%{file}' is not glade-2.0 format.") % {:file => file}
-          end
-          false
-        end
+        return false unless File.extname(file) == ".glade"
+        data = File.read(file)
+        return false unless data.include?("<?xml")
+        return false unless data.include?("glade-2.0.dtd")
+        true
       end
 
       def parse(path, options={})
@@ -57,7 +59,7 @@ module GetText
 
     private
     def parse_source(input) # :nodoc:
-      targets = []
+      po = []
       target = false
       start_line_no = nil
       val = nil
@@ -69,14 +71,14 @@ module GetText
           target = true
           if TARGET2 =~ $1
             val = $1
-            add_target(val, start_line_no, targets)
+            add_po_entry(po, val, start_line_no)
             val = nil
             target = false
           end
         elsif target
           if TARGET2 =~ line
             val << $1
-            add_target(val, start_line_no, targets)
+            add_po_entry(po, val, start_line_no)
             val = nil
             target = false
           else
@@ -84,26 +86,22 @@ module GetText
           end
         end
       end
-      targets
+      po
     end
 
-    def add_target(val, line_no, targets) # :nodoc:
-      return unless val.size > 0
-      assoc_data = targets.assoc(val)
-      val = CGI.unescapeHTML(val)
-      if assoc_data
-        targets[targets.index(assoc_data)] = assoc_data << "#{@path}:#{line_no}"
-      else
-        targets << [val.gsub(/\n/, '\n'), "#{@path}:#{line_no}"]
+    def add_po_entry(po, value, line_no) # :nodoc:
+      return if value.empty?
+      value = CGI.unescapeHTML(value)
+      value = value.gsub(/\n/, "\n")
+      po_entry = po.find do |entry|
+        entry.msgid == value
       end
-      targets
+      if po_entry.nil?
+        po_entry = POEntry.new(:normal)
+        po_entry.msgid = value
+        po << po_entry
+      end
+      po_entry.references << "#{@path}:#{line_no}"
     end
   end
 end
-
-if __FILE__ == $0
-  # ex) ruby glade.rb foo.glade  bar.glade
-  ARGV.each do |file|
-    p GetText::GladeParser.parse(file)
-  end
-end

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

@@ -24,13 +24,14 @@ require "gettext/po_entry"
 module GetText
   class GtkBuilderUIDefinitionsParser
     @config = {
-      :extnames => [".ui"]
+      :extnames => [".ui", ".glade"]
     }
 
     class << self
       # Sets some preferences to parse GtkBuilder UI definitions files.
       # * config: a Hash of the config. It can takes some values below:
-      #   * :extnames: An Array of target files extension. Default is [".ui"].
+      #   * :extnames: An Array of target files extension.
+      #     Default is [".ui", ".glade"].
       def init(config)
         config.each do |k, v|
           @config[k] = v
@@ -39,7 +40,9 @@ module GetText
 
       def target?(file) # :nodoc:
         @config[:extnames].each do |extname|
-          return true if File.extname(file) == extname
+          next unless File.extname(file) == extname
+          next unless File.read(file).include?("<interface>")
+          return true
         end
         false
       end
@@ -50,9 +53,6 @@ module GetText
       end
     end
 
-    TARGET1 = /<property.*translatable="yes">(.*)/
-    TARGET2 = /(.*)<\/property>/
-
     def initialize(path, options={})
       @path = path
       @options = options

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

@@ -1,7 +1,7 @@
 =begin
   parser/ruby.rb - parser for ruby script
 
-  Copyright (C) 2013-2019  Sutou Kouhei <kou@clear-code.com>
+  Copyright (C) 2013-2021  Sutou Kouhei <kou@clear-code.com>
   Copyright (C) 2003-2009  Masao Mutoh
   Copyright (C) 2005       speakillof
   Copyright (C) 2001,2002  Yasushi Shoji, Masao Mutoh
@@ -28,9 +28,9 @@ module GetText
       attr_accessor :comment_tag
       def initialize(*args)
         super(*args)
+        @start_block = false
         @in_block_arguments = false
         @ignore_next_comma = false
-        @context_stack = []
         @need_definition_name = false
         @current_po_entry = nil
         @current_po_entry_nth_attribute = 0
@@ -43,28 +43,31 @@ module GetText
       end
 
       def process_on_op(token, po)
-        @in_block_arguments = !@in_block_arguments if token == "|"
+        if @start_block
+          @in_block_arguments = (token == "|")
+        else
+          if @in_block_arguments and token == "|"
+            @in_block_arguments = false
+          end
+        end
         po
       end
 
       def process_on_kw(token, po)
         store_po_entry(po)
         case token
-        when "begin", "case", "do", "for"
-          @context_stack.push(token)
-        when "class", "def", "module"
-          @context_stack.push(token)
-        when "if", "unless", "until", "while"
-          # postfix case
-          unless state.allbits?(Ripper::EXPR_LABEL)
-            @context_stack.push(token)
-          end
-        when "end"
-          @context_stack.pop
+        when "do"
+          @start_block = true
         end
         po
       end
 
+      def process_on_lbrace(token, po)
+        store_po_entry(po)
+        @start_block = (state == Ripper::EXPR_BEG)
+        po
+      end
+
       def process_on_ident(token, po)
         store_po_entry(po)
 
@@ -92,7 +95,7 @@ module GetText
 
       def process_on_const(token, po)
         case token
-        when "N_"," Nn_"
+        when "N_", "Nn_"
           # TODO: Check the next token is :on_lparen
           process_on_ident(token, po)
         else
@@ -203,18 +206,18 @@ module GetText
         po
       end
 
-      def process_on_embexpr_beg(token, po)
-        @current_po_entry = nil
-        @current_po_entry_nth_attribute = 0
-        po
-      end
-
       def process_on_regexp_end(token, po)
         @string_mark_stack.pop
         @string_stack.pop
         po
       end
 
+      def process_on_embexpr_beg(token, po)
+        @current_po_entry = nil
+        @current_po_entry_nth_attribute = 0
+        po
+      end
+
       def process_on_int(token, po)
         @ignore_next_comma = true
         po
@@ -247,14 +250,14 @@ module GetText
         po
       end
 
-      def process_on_symbols_beg(token, po)
-        @string_mark_stack << "\""
+      def process_on_backtick(token, po)
+        @string_mark_stack << "`"
         @string_stack << ""
         po
       end
 
-      def process_on_backtick(token, po)
-        @string_mark_stack << "`"
+      def process_on_symbols_beg(token, po)
+        @string_mark_stack << "\""
         @string_stack << ""
         po
       end
@@ -265,6 +268,12 @@ module GetText
         po
       end
 
+      def process_on_words_beg(token, po)
+        @string_mark_stack << "\""
+        @string_stack << ""
+        po
+      end
+
       def process_on_qwords_beg(token, po)
         @string_mark_stack << token
         @string_stack << ""
@@ -274,11 +283,14 @@ module GetText
       def on_default(event, token, po)
         trace(event, token) do
           process_method = "process_#{event}"
+          start_block = @start_block
           if respond_to?(process_method)
-            __send__(process_method, token, po)
-          else
-            po
+            po = __send__(process_method, token, po)
+          end
+          if start_block and event != :on_sp
+            @start_block = false
           end
+          po
         end
       end
 
@@ -289,7 +301,16 @@ module GetText
       end
 
       def trace(event_name, token)
-        pp [event_name, token, state, @context_stack.last] if debug?
+        if debug?
+          status = [
+            event_name,
+            token,
+            state,
+          ]
+          status << :start_block if @start_block
+          status << :in_block_arguments if @in_block_arguments
+          pp status
+        end
         yield
       end
 

data/lib/gettext/version.rb

@@ -1,7 +1,7 @@
 =begin
   version - version information of gettext
 
-  Copyright (C) 2012-2020 Sutou Kouhei <kou@clear-code.com>
+  Copyright (C) 2012-2021 Sutou Kouhei <kou@clear-code.com>
   Copyright (C) 2005-2009 Masao Mutoh
 
   You may redistribute it and/or modify it under the same
@@ -9,5 +9,5 @@
 =end
 
 module GetText
-  VERSION = "3.3.3"
+  VERSION = "3.3.8"
 end