gettext 3.4.2 → 3.5.2

data/lib/gettext/tools/msgmerge.rb

@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2012-2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2015  Kouhei Sutou <kou@clear-code.com>
-# Copyright (C) 2005-2009 Masao Mutoh
-# Copyright (C) 2005,2006 speakillof
+# Copyright (C) 2012-2023  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2005-2009  Masao Mutoh
+# Copyright (C) 2005,2006  speakillof
 #
 # License: Ruby's or LGPL
 #
@@ -310,7 +308,8 @@ module GetText
           @output = nil
           @order = :reference
           @po_format_options = {
-            :max_line_width => POEntry::Formatter::DEFAULT_MAX_LINE_WIDTH,
+            max_line_width: POEntry::Formatter::DEFAULT_MAX_LINE_WIDTH,
+            use_one_line_per_reference: false,
           }
           @enable_fuzzy_matching = true
           @update = nil
@@ -424,6 +423,12 @@ module GetText
             @po_format_options[:max_line_width] = max_line_width
           end
 
+          parser.on("--[no-]use-one-line-per-reference",
+                    _("Use one line for each reference comment"),
+                    "(#{@po_format_options[:use_one_line_per_reference]})") do |use|
+            @po_format_options[:use_one_line_per_reference] = use
+          end
+
           parser.on("--[no-]fuzzy-matching",
                     _("Disable fuzzy matching"),
                     _("(enable)")) do |boolean|

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

@@ -70,7 +70,7 @@ module GetText
       else
         erb = ERB.new(content, nil, "-")
       end
-      src = erb.src
+      src = +erb.src
 
       # Force the src encoding back to the encoding in magic comment
       # or original content.

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

@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+
+=begin
+  parser/erubi.rb - parser for ERB using Erubi
+
+  Copyright (C) 2005-2009  Masao Mutoh
+
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby or LGPL.
+=end
+
+require "erubi"
+require 'gettext/tools/parser/ruby'
+
+module GetText
+  class ErubiParser
+    @config = {
+      :extnames => ['.rhtml', '.erb']
+    }
+
+    class << self
+      # Sets some preferences to parse ERB files.
+      # * config: a Hash of the config. It can takes some values below:
+      #   * :extnames: An Array of target files extension. Default is [".rhtml"].
+      def init(config)
+        config.each{|k, v|
+          @config[k] = v
+        }
+      end
+
+      def target?(file) # :nodoc:
+        @config[:extnames].each do |v|
+          return true if File.extname(file) == v
+        end
+        false
+      end
+
+      # Parses eRuby script located at `path`.
+      #
+      # This is a short cut method. It equals to `new(path,
+      # options).parse`.
+      #
+      # @return [Array<POEntry>] Extracted messages
+      # @see #initialize and #parse
+      def parse(path, options={})
+        parser = new(path, options)
+        parser.parse
+      end
+    end
+
+    # @param path [String] eRuby script path to be parsed
+    # @param options [Hash]
+    def initialize(path, options={})
+      @path = path
+      @options = options
+    end
+
+    # Extracts messages from @path.
+    #
+    # @return [Array<POEntry>] Extracted messages
+    def parse
+      content = IO.read(@path)
+
+      encoding = detect_encoding(content)
+      content.force_encoding(encoding)
+
+      erb = Erubi::Engine.new(content)
+      src = erb.src
+
+      RubyParser.new(@path, @options).parse_source(src)
+    end
+
+    def detect_encoding(content)
+      if /#.*coding: (\S*)/ =~ content.lines.first
+        $1.upcase
+      else
+        content.encoding
+      end
+    end
+  end
+end
+
+if __FILE__ == $0
+  # ex) ruby glade.rhtml foo.rhtml  bar.rhtml
+  ARGV.each do |file|
+    p GetText::ErubiParser.parse(file)
+  end
+end

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

@@ -1,7 +1,7 @@
 =begin
   parser/ruby.rb - parser for ruby script
 
-  Copyright (C) 2013-2021  Sutou Kouhei <kou@clear-code.com>
+  Copyright (C) 2013-2024  Sutou Kouhei <kou@clear-code.com>
   Copyright (C) 2003-2009  Masao Mutoh
   Copyright (C) 2005       speakillof
   Copyright (C) 2001,2002  Yasushi Shoji, Masao Mutoh
@@ -36,7 +36,7 @@ module GetText
         @current_po_entry_nth_attribute = 0
         @use_comment = false
         @comment_tag = nil
-        @last_comment = ""
+        @last_comment = +""
         @reset_comment = false
         @string_mark_stack = []
         @string_stack = []
@@ -86,7 +86,7 @@ module GetText
         end
         if @current_po_entry
           @current_po_entry.add_comment(@last_comment) unless @last_comment.empty?
-          @last_comment = ""
+          @last_comment = +""
           @current_po_entry.references << "#{filename}:#{lineno}"
           @current_po_entry_nth_attribute = 0
         end
@@ -104,7 +104,7 @@ module GetText
       end
 
       def process_on_comment(token, po)
-        @last_comment = "" if @reset_comment
+        @last_comment = +"" if @reset_comment
         @reset_comment = false
         if @last_comment.empty?
           content = token.gsub(/\A#\s*/, "").chomp
@@ -133,7 +133,7 @@ module GetText
         else
           @string_mark_stack << token
         end
-        @string_stack << ""
+        @string_stack << +""
         po
       end
 
@@ -192,7 +192,7 @@ module GetText
         else
           @string_mark_stack << "\""
         end
-        @string_stack << ""
+        @string_stack << +""
         po
       end
 
@@ -202,7 +202,7 @@ module GetText
 
       def process_on_regexp_beg(token, po)
         @string_mark_stack << "\""
-        @string_stack << ""
+        @string_stack << +""
         po
       end
 
@@ -245,38 +245,38 @@ module GetText
       def process_on_symbeg(token, po)
         if token.start_with?("%s") or [":'", ":\""].include?(token)
           @string_mark_stack << ":"
-          @string_stack << ""
+          @string_stack << +""
         end
         po
       end
 
       def process_on_backtick(token, po)
         @string_mark_stack << "`"
-        @string_stack << ""
+        @string_stack << +""
         po
       end
 
       def process_on_symbols_beg(token, po)
         @string_mark_stack << "\""
-        @string_stack << ""
+        @string_stack << +""
         po
       end
 
       def process_on_qsymbols_beg(token, po)
         @string_mark_stack << token
-        @string_stack << ""
+        @string_stack << +""
         po
       end
 
       def process_on_words_beg(token, po)
         @string_mark_stack << "\""
-        @string_stack << ""
+        @string_stack << +""
         po
       end
 
       def process_on_qwords_beg(token, po)
         @string_mark_stack << token
-        @string_stack << ""
+        @string_stack << +""
         po
       end
 

data/lib/gettext/tools/task.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -452,8 +450,8 @@ module GetText
             locale = args.locale || ENV["LOCALE"]
             if locale.nil?
               raise "specify locale name by " +
-                "'rake #{_task.name}[${LOCALE}]' or " +
-                "rake #{_task.name} LOCALE=${LOCALE}'"
+                    "rake '#{_task.name}[${LOCALE}]' or " +
+                    "rake #{_task.name} LOCALE=${LOCALE}'"
             end
             define_edit_po_file_task(locale)
             define_po_file_task(locale)

data/lib/gettext/tools/xgettext.rb

@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2003-2010  Masao Mutoh
 # Copyright (C) 2001,2002  Yasushi Shoji, Masao Mutoh
 #
@@ -90,7 +88,8 @@ module GetText
 
         @po_order = :references
         @po_format_options = {
-          :max_line_width => POEntry::Formatter::DEFAULT_MAX_LINE_WIDTH,
+          max_line_width: POEntry::Formatter::DEFAULT_MAX_LINE_WIDTH,
+          use_one_line_per_reference: false,
         }
       end
 
@@ -325,11 +324,23 @@ Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;
           @po_format_options[:max_line_width] = max_line_width
         end
 
+        parser.on("--[no-]use-one-line-per-reference",
+                  _("Use one line for each reference comment"),
+                  "(#{@po_format_options[:use_one_line_per_reference]})") do |use|
+          @po_format_options[:use_one_line_per_reference] = use
+        end
+
         parser.on("-r", "--require=library",
                   _("require the library before executing xgettext")) do |out|
           require out
         end
 
+        parser.on("--parser=PARSER",
+                  _("Add PARSER to parser list for xgettext")) do |parser_name|
+          parser_class = parser_name.split('::').inject(Object) {|o,c| o.const_get c}
+          add_parser(parser_class)
+        end
+
         parser.on("-c", "--add-comments[=TAG]",
                   _("If TAG is specified, place comment blocks starting with TAG and precedding keyword lines in output file"),
                   _("If TAG is not specified, place all comment blocks preceing keyword lines in output file"),

data/lib/gettext/version.rb

@@ -1,13 +1,13 @@
 =begin
   version - version information of gettext
 
-  Copyright (C) 2012-2021 Sutou Kouhei <kou@clear-code.com>
-  Copyright (C) 2005-2009 Masao Mutoh
+  Copyright (C) 2012-2025  Sutou Kouhei <kou@clear-code.com>
+  Copyright (C) 2005-2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby or LGPL.
 =end
 
 module GetText
-  VERSION = "3.4.2"
+  VERSION = "3.5.2"
 end