gettext 3.4.2 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b06a32f776c073ec316860952a830ed9941ce67ab34b0e1f111f1009ba8842d
-  data.tar.gz: 9736e8cf70f1faeb97daed575e020e3edd2bd76daab2f069cfaf103dbb0e51e6
+  metadata.gz: c3e308b50375d4a1af74d787bef561bdc20d97a8da045e0a63691353db56b1d4
+  data.tar.gz: 2028906c7a708e452ccae9b783965358fac558a5ac1564cf09051cc9514d1603
 SHA512:
-  metadata.gz: f3480005cc4f1a84ef2fbf53c25c5d198b871b5fed9885f4fd352a90815d78ad0bde1c76234fa5f10809c5b0c35e8f9c1518a51ec963e24d95fc7fd98b5ccecf
-  data.tar.gz: fc670a833c0d30e6d3c36b086e9298a39145ca105c9134a12667343f4c863a978b5820ef6c08b0dad35efd7a6a223c677d9085106d4f72241b0f8a0079196575
+  metadata.gz: 30596c9408d65115e6c03395d0fe8060d5de4144505d75309832e6d2ce6602aff24a4b1743b886851219196b32f31c34bcd297cdc78645df5b5eb8af4a548841
+  data.tar.gz: e39d58334a1afdb6d09d13374802536836e333c275f13730d1bd760318c5b582d431c90232b56f9a55d2c87aa44a1c96c8b6de6aaa87bf4531262478dc8ddd65

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

@@ -8,7 +8,7 @@
 # You don't need to use this file directly.
 #
 # Copyright(c) 2005-2009 Masao Mutoh
-# Copyright(c) 2012-2013 Kouhei Sutou <kou@clear-code.com>
+# Copyright(c) 2012-2025 Kouhei Sutou <kou@clear-code.com>
 # Copyright(c) 2012 Haruka Yoshihara <yoshihara@clear-code.com>
 # This program is licenced under the same licence as Ruby.
 
@@ -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.
@@ -200,3 +198,14 @@ task :build => [:gettext]
 
 YARD::Rake::YardocTask.new do |t|
 end
+
+release_task = Rake.application["release"]
+# We use Trusted Publishing.
+release_task.prerequisites.delete("build")
+release_task.prerequisites.delete("release:rubygem_push")
+release_task_comment = release_task.comment
+if release_task_comment
+  release_task.clear_comments
+  release_task.comment = release_task_comment.gsub(/ and build.*$/, "")
+end
+

data/doc/text/news.md

@@ -1,5 +1,122 @@
 # News
 
+## 3.5.2: 2026-02-25 {#version-3-5-2}
+
+### Improvements
+
+  * Add more metadata to gemspec.
+    * GH-115
+    * Patch by Keenan Brock
+
+  * Add support for ERB 6.0.2.
+    * GH-118
+    * Patch by Karine Vieira
+
+### Thanks
+
+  * Keenan Brock
+  * Karine Vieira
+
+## 3.5.1: 2025-01-27 {#version-3-5-1}
+
+### Improvements
+
+  * `rmsginit`: Added support for replacing charset.
+    * GH-113
+    * Patch by Abe Tomoaki
+
+### Thanks
+
+  * Abe Tomoaki
+
+## 3.5.0: 2024-12-04 {#version-3-5-0}
+
+### Improvements
+
+  * Suppressed warnings with Ruby 3.4.0.
+
+## 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

data/gettext.gemspec

@@ -16,6 +16,10 @@ So you can use GNU gettext tools for maintaining.
   s.authors = ["Kouhei Sutou", "Masao Mutoh"]
   s.email = ["kou@clear-code.com", "mutomasa at gmail.com"]
   s.homepage = "https://ruby-gettext.github.io/"
+  s.metadata = {
+    "source_code_uri" => "https://github.com/ruby-gettext/gettext",
+    "changelog_uri"   => "https://github.com/ruby-gettext/gettext/releases/tag/#{s.version}"
+  }
   s.require_paths = ["lib"]
   Dir.chdir(base_dir) do
     s.files = Dir.glob("{locale,bin,data,doc/text,lib,po,samples,src,test}/**/*")
@@ -29,11 +33,12 @@ 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")

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.8.1
+# from Racc grammar file "po_parser.ry".
 #
 
 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 = 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/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/msginit.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2021  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2024  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -62,6 +62,7 @@ module GetText
         @output_file = nil
         @locale = nil
         @language = nil
+        @charset = nil
         @entry = nil
         @comment = nil
         @translator = nil
@@ -180,6 +181,11 @@ module GetText
         end
         @locale = language_tag.to_simple.to_s
         @language = language_tag.language
+        if language_tag.respond_to?(:charset)
+          @charset = language_tag.charset
+        else
+          @charset = Locale.charset
+        end
 
         @output_file ||= "#{@locale}.po"
         if File.exist?(@output_file)
@@ -280,6 +286,7 @@ module GetText
         replace_pot_revision_date
         replace_language
         replace_plural_forms
+        replace_charset
       end
 
       def replace_comment
@@ -325,6 +332,12 @@ module GetText
         end
       end
 
+      CONTENT_TYPE_CHARSET = /^(Content-Type:.+ charset=)CHARSET/
+
+      def replace_charset
+        @entry = @entry.gsub(CONTENT_TYPE_CHARSET, "\\1#{@charset}")
+      end
+
       def plural_forms(language)
         converter = CLDRPluralsConverter.new(language)
         converter.convert
@@ -416,7 +429,7 @@ module GetText
             n_plurals += 1
             conditions << condition
           end
-          expression = ""
+          expression = +""
           case conditions.size
           when 0
             expression << "0"