gettext 3.3.9 → 3.4.9

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/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-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.3.9"
+  VERSION = "3.4.9"
 end

data/po/bg/gettext.edit.po

@@ -19,107 +19,111 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "Третият параметър е грешен: value = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:242
+#: ../lib/gettext/tools/msgcat.rb:243
 msgid "Usage: %s [OPTIONS] PO_FILE1 PO_FILE2 ..."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:244
+#: ../lib/gettext/tools/msgcat.rb:245
 msgid "Concatenates and merges PO files."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:246 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:98 ../lib/gettext/tools/msgmerge.rb:369 ../lib/gettext/tools/xgettext.rb:248
+#: ../lib/gettext/tools/msgcat.rb:247 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:98 ../lib/gettext/tools/msgmerge.rb:368 ../lib/gettext/tools/xgettext.rb:247
 msgid "Specific options:"
 msgstr "Специфични опции:"
 
-#: ../lib/gettext/tools/msgcat.rb:249 ../lib/gettext/tools/msgmerge.rb:377
+#: ../lib/gettext/tools/msgcat.rb:250 ../lib/gettext/tools/msgmerge.rb:376
 msgid "Write output to specified file"
 msgstr "изходът беше записан в зададения файл"
 
-#: ../lib/gettext/tools/msgcat.rb:250
+#: ../lib/gettext/tools/msgcat.rb:251
 msgid "(default: the standard output)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:255 ../lib/gettext/tools/msgcat.rb:272 ../lib/gettext/tools/msgmerge.rb:382 ../lib/gettext/tools/msgmerge.rb:401 ../lib/gettext/tools/xgettext.rb:302
+#: ../lib/gettext/tools/msgcat.rb:256 ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/msgmerge.rb:400 ../lib/gettext/tools/xgettext.rb:301
 msgid "Sort output by msgid"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:260 ../lib/gettext/tools/msgcat.rb:265 ../lib/gettext/tools/msgmerge.rb:389 ../lib/gettext/tools/msgmerge.rb:396
+#: ../lib/gettext/tools/msgcat.rb:261 ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:388 ../lib/gettext/tools/msgmerge.rb:395
 msgid "Sort output by location"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:266 ../lib/gettext/tools/msgmerge.rb:390
+#: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgmerge.rb:389
 msgid "It is same as --sort-by-location"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:267 ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:384 ../lib/gettext/tools/msgmerge.rb:391
+#: ../lib/gettext/tools/msgcat.rb:268 ../lib/gettext/tools/msgcat.rb:275 ../lib/gettext/tools/msgmerge.rb:383 ../lib/gettext/tools/msgmerge.rb:390
 msgid "Just for GNU gettext's msgcat compatibility"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:273 ../lib/gettext/tools/msgmerge.rb:383
+#: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:382
 msgid "It is same as --sort-by-msgid"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:279
+#: ../lib/gettext/tools/msgcat.rb:280
 msgid "Remove location information"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:284
+#: ../lib/gettext/tools/msgcat.rb:285
 msgid "Remove translator comment"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:289
+#: ../lib/gettext/tools/msgcat.rb:290
 msgid "Remove extracted comment"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:294
+#: ../lib/gettext/tools/msgcat.rb:295
 msgid "Remove flag comment"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:299
+#: ../lib/gettext/tools/msgcat.rb:300
 msgid "Remove previous comment"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:304
+#: ../lib/gettext/tools/msgcat.rb:305
 msgid "Remove all comments"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:309 ../lib/gettext/tools/msgmerge.rb:411 ../lib/gettext/tools/xgettext.rb:312
+#: ../lib/gettext/tools/msgcat.rb:310 ../lib/gettext/tools/msgmerge.rb:410 ../lib/gettext/tools/xgettext.rb:311
 msgid "Set output page width"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:315 ../lib/gettext/tools/msgmerge.rb:417 ../lib/gettext/tools/xgettext.rb:318
+#: ../lib/gettext/tools/msgcat.rb:316 ../lib/gettext/tools/msgmerge.rb:416 ../lib/gettext/tools/xgettext.rb:317
 msgid "Break long message lines, longer than the output page width, into several lines"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:326
+#: ../lib/gettext/tools/msgcat.rb:327 ../lib/gettext/tools/msgmerge.rb:427 ../lib/gettext/tools/xgettext.rb:328
+msgid "Use one line for each reference comment"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:333
 msgid "Ignore fuzzy entries"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:331 ../lib/gettext/tools/msgmerge.rb:434
+#: ../lib/gettext/tools/msgcat.rb:338 ../lib/gettext/tools/msgmerge.rb:439
 msgid "Don't report warning messages"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:336 ../lib/gettext/tools/msgmerge.rb:439
+#: ../lib/gettext/tools/msgcat.rb:343 ../lib/gettext/tools/msgmerge.rb:444
 msgid "Don't output obsolete entries"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:341
+#: ../lib/gettext/tools/msgcat.rb:348
 msgid "Update PO-Revision-Date header field"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:346
+#: ../lib/gettext/tools/msgcat.rb:353
 msgid "Remove FIELD from header"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:347
+#: ../lib/gettext/tools/msgcat.rb:354
 msgid "Specify this option multiple times to remove multiple header fields"
 msgstr ""
 
@@ -135,11 +139,11 @@ msgstr "Употреба: %s input.po [-o output.mo]"
 msgid "Generate binary message catalog from textual translation description."
 msgstr "Генериране на двоични файлове с преводите от текстовите описания."
 
-#: ../lib/gettext/tools/msgfmt.rb:89 ../lib/gettext/tools/xgettext.rb:251
+#: ../lib/gettext/tools/msgfmt.rb:89 ../lib/gettext/tools/xgettext.rb:250
 msgid "write output to specified file"
 msgstr "изходът беше записан в зададения файл"
 
-#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:349
+#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:360
 msgid "display version information and exit"
 msgstr "показване на версията и изход"
 
@@ -175,7 +179,7 @@ msgstr ""
 msgid "Use EMAIL as translator email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:137 ../lib/gettext/tools/msgmerge.rb:443
+#: ../lib/gettext/tools/msginit.rb:137 ../lib/gettext/tools/msgmerge.rb:448
 msgid "Display this help and exit"
 msgstr ""
 
@@ -207,117 +211,118 @@ msgstr ""
 msgid "Please enter your email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:358
+#: ../lib/gettext/tools/msgmerge.rb:357
 msgid "Usage: %s [OPTIONS] definition.po reference.pot"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:361
+#: ../lib/gettext/tools/msgmerge.rb:360
 msgid "Merges two Uniforum style .po files together. The definition.po file is an existing PO file with translations. The reference.pot file is the last created PO file with up-to-date source references. The reference.pot is generally created by rxgettext."
 msgstr "Слива два Uniforum .pо файла. definition.po е съществуващ PO файл с преводи. reference.pot е пресен PO файл с актуални референции към кода. reference.pot обикновено е създаден от rgettext."
 
-#: ../lib/gettext/tools/msgmerge.rb:372
+#: ../lib/gettext/tools/msgmerge.rb:371
 msgid "Update definition.po"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:406 ../lib/gettext/tools/xgettext.rb:307
+#: ../lib/gettext/tools/msgmerge.rb:405 ../lib/gettext/tools/xgettext.rb:306
 msgid "Preserve '#: FILENAME:LINE' lines"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:428
+#: ../lib/gettext/tools/msgmerge.rb:433
 msgid "Disable fuzzy matching"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:429
+#: ../lib/gettext/tools/msgmerge.rb:434
 msgid "(enable)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:449
+#: ../lib/gettext/tools/msgmerge.rb:454
 msgid "Display version information and exit"
 msgstr "показване на версията и изход"
 
-#: ../lib/gettext/tools/xgettext.rb:65
+#: ../lib/gettext/tools/xgettext.rb:63
 msgid "'%{klass}' is ignored."
 msgstr "'%{klass}' беше игнориран."
 
-#: ../lib/gettext/tools/xgettext.rb:170
+#: ../lib/gettext/tools/xgettext.rb:169
 msgid "Error parsing %{path}"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:229
+#: ../lib/gettext/tools/xgettext.rb:228
 msgid "no input files"
 msgstr "няма зададени файлове"
 
-#: ../lib/gettext/tools/xgettext.rb:242
+#: ../lib/gettext/tools/xgettext.rb:241
 msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
 msgstr "Употреба: %s input.rb [-r parser.rb] [-o output.pot] "
 
-#: ../lib/gettext/tools/xgettext.rb:245
+#: ../lib/gettext/tools/xgettext.rb:244
 msgid "Extract translatable strings from given input files."
 msgstr "Извличане на преводните низове от зададените файлове."
 
-#: ../lib/gettext/tools/xgettext.rb:256
+#: ../lib/gettext/tools/xgettext.rb:255
 msgid "set package name in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:262
+#: ../lib/gettext/tools/xgettext.rb:261
 msgid "set package version in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:268
+#: ../lib/gettext/tools/xgettext.rb:267
 msgid "set report e-mail address for msgid bugs"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:274
+#: ../lib/gettext/tools/xgettext.rb:273
 msgid "set copyright holder in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:280
+#: ../lib/gettext/tools/xgettext.rb:279
 msgid "set copyright year in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:286
+#: ../lib/gettext/tools/xgettext.rb:285
 msgid "set encoding for output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:292
+#: ../lib/gettext/tools/xgettext.rb:291
 msgid "Generate sorted output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:297
+#: ../lib/gettext/tools/xgettext.rb:296
 msgid "Sort output by file location"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:329
+#: ../lib/gettext/tools/xgettext.rb:334
 msgid "require the library before executing xgettext"
 msgstr "заредете библиотеката с require преди да изпълните rgettext"
 
-#: ../lib/gettext/tools/xgettext.rb:334
+#: ../lib/gettext/tools/xgettext.rb:339
+msgid "Add PARSER to parser list for xgettext"
+msgstr ""
+
+#: ../lib/gettext/tools/xgettext.rb:345
 msgid "If TAG is specified, place comment blocks starting with TAG and precedding keyword lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:335
+#: ../lib/gettext/tools/xgettext.rb:346
 msgid "If TAG is not specified, place all comment blocks preceing keyword lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:336
+#: ../lib/gettext/tools/xgettext.rb:347
 msgid "(default: %s)"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:336
+#: ../lib/gettext/tools/xgettext.rb:347
 msgid "no TAG"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:340
+#: ../lib/gettext/tools/xgettext.rb:351
 msgid "run in debugging mode"
 msgstr "изпълнение в режим на дебъгване"
 
-#: ../lib/gettext/tools/xgettext.rb:344
+#: ../lib/gettext/tools/xgettext.rb:355
 msgid "display this help and exit"
 msgstr "показване на версията и изход"
 
-#: ../lib/gettext/tools/xgettext.rb:375
+#: ../lib/gettext/tools/xgettext.rb:386
 msgid "Warning: The empty \"\" msgid is reserved by gettext. So gettext(\"\") doesn't returns empty string but the header entry in po file."
 msgstr ""
-
-#~ msgid "`%{file}' is not glade-2.0 format."
-#~ msgstr "`%{file}' не е във формат glade-2.0."

data/po/bg/gettext.po

@@ -81,6 +81,9 @@ msgid ""
 "s"
 msgstr ""
 
+msgid "Use one line for each reference comment"
+msgstr ""
+
 msgid "Ignore fuzzy entries"
 msgstr ""
 
@@ -240,6 +243,9 @@ msgstr ""
 msgid "require the library before executing xgettext"
 msgstr "заредете библиотеката с require преди да изпълните rgettext"
 
+msgid "Add PARSER to parser list for xgettext"
+msgstr ""
+
 msgid ""
 "If TAG is specified, place comment blocks starting with TAG and precedding key"
 "word lines in output file"