(PUP-7310) Fix interpolation in externalized strings in graph

lib/puppet/graph/simple_graph.rb

@@ -61,7 +61,7 @@ def matching_edges(event, base = nil)
     source = base || event.resource
 
     unless vertex?(source)
-      Puppet.warning _("Got an event from invalid vertex #{source.ref}")
+      Puppet.warning _("Got an event from invalid vertex %{source}") % { source: source.ref }
       return []
     end
     # Get all of the edges that this vertex should forward events
@@ -146,7 +146,7 @@ def tarjan(root, s)
         frame[:step] = :children
 
       else
-        fail _("#{frame[:step]} is an unknown step")
+        fail "#{frame[:step]} is an unknown step"
       end
     end
   end
@@ -193,6 +193,7 @@ def find_cycles_in_graph
   # through the graph first, which are more likely to be interesting to the
   # user.  I think; it would be interesting to verify that. --daniel 2011-01-23
   def paths_in_cycle(cycle, max_paths = 1)
+    #TRANSLATORS "negative or zero" refers to the count of paths
     raise ArgumentError, _("negative or zero max_paths") if max_paths < 1
 
     # Calculate our filtered outbound vertex lists...
@@ -225,17 +226,18 @@ def report_cycles_in_graph
     return if n == 0
     s = n == 1 ? '' : 's'
 
-    message = _("Found #{n} dependency cycle#{s}:\n")
+    message = n_("Found %{num} dependency cycle:\n", "Found %{num} dependency cycles:\n", n) % { num: n }
     cycles.each do |cycle|
       paths = paths_in_cycle(cycle)
       message += paths.map{ |path| '(' + path.join(" => ") + ')'}.join("\n") + "\n"
     end
 
     if Puppet[:graph] then
       filename = write_cycles_to_graph(cycles)
-      message += _("Cycle graph written to #{filename}.")
+      message += _("Cycle graph written to %{filename}.") % { filename: filename }
     else
       message += _("Try the '--graph' option and opening the ")
+      #TRANSLATORS OmniGraffle and GraphViz and program names and should not be translated
       message += _("resulting '.dot' file in OmniGraffle or GraphViz")
     end