gettext 3.3.9 → 3.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf480f5774043884c6583daea1fc41264e3ce96c90c287f61a5336054f69f428
-  data.tar.gz: daa8334ee3ccecb4cf90d9ea016392068c6ae3bdf11b395df706fd4b1e5cff0d
+  metadata.gz: 737177cc120acfd0387fdb23761ea8bf324a490b1d4b94f8edce692d22decad7
+  data.tar.gz: 67e7d803c3d9fc924e47d0b612cee9ac329eec67784c8e6e63763886f4602be0
 SHA512:
-  metadata.gz: 7040a0b37b61e221055ab90bfafb0d538b24641211c45f8a4ce04adbc08b22dba247369ba5e695f7d1565a4fffbf67a317065933f39a788c34bf8e45f3b37b3f
-  data.tar.gz: 9d0f862577acd733cabdb1d66b90cde9b5c896d2dc468dac36b205172f72546902648e1dcaa509c7fc920ba805155d1241c79ebdc3b928d59745a309ca7c9c44
+  metadata.gz: f12a1f4f550947c5ed4628674f39d8a39857e56e461643ba102ded0f3344ed4015981a6ba13d10c9d411c7bfcdd7ba0c652642bfaaf3fa7a7d9e61f810e96cb3
+  data.tar.gz: 2db766ca9d05099d92d366b36a257c618c3524e404f6da5a2488cd401b3704373098e87424593ed200383087434e5115359e13abd90ddd25abe099b13e68620a

data/README.md

@@ -244,11 +244,11 @@ n_(fruits, 3)
 
 ### Interpolating translations
 
-This is not a feature of gettext but worth noting. You can interpolate translated strings without the ruby String `%` operator.
+This is not a feature of gettext but worth noting. You can interpolate translated strings with the ruby String `%` operator.
 
 ```ruby
 N_("active"); N_("inactive"); N_("paused") # possible value of status for parser to find.
-_("Your account is #{account_state}.") % { account_state: _(status) }
+_("Your account is %{account_state}.") % { account_state: _(status) }
 ```
 
 

data/Rakefile

@@ -56,12 +56,10 @@ file po_parser_rb_path => po_parser_ry_path do
 
   File.open(po_parser_rb_path, "w") do |po_parser_rb|
     po_parser_rb.puts(<<-EOH)
-# -*- coding: utf-8 -*-
-#
 # po_parser.rb - Generate a .mo
 #
 # Copyright (C) 2003-2009 Masao Mutoh <mutomasa at gmail.com>
-# Copyright (C) 2012 Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2023 Sutou Kouhei <kou@clear-code.com>
 #
 # You may redistribute it and/or modify it under the same
 # license terms as Ruby or LGPL.

data/doc/text/news.md

@@ -1,5 +1,126 @@
 # 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
+
+  * doc: Fixed a wrong description for interpolation.
+    * GH-102
+    * Patch by Ilmari Karonen
+
+  * po: Fixed a parser bug that flags aren't parsed correctly. If a
+    normal comment has "fuzzy", the entry is also treated as a fuzzy
+    entry.
+
+  * po: Fixed an output bug that flags aren't formatted correctly.
+    * GH-105
+    * Patch by Yoshikazu Nojima
+
+### Thanks
+
+  * Ilmari Karonen
+
+  * Yoshikazu Nojima
+
+## 3.4.7: 2023-08-17 {#version-3-4-7}
+
+### Fixes
+
+  * po: Fixed a parser bug that it may add a `fuzzy` flag to non-fuzzy
+    entry with `ignore_fuzzy: true`.
+
+    Example PO:
+
+    ```po
+    #, fuzzy
+    #: file.rb:10
+    msgid "hello"
+    msgstr "bonjour"
+
+    msgid "non-fuzzy"
+    msgstr "non-fuzzy string"
+	```
+
+    `hello` entry is ignored because `ignore_fuzzy` is `true`. The
+    `fuzzy` flag in the `hello` entry is added to `non-fuzzy` entry.
+
+## 3.4.6: 2023-07-12 {#version-3-4-6}
+
+### Fixes
+
+  * po: Fixed a bug that parsed `msgid`/`msgstr`/`msgctxt` in `.po`
+    may be too much unescaped.
+
+## 3.4.5: 2023-07-12 {#version-3-4-5}
+
+### Improvements
+
+  * po: Added support for escaping `\r` in `msgid`/`msgstr`.
+
+## 3.4.4: 2023-06-11 {#version-3-4-4}
+
+### Improvements
+
+  * Added `racc` to runtime dependencies because Ruby 3.3 doesn't
+    include `racc/parser`.
+
+## 3.4.3: 2022-05-20 {#version-3-4-3}
+
+### Improvements
+
+  * Added support for Erubi to parse `.erb`
+    [GitHub#91][Patch by Michaël Hoste]
+
+### Thanks
+
+  * Michaël Hoste
+
+## 3.4.2: 2022-01-11 {#version-3-4-2}
+
+### Improvements
+
+  * Added support for fallback for specific locale.
+    e.g.: `fr_BE_Foo` -> `fr_BE` -> `fr`
+    [GitHub#90][Patch by Michaël Hoste]
+
+  * Added support for Ruby 3.1.
+    [GitHub#92][Reported by ahiru]
+
+### Thanks
+
+  * Michaël Hoste
+
+  * ahiru
+
+## 3.4.1: 2021-09-08 {#version-3-4-1}
+
+### Improvements
+
+  * Listed licenses separately in gemspec.
+    [GitHub#88][Patch by Josh Cooper]
+
+### Thanks
+
+  * Josh Cooper
+
+## 3.4.0: 2021-08-26 {#version-3-4-0}
+
+### Improvements
+
+  * test: Added missing Red Datasets availability check.
+    [GitHub#87][Reported by Mamoru TASAKA]
+
+### Thanks
+
+  * Mamoru TASAKA
+
 ## 3.3.9: 2021-08-26 {#version-3-3-9}
 
 ### Improvements

data/gettext.gemspec

@@ -29,14 +29,16 @@ So you can use GNU gettext tools for maintaining.
 
   s.required_ruby_version = ">= 2.5.0"
 
+  s.add_runtime_dependency("erubi")
   s.add_runtime_dependency("locale", ">= 2.0.5")
+  s.add_runtime_dependency("prime")
+  s.add_runtime_dependency("racc")
   s.add_runtime_dependency("text", ">= 1.3.0")
   s.add_development_dependency("kramdown")
-  s.add_development_dependency("racc")
   s.add_development_dependency("rake")
   s.add_development_dependency("red-datasets")
   s.add_development_dependency("test-unit")
   s.add_development_dependency("test-unit-rr")
   s.add_development_dependency("yard")
-  s.license = "Ruby or LGPLv3+"
+  s.licenses = ["Ruby", "LGPL-3.0+"]
 end

data/lib/gettext/mo.rb

@@ -3,7 +3,7 @@
 =begin
     mo.rb - A simple class for operating GNU MO file.
 
-    Copyright (C) 2012-2017  Kouhei Sutou <kou@clear-code.com>
+    Copyright (C) 2012-2022  Sutou Kouhei <kou@clear-code.com>
     Copyright (C) 2003-2009  Masao Mutoh
     Copyright (C) 2002  Masahiro Sakai, Masao Mutoh
     Copyright (C) 2001  Masahiro Sakai
@@ -19,6 +19,8 @@
 
 require 'stringio'
 
+require 'prime'
+
 module GetText
   class MO < Hash
     class InvalidFormat < RuntimeError; end;
@@ -168,19 +170,8 @@ module GetText
       ('1' * number) !~ /^1?$|^(11+?)\1+$/
     end
 
-    begin
-      require 'prime'
-      def next_prime(seed)
-        Prime.instance.find{|x| x > seed }
-      end
-    rescue LoadError
-      def next_prime(seed)
-        require 'mathn'
-        prime = Prime.new
-        while current = prime.succ
-          return current if current > seed
-        end
-      end
+    def next_prime(seed)
+      Prime.instance.find{|x| x > seed }
     end
 
     HASHWORDBITS = 32

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
 #
@@ -241,11 +241,12 @@ module GetText
         def escape(string)
           return "" if string.nil?
 
-          string.gsub(/([\\"\t\n])/) do
-            special_character = $1
+          string.gsub(/[\\"\t\r\n]/) do |special_character|
             case special_character
             when "\t"
               "\\t"
+            when "\r"
+              "\\r"
             when "\n"
               "\\n"
             else
@@ -281,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={})
@@ -404,34 +408,40 @@ 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
 
       def format_flag_comment
-        formatted_flags = String.new
-        @entry.flags.each do |flag|
-          formatted_flags << format_comment(FLAG_MARK, flag)
+        if @entry.flags.empty?
+          String.new
+        else
+          joined_flags = @entry.flags.join(", ")
+          format_comment(FLAG_MARK, joined_flags)
         end
-        formatted_flags
       end
 
       def format_previous_comment

data/lib/gettext/po_parser.rb

@@ -1,17 +1,15 @@
-# -*- coding: utf-8 -*-
-#
 # po_parser.rb - Generate a .mo
 #
 # Copyright (C) 2003-2009 Masao Mutoh <mutomasa at gmail.com>
-# Copyright (C) 2012-2017 Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2023 Sutou Kouhei <kou@clear-code.com>
 #
 # You may redistribute it and/or modify it under the same
 # license terms as Ruby or LGPL.
 
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.14
-# from Racc grammer file "".
+# This file is automatically generated by Racc 1.7.1
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
@@ -21,7 +19,7 @@ require "gettext/po"
 module GetText
   class POParser < Racc::Parser
 
-module_eval(<<'...end po_parser.ry/module_eval...', 'po_parser.ry', 123)
+module_eval(<<'...end po_parser.ry/module_eval...', 'po_parser.ry', 126)
   if GetText.respond_to?(:bindtextdomain)
     include GetText
     GetText.bindtextdomain("gettext")
@@ -46,31 +44,26 @@ module_eval(<<'...end po_parser.ry/module_eval...', 'po_parser.ry', 123)
     @report_warning
   end
 
-  def unescape(orig)
-    ret = orig.gsub(/\\n/, "\n")
-    ret.gsub!(/\\t/, "\t")
-    ret.gsub!(/\\r/, "\r")
-    ret.gsub!(/\\"/, "\"")
-    ret
+  def unescape(string)
+    string.gsub(/\\(.)/) do
+      escaped_character = $1
+      case escaped_character
+      when "t"
+        "\t"
+      when "r"
+        "\r"
+      when "n"
+        "\n"
+      else
+        escaped_character
+      end
+    end
   end
   private :unescape
 
-  def unescape_string(string)
-    string.gsub(/\\\\/, "\\")
-  end
-  private :unescape_string
-
   def parse(str, data)
-    @translator_comments = []
-    @extracted_comments = []
-    @references = []
-    @flags = []
-    @previous = []
-    @comments = []
+    clear
     @data = data
-    @fuzzy = false
-    @msgctxt = nil
-    @msgid_plural = nil
 
     str = str.strip
     @q = []
@@ -104,7 +97,7 @@ module_eval(<<'...end po_parser.ry/module_eval...', 'po_parser.ry', 123)
         @q.push [:COMMENT, $&]
         str = $'
       when /\A\"(.*)\"/
-        @q.push [:STRING, unescape_string($1)]
+        @q.push [:STRING, unescape($1)]
         str = $'
       else
         #c = str[0,1]
@@ -156,15 +149,7 @@ module_eval(<<'...end po_parser.ry/module_eval...', 'po_parser.ry', 123)
       @data.set_comment(msgid, format_comment(@comments))
     end
 
-    @translator_comments = []
-    @extracted_comments = []
-    @references = []
-    @flags = []
-    @previous = []
-    @references = []
-    @comments.clear
-    @msgctxt = nil
-    @msgid_plural = nil
+    clear
   end
 
   def format_comment(comments)
@@ -176,7 +161,11 @@ module_eval(<<'...end po_parser.ry/module_eval...', 'po_parser.ry', 123)
   end
 
   def on_comment(comment)
-    @fuzzy = true if (/fuzzy/ =~ comment)
+    if comment.start_with?(POFormat::FLAG_MARK)
+      content = comment[POFormat::FLAG_MARK.size..-1]
+      flags = parse_flags_line(content)
+      @fuzzy = true if flags.include?("fuzzy")
+    end
     if @data.instance_of?(PO)
       if comment == "#"
         @translator_comments << ""
@@ -191,7 +180,7 @@ module_eval(<<'...end po_parser.ry/module_eval...', 'po_parser.ry', 123)
         when POFormat::REFERENCE_COMMENT_MARK
           @references.concat(parse_references_line(content))
         when POFormat::FLAG_MARK
-          @flags.concat(parse_flags_line(content))
+          @flags.concat(flags)
         when POFormat::PREVIOUS_COMMENT_MARK
           @previous << content
         else
@@ -260,7 +249,19 @@ module_eval(<<'...end po_parser.ry/module_eval...', 'po_parser.ry', 123)
   end
 
   def parse_flags_line(line)
-    line.split(/\s+/)
+    line.split(",").collect(&:strip)
+  end
+
+  def clear
+    @translator_comments = []
+    @extracted_comments = []
+    @references = []
+    @flags = []
+    @previous = []
+    @references = []
+    @comments = []
+    @msgctxt = nil
+    @msgid_plural = nil
   end
 ...end po_parser.ry/module_eval...
 ##### State transition tables begin ###
@@ -349,6 +350,7 @@ Racc_arg = [
   racc_shift_n,
   racc_reduce_n,
   racc_use_result_var ]
+Ractor.make_shareable(Racc_arg) if defined?(Ractor)
 
 Racc_token_to_s_table = [
   "$end",
@@ -370,6 +372,7 @@ Racc_token_to_s_table = [
   "plural_message",
   "msgstr_plural",
   "msgstr_plural_line" ]
+Ractor.make_shareable(Racc_token_to_s_table) if defined?(Ractor)
 
 Racc_debug_parser = true
 
@@ -387,8 +390,8 @@ Racc_debug_parser = true
 
 module_eval(<<'.,.,', 'po_parser.ry', 26)
   def _reduce_5(val, _values, result)
-        @msgctxt = unescape(val[1])
-  
+        @msgctxt = val[1]
+
     result
   end
 .,.,
@@ -399,9 +402,8 @@ module_eval(<<'.,.,', 'po_parser.ry', 26)
 
 module_eval(<<'.,.,', 'po_parser.ry', 38)
   def _reduce_8(val, _values, result)
-        msgid_raw = val[1]
-    msgid = unescape(msgid_raw)
-    msgstr = unescape(val[3])
+        msgid = val[1]
+    msgstr = val[3]
     use_message_p = true
     if @fuzzy and not msgid.empty?
       use_message_p = (not ignore_fuzzy?)
@@ -411,18 +413,22 @@ module_eval(<<'.,.,', 'po_parser.ry', 38)
         else
           $stderr.print _("Warning: fuzzy message was used.\n")
         end
-        $stderr.print "  #{@po_file}: msgid '#{msgid_raw}'\n"
+        $stderr.print "  #{@po_file}: msgid '#{msgid}'\n"
       end
     end
     @fuzzy = false
-    on_message(msgid, msgstr) if use_message_p
+    if use_message_p
+      on_message(msgid, msgstr)
+    else
+      clear
+    end
     result = ""
-  
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 61)
+module_eval(<<'.,.,', 'po_parser.ry', 64)
   def _reduce_9(val, _values, result)
         if @fuzzy and ignore_fuzzy?
       if val[1] != ""
@@ -439,53 +445,53 @@ module_eval(<<'.,.,', 'po_parser.ry', 61)
       on_message(unescape(val[1]), unescape(val[4]))
     end
     result = ""
-  
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 82)
+module_eval(<<'.,.,', 'po_parser.ry', 85)
   def _reduce_10(val, _values, result)
         if val[0].size > 0
       result = val[0] + "\000" + val[1]
     else
       result = ""
     end
-  
+
     result
   end
 .,.,
 
 # reduce 11 omitted
 
-module_eval(<<'.,.,', 'po_parser.ry', 94)
+module_eval(<<'.,.,', 'po_parser.ry', 97)
   def _reduce_12(val, _values, result)
         result = val[2]
-  
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 101)
+module_eval(<<'.,.,', 'po_parser.ry', 104)
   def _reduce_13(val, _values, result)
         on_comment(val[0])
-  
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 109)
+module_eval(<<'.,.,', 'po_parser.ry', 112)
   def _reduce_14(val, _values, result)
         result = val.delete_if{|item| item == ""}.join
-  
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 113)
+module_eval(<<'.,.,', 'po_parser.ry', 116)
   def _reduce_15(val, _values, result)
         result = val[0]
-  
+
     result
   end
 .,.,

data/lib/gettext/text_domain_manager.rb

@@ -77,11 +77,12 @@ module GetText
     end
 
     def each_text_domains(klass) #:nodoc:
-      lang = Locale.candidates[0]
-      ClassInfo.related_classes(klass, @@gettext_classes).each do |target|
-        if group = @@text_domain_group_pool[target]
-          group.text_domains.each do |text_domain|
-            yield text_domain, lang
+      Locale.candidates.each do |lang|
+        ClassInfo.related_classes(klass, @@gettext_classes).each do |target|
+          if group = @@text_domain_group_pool[target]
+            group.text_domains.each do |text_domain|
+              yield text_domain, lang
+            end
           end
         end
       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|