yast-rake 0.2.37 → 0.2.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98b02611f30a453046b09d43d2a9475915d3f62ddaa25e86501a8dac1d7c34ac
-  data.tar.gz: 72c1f696a456ea27607324326863ff0ab902e1c02d6852fe91aafa692e267e5a
+  metadata.gz: 18af28aa52d36fae2562ec34077203bf5caf3133e2478bbb148a62cb12fdfa9d
+  data.tar.gz: 6de5e620075e519ab220a18c80c0dc490401e25ed1554a778092505968ac67dd
 SHA512:
-  metadata.gz: 8242f408e27684ee7a5888453f9efef2bb2922d4203dba46529391bb22926a65709ad522d52ce5c641fd74b3932a2d9f24b690e5d8b41193d952602593040833
-  data.tar.gz: 6780d86f72ed7cd3950238d15428a5c0d83e22284ec50e1601151bd8d5ae97a29e0113e46ab45cb1eb58f33bf879c2733d1427f92289688d803b2f9e358c01e2
+  metadata.gz: 5620ca0179a75376946c702286ce5ddec59a5a112da7b0b05b686514f18621ece0c2a77f52cdb2928e1483a149310082ff97725efad3d654b37885da8f9855b3
+  data.tar.gz: d517ffc2098ccbf315132d51dcdc44adbe6dbfb8ba2718c13e7cc3989dc42f59a90c9e06676aec7cb2f359598c20ff883e20955974a2c5d463db1afbd094ff9d

data/VERSION

@@ -1 +1 @@
-0.2.37
+0.2.38

data/lib/tasks/pot.rake

@@ -27,19 +27,36 @@ task :pot do
 end
 
 namespace :check do
+
+  def interpolation_message
+    <<~MSG
+      Note: \#{foo} substitution in translatable strings does
+      not work properly, use
+        _("foo %{bar} baz") % { :bar => bar }
+      or
+        _("foo %s baz") % bar
+    MSG
+  end
+
+  def angle_brackets_message
+    <<~MSG
+      Note: %<foo> placeholder should not be used in translatable strings
+      because GNU Gettext does not support any suitable language format for that,
+      use %{foo} instead.
+    MSG
+  end
+
   # print failed lines and a hint to STDERR
-  def report_pot_errors(lines)
+  def report_pot_errors(lines, message)
+    return if lines.empty?
+
     warn "Failed lines:"
     warn "-" * 30
     warn lines
     warn "-" * 30
-    $stderr.puts
-    warn "Note: \#{foo} substitution in translatable strings does" \
-      " not work properly, use"
-    warn "  _(\"foo %{bar} baz\") % { :bar => bar }"
-    warn "or"
-    warn "  _(\"foo %s baz\") % bar"
-    $stderr.puts
+    warn ""
+    warn message
+    warn ""
   end
 
   # remove gettext keywords and extra quotes
@@ -53,7 +70,9 @@ namespace :check do
   end
 
   desc "Check translatable strings for common mistakes"
-  # depends on the global "pot" task defined above
+  # depends on the global "pot" task defined above,
+  # this scans for the #{} interpolations (do not work in translations)
+  # and %<> (no compatible language format in Gettext)
   task pot: :"rake:pot" do
     Dir["*.pot"].each do |pot|
       puts "Checking #{pot}..."
@@ -61,14 +80,18 @@ namespace :check do
       # remove comments
       lines.reject! { |line| line.match(/^#/) }
       # Ruby substitution present?
-      lines.select! { |line| line.include?("\#{") }
+      interpolations = lines.select { |line| line.include?("\#{") }
+      angle_brackets = lines.select { |line| line.include?("%<") }
+
+      next if interpolations.empty? && angle_brackets.empty?
+
+      clean_pot_lines(interpolations)
+      clean_pot_lines(angle_brackets)
 
-      clean_pot_lines(lines)
+      report_pot_errors(interpolations, interpolation_message)
+      report_pot_errors(angle_brackets, angle_brackets_message)
 
-      if !lines.empty?
-        report_pot_errors(lines)
-        raise "ERROR: Ruby substitution found in a translatable string"
-      end
+      raise "ERROR: Found invalid or unsupported translatable string"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yast-rake
 version: !ruby/object:Gem::Version
-  version: 0.2.37
+  version: 0.2.38
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: packaging_rake_tasks
@@ -86,8 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Rake tasks providing basic work-flow for Yast development