gettext 3.4.8 → 3.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 935189b8e4a67d110df2c1e21b89bab5f70057772c31861d58c1d71935e4ace3
-  data.tar.gz: ee204b53fee909a7a23921a814fc3046312fe8fc6f3f576b7b883a2920896d02
+  metadata.gz: 737177cc120acfd0387fdb23761ea8bf324a490b1d4b94f8edce692d22decad7
+  data.tar.gz: 67e7d803c3d9fc924e47d0b612cee9ac329eec67784c8e6e63763886f4602be0
 SHA512:
-  metadata.gz: a91c277a26e46db88ff1d67c85a2d0932a22cf0043d74cec373119dea8431614dfd35a2ddaef7ed18b557c07bdd27b60c3e8bf6fe79e7da80e42160f30883786
-  data.tar.gz: 00cd6a8ba2be7a06b9b9c7d5d8cc6e5f92bfbe768a32237dfcb029a105cd1b6508db88fb8988027c639d7bc385f43246d79513d5d4cc912d5e632ecbb5014c28
+  metadata.gz: f12a1f4f550947c5ed4628674f39d8a39857e56e461643ba102ded0f3344ed4015981a6ba13d10c9d411c7bfcdd7ba0c652642bfaaf3fa7a7d9e61f810e96cb3
+  data.tar.gz: 2db766ca9d05099d92d366b36a257c618c3524e404f6da5a2488cd401b3704373098e87424593ed200383087434e5115359e13abd90ddd25abe099b13e68620a

data/doc/text/news.md

@@ -1,5 +1,12 @@
 # News
 
+## 3.4.9: 2023-10-22 {#version-3-4-9}
+
+### Improvements
+
+  * `rmsgcat`, `rmsgmerge`, `rxgettext`: Added
+    `--use-one-line-per-reference` option.
+
 ## 3.4.8: 2023-10-22 {#version-3-4-8}
 
 ### Fixes

data/lib/gettext/po_entry.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2010  masone (Christian Felder) <ema@rh-productions.ch>
 # Copyright (C) 2009  Masao Mutoh
 #
@@ -282,6 +282,9 @@ module GetText
       #   Wraps long lines that is longer than the `:max_line_width`.
       #   Don't break long lines if `:max_line_width` is less than 0
       #   such as `-1`.
+      # @option options [Bool] :use_one_line_per_reference (false)
+      #   Whether each reference comment uses one line or not. If this
+      #   is `true`, `:max_line_width` is ignored for reference comment.
       # @option options [Encoding] :encoding (nil)
       #   Encodes to the specific encoding.
       def initialize(entry, options={})
@@ -405,24 +408,29 @@ module GetText
       end
 
       def format_reference_comment
-        max_line_width = @options[:max_line_width]
         formatted_reference = String.new
-        if not @entry.references.nil? and not @entry.references.empty?
-          formatted_reference << REFERENCE_COMMENT_MARK
-          line_width = 2
-          @entry.references.each do |reference|
-            if max_line_width > 0 and
+        if @options[:use_one_line_per_reference]
+          @entry.references&.each do |reference|
+            formatted_reference << "#{REFERENCE_COMMENT_MARK} #{reference}\n"
+          end
+        else
+          max_line_width = @options[:max_line_width]
+          if not @entry.references.nil? and not @entry.references.empty?
+            formatted_reference << REFERENCE_COMMENT_MARK
+            line_width = 2
+            @entry.references.each do |reference|
+              if max_line_width > 0 and
                 line_width + reference.size > max_line_width
-              formatted_reference << "\n"
-              formatted_reference <<  "#{REFERENCE_COMMENT_MARK} #{reference}"
-              line_width = 3 + reference.size
-            else
-              formatted_reference << " #{reference}"
-              line_width += 1 + reference.size
+                formatted_reference << "\n"
+                formatted_reference <<  "#{REFERENCE_COMMENT_MARK} #{reference}"
+                line_width = 3 + reference.size
+              else
+                formatted_reference << " #{reference}"
+                line_width += 1 + reference.size
+              end
             end
+            formatted_reference << "\n"
           end
-
-          formatted_reference << "\n"
         end
         formatted_reference
       end

data/lib/gettext/tools/msgcat.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014-2023  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -200,7 +200,8 @@ module GetText
           @output = nil
           @order = nil
           @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,
           }
           @include_fuzzy = true
           @report_warning = true
@@ -322,6 +323,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",
                     _("Ignore fuzzy entries")) do |include_fuzzy|
             @include_fuzzy = include_fuzzy

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/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,6 +324,12 @@ 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

data/lib/gettext/version.rb

@@ -9,5 +9,5 @@
 =end
 
 module GetText
-  VERSION = "3.4.8"
+  VERSION = "3.4.9"
 end

data/po/bg/gettext.edit.po

@@ -27,99 +27,103 @@ msgstr "Третият параметър е грешен: value = %{number}"
 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:355
+#: ../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,118 +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:340
+#: ../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:341
+#: ../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:342
+#: ../lib/gettext/tools/xgettext.rb:347
 msgid "(default: %s)"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:342
+#: ../lib/gettext/tools/xgettext.rb:347
 msgid "no TAG"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:346
+#: ../lib/gettext/tools/xgettext.rb:351
 msgid "run in debugging mode"
 msgstr "изпълнение в режим на дебъгване"
 
-#: ../lib/gettext/tools/xgettext.rb:350
+#: ../lib/gettext/tools/xgettext.rb:355
 msgid "display this help and exit"
 msgstr "показване на версията и изход"
 
-#: ../lib/gettext/tools/xgettext.rb:381
+#: ../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 ""

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 ""