gettext 3.2.9 → 3.4.9

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,9 +450,10 @@ 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)
             path = create_path(locale)
             Rake::Task[path.po_file].invoke

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
 #
@@ -52,15 +50,15 @@ module GetText
       # @api private
       @@default_parsers = []
       builtin_parser_info_list = [
-        ["glade", "GladeParser"],
+        ["ruby", "RubyParser"], # Default parser.
         ["erb", "ErbParser"],
-        # ["ripper", "RipperParser"],
-        ["ruby", "RubyParser"] # Default parser.
+        ["gtk_builder_ui_definitions", "GtkBuilderUIDefinitionsParser"],
+        ["glade", "GladeParser"],
       ]
       builtin_parser_info_list.each do |f, klass|
         begin
           require "gettext/tools/parser/#{f}"
-          @@default_parsers << GetText.const_get(klass)
+          add_parser(GetText.const_get(klass))
         rescue
           $stderr.puts(_("'%{klass}' is ignored.") % {:klass => klass})
           $stderr.puts($!) if $DEBUG
@@ -74,7 +72,7 @@ module GetText
       attr_reader :parse_options
 
       def initialize #:nodoc:
-        @parsers = @@default_parsers.dup
+        @parsers = []
 
         @input_files = nil
         @output = nil
@@ -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"),
@@ -357,7 +368,7 @@ Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;
       end
 
       def parse_path(path, po)
-        @parsers.each do |parser|
+        (@parsers + @@default_parsers).each do |parser|
           next unless parser.target?(path)
 
           # For backward compatibility

data/lib/gettext/version.rb

@@ -1,13 +1,13 @@
 =begin
   version - version information of gettext
 
-  Copyright (C) 2012-2018 Kouhei Sutou <kou@clear-code.com>
-  Copyright (C) 2005-2009 Masao Mutoh
+  Copyright (C) 2012-2023  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.2.9"
+  VERSION = "3.4.9"
 end