jekyll-task-i18n 1.0.7 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de80e6b3ffdb015d02f3cc9d5181ba7d3999c0a8fa71d984cccbecddebb1c940
-  data.tar.gz: 846fa2a8c2e93583797e352380388f92ebc412c106d7e72088a03f381a86f96c
+  metadata.gz: 4156d92b5c76de010ee1091cb8f5bf7c432c0ad15ac8026fd5d6c2d5afb76b21
+  data.tar.gz: 7583965e477957041691d0c8ee36ecd750abf8e9c34e907e40daaa09c513d3bf
 SHA512:
-  metadata.gz: 916b255b12f5746a0ae237da0755ee8007643b2738fa354cdf4c6d086cd777b245b23982a182672f452c15d06349195f569a166d48aa99e6e3bbe525e396901f
-  data.tar.gz: 71c8534505fcf2ff0e083cfb80d6b5aa1e623c16b6c3535dec592ef9dcda315a213f8e5598aab67127c21034cc749a2d25d4bde97a8d16c423bd38b26094edb5
+  metadata.gz: a3bc0412d6f06731f3ff1141399c2cebeceb0d48ebf020a4a870d6612e0a8dc990c9904d208a886f8ad58d28111bfb86a5e400f3b2a1e3f6572741f474abaea3
+  data.tar.gz: edd06c8e0b2319434e4fb562c96219b17aad03d724377aaaac488ae7c1a2765b8066fb9215e255b3909731132d86e2953b7c3295a5cbe139a2332338f7d22265

data/lib/jekyll/task/i18n/version.rb

@@ -17,7 +17,7 @@
 module Jekyll
   module Task
     class I18n
-      VERSION = "1.0.7"
+      VERSION = "1.0.9"
     end
   end
 end

data/lib/jekyll/task/i18n.rb

@@ -120,7 +120,6 @@ module Jekyll
               else
                 msginit("--input", path.source_pot_file.to_s,
                         "--locale", locale,
-                        "--no-wrap",
                         "--output", path.edit_po_file.to_s)
               end
             end
@@ -190,8 +189,8 @@ module Jekyll
 
           CLEAN << path.time_stamp_file.to_s if path.time_stamp_file.exist?
           file po_file => [path.edit_po_file.to_s] do
-            msgcat("--no-all-comments",
-                   "--no-fuzzy",
+            msgcat("--no-fuzzy",
+                   "--no-location",
                    "--no-obsolete-entries",
                    "--no-report-warning",
                    "--no-wrap",
@@ -199,6 +198,21 @@ module Jekyll
                    "--remove-header-field=POT-Creation-Date",
                    "--sort-by-file",
                    path.edit_po_file.to_s)
+            mv(po_file, path.tmp_po_file.to_s)
+            begin
+              # GNU msgcat
+              sh("msgcat",
+                 "--output", po_file,
+                 path.tmp_po_file.to_s)
+            rescue => error
+              if error.message.start_with?("Command failed with status")
+                mv(path.tmp_po_file.to_s, po_file)
+              else
+                raise
+              end
+            else
+              rm(path.tmp_po_file.to_s)
+            end
             touch(path.time_stamp_file.to_s)
           end
         end
@@ -354,6 +368,10 @@ module Jekyll
           po_dir + "#{target_file_base}.edit.po"
         end
 
+        def tmp_po_file
+          po_dir + "#{target_file_base}.tmp.po"
+        end
+
         def pot_file
           po_dir + "#{target_file_base}.pot"
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-task-i18n
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.9
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-13 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext