gettext 3.4.7 → 3.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa1902916e0f5d7d7e6f55abac75be8b7766b42ce209b7a1a166e146554994ba
-  data.tar.gz: 295926d043977eb7001e89215848f16d527e6141e0d7c23d29db147d635b732a
+  metadata.gz: 935189b8e4a67d110df2c1e21b89bab5f70057772c31861d58c1d71935e4ace3
+  data.tar.gz: ee204b53fee909a7a23921a814fc3046312fe8fc6f3f576b7b883a2920896d02
 SHA512:
-  metadata.gz: 79cdda51880bc12d8d3c02bfcf07a8776f0dc18e6b3ee8daa5e3654786cc0fc4116c0d839f36a6cb7803b927e0f34cc37de32b447e906e11575f668dcf06a371
-  data.tar.gz: ca5da85ee4a5fe13032229c95d41e8d12d258e2809f85a3cd268a8e4b7752c637b764d5a0d6bec466ceb68ba09005fb026815fff884178b5900bbdd64aa3329e
+  metadata.gz: a91c277a26e46db88ff1d67c85a2d0932a22cf0043d74cec373119dea8431614dfd35a2ddaef7ed18b557c07bdd27b60c3e8bf6fe79e7da80e42160f30883786
+  data.tar.gz: 00cd6a8ba2be7a06b9b9c7d5d8cc6e5f92bfbe768a32237dfcb029a105cd1b6508db88fb8988027c639d7bc385f43246d79513d5d4cc912d5e632ecbb5014c28

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/doc/text/news.md

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

data/lib/gettext/po_entry.rb

@@ -428,11 +428,12 @@ module GetText
       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

@@ -161,7 +161,11 @@ module_eval(<<'...end po_parser.ry/module_eval...', 'po_parser.ry', 126)
   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 << ""
@@ -176,7 +180,7 @@ module_eval(<<'...end po_parser.ry/module_eval...', 'po_parser.ry', 126)
         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
@@ -245,7 +249,7 @@ module_eval(<<'...end po_parser.ry/module_eval...', 'po_parser.ry', 126)
   end
 
   def parse_flags_line(line)
-    line.split(/\s+/)
+    line.split(",").collect(&:strip)
   end
 
   def clear

data/lib/gettext/version.rb

@@ -1,13 +1,13 @@
 =begin
   version - version information of gettext
 
-  Copyright (C) 2012-2023 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.4.7"
+  VERSION = "3.4.8"
 end

data/po/gettext.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 3.4.7\n"
+"Project-Id-Version: gettext 3.4.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-17 17:02+0900\n"
-"PO-Revision-Date: 2023-08-17 17:02+0900\n"
+"POT-Creation-Date: 2023-10-22 06:20+0900\n"
+"PO-Revision-Date: 2023-10-22 06:20+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/src/po_parser.ry

@@ -264,7 +264,11 @@ require "gettext/po"
   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 << ""
@@ -279,7 +283,7 @@ require "gettext/po"
         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
@@ -348,7 +352,7 @@ require "gettext/po"
   end
 
   def parse_flags_line(line)
-    line.split(/\s+/)
+    line.split(",").collect(&:strip)
   end
 
   def clear

data/test/test_po_entry.rb

@@ -344,6 +344,20 @@ EOP
       assert_equal(expected_po, entry.to_s)
     end
 
+    def test_multiple_flags
+      entry = GetText::POEntry.new(:normal)
+      entry.msgid = "msgid"
+      entry.msgstr = "msgstr"
+      entry.flags = ["It's the flag.", "fuzzy"]
+
+      expected_po = <<-EOP
+#, It's the flag., fuzzy
+msgid "msgid"
+msgstr "msgstr"
+EOP
+      assert_equal(expected_po, entry.to_s)
+    end
+
     def test_previous
       entry = GetText::POEntry.new(:normal)
       entry.msgid = "msgid"

data/test/test_po_parser.rb

@@ -245,6 +245,12 @@ EOP
 msgid "hello"
 msgstr "bonjour"
 
+#, c-format, fuzzy , no-sh-format
+#: file.rb:11
+msgid "world"
+msgstr "monde"
+
+# This is not fuzzy
 msgid "non-fuzzy"
 msgstr "non-fuzzy string"
 PO

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext
 version: !ruby/object:Gem::Version
-  version: 3.4.7
+  version: 3.4.8
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 2023-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi