gettext 3.4.4 → 3.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08ec1d309ee833a5038abf2d2e442006d05be64ac85d270a5ebc0f975049e156'
-  data.tar.gz: ab50d773df116c00aa0b02ef6d13dfb5f375e481cbaafef29a6415c9892f4949
+  metadata.gz: 623479874c1f5d1800b18fc285df714bdb8bc48b63f55547e634506ac89a5b4f
+  data.tar.gz: b11c495203dc16e9668430a70f35ba93abe5126db80dbf04c773b72a609b34c8
 SHA512:
-  metadata.gz: '0590096a216d72fc22176eab9b266c8acecce48375dc123f53cdc64f606d4310061f2d794ad011daaab5574e3f70654580e6c085f3d865eaa4f7acd9fd283636'
-  data.tar.gz: 31d4038bdd98dfbb04c7d62c31099645cdd053341a1b2ef532cf46473352de8278aef615d47ca8c23d00047479a578a8c47e42715c2788ece1d0b52f8c235e36
+  metadata.gz: 9b6b842173b961104f45a2a5bc2dc6c1924d012aed19c114d748f8d85c94ae3510b4b7cf8db18a8df7790b19e57ab08b5ff2b7a5bc1ef50509f250a73cbcfce1
+  data.tar.gz: 480d5730ff338bc4bb4a1045df02fd0adfeef8cdc468e1c53977751917a243172f7b97e58b363175fe0566658c04a4c27db8282f0afc4707e1daf091419c47b4

data/doc/text/news.md

@@ -1,5 +1,18 @@
 # News
 
+## 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

data/lib/gettext/po_entry.rb

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

data/lib/gettext/po_parser.rb

@@ -8,7 +8,7 @@
 
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.0
+# This file is automatically generated by Racc 1.7.1
 # from Racc grammar file "".
 #
 
@@ -19,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', 122)
   if GetText.respond_to?(:bindtextdomain)
     include GetText
     GetText.bindtextdomain("gettext")
@@ -44,20 +44,23 @@ 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 = []
@@ -102,7 +105,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]
@@ -387,7 +390,7 @@ 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,7 +413,7 @@ 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
@@ -422,7 +424,7 @@ module_eval(<<'.,.,', 'po_parser.ry', 38)
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 61)
+module_eval(<<'.,.,', 'po_parser.ry', 60)
   def _reduce_9(val, _values, result)
         if @fuzzy and ignore_fuzzy?
       if val[1] != ""
@@ -444,7 +446,7 @@ module_eval(<<'.,.,', 'po_parser.ry', 61)
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 82)
+module_eval(<<'.,.,', 'po_parser.ry', 81)
   def _reduce_10(val, _values, result)
         if val[0].size > 0
       result = val[0] + "\000" + val[1]
@@ -458,7 +460,7 @@ module_eval(<<'.,.,', 'po_parser.ry', 82)
 
 # reduce 11 omitted
 
-module_eval(<<'.,.,', 'po_parser.ry', 94)
+module_eval(<<'.,.,', 'po_parser.ry', 93)
   def _reduce_12(val, _values, result)
         result = val[2]
 
@@ -466,7 +468,7 @@ module_eval(<<'.,.,', 'po_parser.ry', 94)
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 101)
+module_eval(<<'.,.,', 'po_parser.ry', 100)
   def _reduce_13(val, _values, result)
         on_comment(val[0])
 
@@ -474,7 +476,7 @@ module_eval(<<'.,.,', 'po_parser.ry', 101)
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 109)
+module_eval(<<'.,.,', 'po_parser.ry', 108)
   def _reduce_14(val, _values, result)
         result = val.delete_if{|item| item == ""}.join
 
@@ -482,7 +484,7 @@ module_eval(<<'.,.,', 'po_parser.ry', 109)
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 113)
+module_eval(<<'.,.,', 'po_parser.ry', 112)
   def _reduce_15(val, _values, result)
         result = val[0]
 

data/lib/gettext/version.rb

@@ -1,7 +1,7 @@
 =begin
   version - version information of gettext
 
-  Copyright (C) 2012-2022 Sutou Kouhei <kou@clear-code.com>
+  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
@@ -9,5 +9,5 @@
 =end
 
 module GetText
-  VERSION = "3.4.4"
+  VERSION = "3.4.6"
 end

data/po/gettext.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 3.4.4\n"
+"Project-Id-Version: gettext 3.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-11 06:21+0900\n"
-"PO-Revision-Date: 2023-06-11 06:21+0900\n"
+"POT-Creation-Date: 2023-07-12 10:23+0900\n"
+"PO-Revision-Date: 2023-07-12 10:23+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/src/po_parser.ry

@@ -24,7 +24,7 @@ class GetText::POParser
   msgctxt
   : MSGCTXT string_list
   {
-    @msgctxt = unescape(val[1])
+    @msgctxt = val[1]
   }
   ;
 
@@ -36,9 +36,8 @@ class GetText::POParser
   single_message
   : MSGID string_list MSGSTR string_list
   {
-    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?)
@@ -48,7 +47,7 @@ class GetText::POParser
         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
@@ -144,20 +143,23 @@ require "gettext/po"
     @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 = []
@@ -202,7 +204,7 @@ require "gettext/po"
         @q.push [:COMMENT, $&]
         str = $'
       when /\A\"(.*)\"/
-        @q.push [:STRING, unescape_string($1)]
+        @q.push [:STRING, unescape($1)]
         str = $'
       else
         #c = str[0,1]

data/test/test_po_entry.rb

@@ -233,13 +233,15 @@ EOE
       class TestEscape < self
         def test_normal
           entry = GetText::POEntry.new(:normal)
-          entry.msgid = "He said \"hello.\""
-          entry.msgstr = "Il a dit \"bonjour.\""
+          entry.msgid = "He said \"hello.\"\r\n"
+          entry.msgstr = "Il a dit \"bonjour.\"\r\n"
           entry.references = ["file1:1", "file2:10"]
           expected_po = <<-EOE
 #: file1:1 file2:10
-msgid "He said \\"hello.\\""
-msgstr "Il a dit \\"bonjour.\\""
+msgid ""
+"He said \\"hello.\\"\\r\\n"
+msgstr ""
+"Il a dit \\"bonjour.\\"\\r\\n"
 EOE
           assert_equal(expected_po, entry.to_s)
         end

data/test/test_po_parser.rb

@@ -62,6 +62,16 @@ EOP
   class TestPO < self
     include Helper::Warning
 
+    def test_msgid_escape
+      po_file = create_po_file(<<-'EOP')
+msgid "\\\\r \\r \t \r \n"
+msgstr "\\\\r \\r \t \r \n"
+EOP
+      entries = parse_po_file(po_file)
+      assert_equal("\\\\r \\r \t \r \n",
+                   entries["\\\\r \\r \t \r \n"].msgstr)
+    end
+
     def test_msgstr
       po_file = create_po_file(<<-EOP)
 # This is the comment.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.4.6
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-10 00:00:00.000000000 Z
+date: 2023-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi