puppet 5.3.3 → 5.3.4

data/lib/puppet/gettext/module_translations.rb

@@ -0,0 +1,42 @@
+require 'puppet/gettext/config'
+
+module Puppet::ModuleTranslations
+
+  # @api private
+  # Loads translation files for each of the specified modules,
+  # if present. Requires the modules to have `forge_name` specified.
+  # @param [[Module]] modules a list of modules for which to
+  #        load translations
+  def self.load_from_modulepath(modules)
+    modules.each do |mod|
+      next unless mod.forge_name && mod.has_translations?(Puppet::GettextConfig.current_locale)
+
+      module_name = mod.forge_name.gsub('/', '-')
+      if Puppet::GettextConfig.load_translations(module_name, mod.locale_directory, :po)
+        Puppet.debug "Loaded translations for #{module_name}."
+      elsif Puppet::GettextConfig.gettext_loaded?
+        Puppet.debug "Could not find translation files for #{module_name} at #{mod.locale_directory}. Skipping translation initialization."
+      else
+        Puppet.warn_once("gettext_unavailable", "gettext_unavailable", "No gettext library found, skipping translation initialization.")
+      end
+    end
+  end
+
+  # @api private
+  # Loads translation files that have been pluginsync'd for modules
+  # from the $vardir.
+  # @param [String] vardir the path to Puppet's vardir
+  def self.load_from_vardir(vardir)
+    locale = Puppet::GettextConfig.current_locale
+    Dir.glob("#{vardir}/locales/#{locale}/*.po") do |f|
+      module_name = File.basename(f, ".po")
+      if Puppet::GettextConfig.load_translations(module_name, File.join(vardir, "locales"), :po)
+        Puppet.debug "Loaded translations for #{module_name}."
+      elsif Puppet::GettextConfig.gettext_loaded?
+        Puppet.debug "Could not load translations for #{module_name}."
+      else
+        Puppet.warn_once("gettext_unavailable", "gettext_unavailable", "No gettext library found, skipping translation initialization.")
+      end
+    end
+  end
+end

data/lib/puppet/graph/relationship_graph.rb

@@ -70,7 +70,7 @@ class Puppet::Graph::RelationshipGraph < Puppet::Graph::SimpleGraph
     if @blockers[resource] > 0
       @blockers[resource] -= 1
     else
-      resource.warning "appears to have a negative number of dependencies"
+      resource.warning _("appears to have a negative number of dependencies")
     end
     @blockers[resource] <= 0
   end

data/lib/puppet/graph/simple_graph.rb

@@ -229,17 +229,17 @@ class Puppet::Graph::SimpleGraph
     return if number_of_cycles == 0
 
     message = n_("Found %{num} dependency cycle:\n", "Found %{num} dependency cycles:\n", number_of_cycles) % { num: number_of_cycles }
+
     cycles.each do |cycle|
       paths = paths_in_cycle(cycle)
-      message += paths.map{ |path| '(' + path.join(" => ") + ')'}.join("\n") + "\n"
+      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}.") % { filename: filename }
     else
-      #TRANSLATORS "graph" refers to a command line option and should not be translated
-      #TRANSLATORS OmniGraffle and GraphViz and program names and should not be translated
+      #TRANSLATORS '--graph' refers to a command line option and OmniGraffle and GraphViz are program names and should not be translated
       message += _("Try the '--graph' option and opening the resulting '.dot' file in OmniGraffle or GraphViz")
     end
     Puppet.err(message)

data/lib/puppet/indirector/catalog/compiler.rb

@@ -49,6 +49,8 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
     node = node_from_request(facts, request)
     node.trusted_data = Puppet.lookup(:trusted_information) { Puppet::Context::TrustedInformation.local(node) }.to_h
 
+    node.environment.use_text_domain if node.environment
+
     if catalog = compile(node, request.options)
       return catalog
     else
@@ -89,7 +91,7 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
     elsif format == 'application/json'
       return Puppet::Node::Facts.convert_from('json', CGI.unescape(facts))
     else
-      raise ArgumentError, "Unsupported facts format"
+      raise ArgumentError, _("Unsupported facts format")
     end
   end
 
@@ -275,24 +277,31 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
       raise Puppet::Error, _("Unable to find a common checksum type between agent '%{agent_type}' and master '%{master_type}'.") % { agent_type: options[:checksum_type], master_type: known_checksum_types } unless checksum_type
     end
 
-    str = if checksum_type
-            if node.environment
-              _("Compiled static catalog for %{node} in environment %{environment}") % { node: node.name, environment: node.environment }
-            else
-              _("Compiled static catalog for %{node}") % { node: node.name }
-            end
-          else
-            if node.environment
-              _("Compiled catalog for %{node} in environment %{environment}") % { node: node.name, environment: node.environment }
-            else
-              _("Compiled catalog for %{node}") % { node: node.name }
-            end
-          end
+    escaped_node_name = node.name.gsub(/%/, '%%')
+    if checksum_type
+      if node.environment
+        escaped_node_environment = node.environment.to_s.gsub(/%/, '%%')
+        benchmark_str = _("Compiled static catalog for %{node} in environment %{environment} in %%{seconds} seconds") % { node: escaped_node_name, environment: escaped_node_environment }
+        profile_str   = _("Compiled static catalog for %{node} in environment %{environment}") % { node: node.name, environment: node.environment }
+      else
+        benchmark_str = _("Compiled static catalog for %{node} in %%{seconds} seconds") % { node: escaped_node_name }
+        profile_str   = _("Compiled static catalog for %{node}") % { node: node.name }
+      end
+    else
+      if node.environment
+        escaped_node_environment = node.environment.to_s.gsub(/%/, '%%')
+        benchmark_str = _("Compiled catalog for %{node} in environment %{environment} in %%{seconds} seconds") % { node: escaped_node_name, environment: escaped_node_environment }
+        profile_str   = _("Compiled catalog for %{node} in environment %{environment}") % { node: node.name, environment: node.environment }
+      else
+        benchmark_str = _("Compiled catalog for %{node} in %%{seconds} seconds") % { node: escaped_node_name }
+        profile_str   = _("Compiled catalog for %{node}") % { node: node.name }
+      end
+    end
     config = nil
 
-    benchmark(:notice, str) do
+    benchmark(:notice, benchmark_str) do
       compile_type = checksum_type ? :static_compile : :compile
-      Puppet::Util::Profiler.profile(str, [:compiler, compile_type, node.environment, node.name]) do
+      Puppet::Util::Profiler.profile(profile_str, [:compiler, compile_type, node.environment, node.name]) do
         begin
           config = Puppet::Parser::Compiler.compile(node, options[:code_id])
         rescue Puppet::Error => detail
@@ -303,15 +312,21 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
         end
 
         if checksum_type && config.is_a?(model)
-          str = if node.environment
-                  #TRANSLATORS Inlined refers to adding additional metadata
-                  _("Inlined resource metadata into static catalog for %{node} in environment %{environment}") % { node: node.name, environment: node.environment }
-                else
-                  #TRANSLATORS Inlined refers to adding additional metadata
-                  _("Inlined resource metadata into static catalog for %{node}") % { node: node.name }
-                end
-          benchmark(:notice, str) do
-            Puppet::Util::Profiler.profile(str, [:compiler, :static_compile_postprocessing, node.environment, node.name]) do
+          escaped_node_name = node.name.gsub(/%/, '%%')
+          if node.environment
+            escaped_node_environment = node.environment.to_s.gsub(/%/, '%%')
+            #TRANSLATORS Inlined refers to adding additional metadata
+            benchmark_str = _("Inlined resource metadata into static catalog for %{node} in environment %{environment} in %%{seconds} seconds") % { node: escaped_node_name, environment: escaped_node_environment }
+            #TRANSLATORS Inlined refers to adding additional metadata
+            profile_str   = _("Inlined resource metadata into static catalog for %{node} in environment %{environment}") % { node: node.name, environment: node.environment }
+          else
+            #TRANSLATORS Inlined refers to adding additional metadata
+            benchmark_str = _("Inlined resource metadata into static catalog for %{node} in %%{seconds} seconds") % { node: escaped_node_name }
+            #TRANSLATORS Inlined refers to adding additional metadata
+            profile_str   = _("Inlined resource metadata into static catalog for %{node}") % { node: node.name }
+          end
+          benchmark(:notice, benchmark_str) do
+            Puppet::Util::Profiler.profile(profile_str, [:compiler, :static_compile_postprocessing, node.environment, node.name]) do
               inline_metadata(config, checksum_type)
             end
           end

data/lib/puppet/indirector/exec.rb

@@ -8,7 +8,7 @@ class Puppet::Indirector::Exec < Puppet::Indirector::Terminus
     external_command = command
 
     # Make sure it's an array
-    raise Puppet::DevError, "Exec commands must be an array" unless external_command.is_a?(Array)
+    raise Puppet::DevError, _("Exec commands must be an array") unless external_command.is_a?(Array)
 
     # Make sure it's fully qualified.
     raise ArgumentError, _("You must set the exec parameter to a fully qualified command") unless Puppet::Util.absolute_path?(external_command[0])

data/lib/puppet/indirector/facts/facter.rb

@@ -11,11 +11,11 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
   end
 
   def destroy(facts)
-    raise Puppet::DevError, 'You cannot destroy facts in the code store; it is only used for getting facts from Facter'
+    raise Puppet::DevError, _('You cannot destroy facts in the code store; it is only used for getting facts from Facter')
   end
 
   def save(facts)
-    raise Puppet::DevError, 'You cannot save facts to the code store; it is only used for getting facts from Facter'
+    raise Puppet::DevError, _('You cannot save facts to the code store; it is only used for getting facts from Facter')
   end
 
   # Lookup a host's facts up in Facter.
@@ -55,7 +55,7 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
       # print out each .rb in the facts directory as module
       # developers may find that information useful for debugging purposes
       if Puppet::Util::Log.sendlevel?(:info)
-        Puppet.info "Loading facts"
+        Puppet.info _("Loading facts")
         Dir.glob("#{dir}/*.rb").each do |file|
           Puppet.debug "Loading facts from #{file}"
         end

data/lib/puppet/indirector/facts/network_device.rb

@@ -18,10 +18,10 @@ class Puppet::Node::Facts::NetworkDevice < Puppet::Indirector::Code
   end
 
   def destroy(facts)
-    raise Puppet::DevError, "You cannot destroy facts in the code store; it is only used for getting facts from a remote device"
+    raise Puppet::DevError, _("You cannot destroy facts in the code store; it is only used for getting facts from a remote device")
   end
 
   def save(facts)
-    raise Puppet::DevError, "You cannot save facts to the code store; it is only used for getting facts from a remote device"
+    raise Puppet::DevError, _("You cannot save facts to the code store; it is only used for getting facts from a remote device")
   end
 end

data/lib/puppet/indirector/file_bucket_file/file.rb

@@ -29,6 +29,7 @@ module Puppet::FileBucketFile
           raise _("Unable to diff on this platform") unless Puppet[:diff] != ""
           return diff(Puppet::FileSystem.path_string(contents_file), Puppet::FileSystem.path_string(other_contents_file))
         else
+          #TRANSLATORS "FileBucket" should not be translated
           Puppet.info _("FileBucket read %{checksum}") % { checksum: checksum }
           model.new(Puppet::FileSystem.binread(contents_file))
         end
@@ -158,7 +159,8 @@ module Puppet::FileBucketFile
         Puppet::FileSystem.exclusive_open(paths_file, 0640, 'a+:external') do |f|
           if Puppet::FileSystem.exist?(contents_file)
             if verify_identical_file(contents_file, bucket_file)
-              Puppet.info "FileBucket got a duplicate file #{bucket_file.checksum}"
+              #TRANSLATORS "FileBucket" should not be translated
+              Puppet.info _("FileBucket got a duplicate file %{file_checksum}") % { file_checksum: bucket_file.checksum }
               Puppet::FileSystem.touch(contents_file)
             elsif contents_file_matches_checksum?(contents_file, bucket_file.checksum_data, bucket_file.checksum_type)
               # If the contents or sizes don't match, but the checksum does,
@@ -167,6 +169,7 @@ module Puppet::FileBucketFile
               # needed, but ask the user to validate.
               # Note: Don't print the full path to the bucket file in the
               # exception to avoid disclosing file system layout on server.
+              #TRANSLATORS "FileBucket" should not be translated
               Puppet.err(_("Unable to verify existing FileBucket backup at '%{path}'.") % { path: contents_file.to_path })
               raise Puppet::FileBucket::BucketError, _("Existing backup and new file have different content but same checksum, %{value}. Verify existing backup and remove if incorrect.") %
                 { value: bucket_file.checksum }

data/lib/puppet/indirector/indirection.rb

@@ -37,7 +37,7 @@ class Puppet::Indirector::Indirection
 
   # Create and return our cache terminus.
   def cache
-    raise(Puppet::DevError, "Tried to cache when no cache class was set") unless cache_class
+    raise Puppet::DevError, _("Tried to cache when no cache class was set") unless cache_class
     terminus(cache_class)
   end
 
@@ -97,7 +97,7 @@ class Puppet::Indirector::Indirection
     @cache_class = nil
     @terminus_class = nil
 
-    raise(ArgumentError, "Indirection #{@name} is already defined") if @@indirections.find { |i| i.name == @name }
+    raise(ArgumentError, _("Indirection %{name} is already defined") % { name: @name }) if @@indirections.find { |i| i.name == @name }
     @@indirections << self
 
     @indirected_class = options.delete(:indirected_class)
@@ -118,7 +118,7 @@ class Puppet::Indirector::Indirection
   # Return the singleton terminus for this indirection.
   def terminus(terminus_name = nil)
     # Get the name of the terminus.
-    raise Puppet::DevError, "No terminus specified for #{self.name}; cannot redirect" unless terminus_name ||= terminus_class
+    raise Puppet::DevError, _("No terminus specified for %{name}; cannot redirect") % { name: self.name } unless terminus_name ||= terminus_class
 
     termini[terminus_name] ||= make_terminus(terminus_name)
   end
@@ -132,7 +132,7 @@ class Puppet::Indirector::Indirection
       if setting = self.terminus_setting
         self.terminus_class = Puppet.settings[setting]
       else
-        raise Puppet::DevError, "No terminus class nor terminus setting was provided for indirection #{self.name}"
+        raise Puppet::DevError, _("No terminus class nor terminus setting was provided for indirection %{name}") % { name: self.name}
       end
     end
     @terminus_class
@@ -150,9 +150,12 @@ class Puppet::Indirector::Indirection
 
   # This is used by terminus_class= and cache=.
   def validate_terminus_class(terminus_class)
-    raise ArgumentError, "Invalid terminus name #{terminus_class.inspect}" unless terminus_class and terminus_class.to_s != ""
+    unless terminus_class and terminus_class.to_s != ""
+      raise ArgumentError, _("Invalid terminus name %{terminus_class}") % { terminus_class: terminus_class.inspect }
+    end
     unless Puppet::Indirector::Terminus.terminus_class(self.name, terminus_class)
-      raise ArgumentError, "Could not find terminus #{terminus_class} for indirection #{self.name}"
+      raise ArgumentError, _("Could not find terminus %{terminus_class} for indirection %{name}") %
+          { terminus_class: terminus_class, name: self.name }
     end
   end
 
@@ -268,7 +271,7 @@ class Puppet::Indirector::Indirection
     terminus = prepare(request)
 
     if result = terminus.search(request)
-      raise Puppet::DevError, "Search results from terminus #{terminus.name} are not an array" unless result.is_a?(Array)
+      raise Puppet::DevError, _("Search results from terminus %{terminus_name} are not an array") % { terminus_name: terminus.name } unless result.is_a?(Array)
       result.each do |instance|
         next unless instance.respond_to? :expiration
         instance.expiration ||= self.expiration
@@ -304,8 +307,13 @@ class Puppet::Indirector::Indirection
     return unless terminus.respond_to?(:authorized?)
 
     unless terminus.authorized?(request)
-      msg = "Not authorized to call #{request.method} on #{request.description}"
-      msg += " with #{request.options.inspect}" unless request.options.empty?
+      msg = if request.options.empty?
+              _("Not authorized to call %{method} on %{description}") %
+                  { method: request.method, description: request.description }
+            else
+              _("Not authorized to call %{method} on %{description} with %{option}") %
+                  { method: request.method, description: request.description, option: request.options.inspect }
+            end
       raise ArgumentError, msg
     end
   end

data/lib/puppet/indirector/ldap.rb

@@ -10,7 +10,7 @@ class Puppet::Indirector::Ldap < Puppet::Indirector::Terminus
   # Process the found entry.  We assume that we don't just want the
   # ldap object.
   def process(entry)
-    raise Puppet::DevError, "The 'process' method has not been overridden for the LDAP terminus for #{self.name}"
+    raise Puppet::DevError, _("The 'process' method has not been overridden for the LDAP terminus for %{name}") % { name: self.name }
   end
 
   # Default to all attributes.
@@ -24,7 +24,7 @@ class Puppet::Indirector::Ldap < Puppet::Indirector::Terminus
 
   # The ldap search filter to use.
   def search_filter(name)
-    raise Puppet::DevError, "No search string set for LDAP terminus for #{self.name}"
+    raise Puppet::DevError, _("No search string set for LDAP terminus for %{name}") % { name: self.name }
   end
 
   # Find the ldap node, return the class list and parent node specially,

data/lib/puppet/indirector/node/write_only_yaml.rb

@@ -12,7 +12,9 @@ require 'puppet/indirector/yaml'
 #
 class Puppet::Node::WriteOnlyYaml < Puppet::Indirector::Yaml
   def initialize
-    Puppet.warn_once('deprecations', 'Puppet::Node::WriteOnlyYaml', _('Puppet::Node::WriteOnlyYaml is deprecated and will be removed in a future release of Puppet.'))
+    #TRANSLATORS 'Puppet::Node::WriteOnlyYaml' is a class and should not be translated
+    message = _('Puppet::Node::WriteOnlyYaml is deprecated and will be removed in a future release of Puppet.')
+    Puppet.warn_once('deprecations', 'Puppet::Node::WriteOnlyYaml', message)
     super
   end
 

data/lib/puppet/indirector/rest.rb

@@ -262,11 +262,14 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
 
   def handle_response(request, response)
     server_version = response[Puppet::Network::HTTP::HEADER_PUPPET_VERSION]
-    if server_version &&
-       SemanticPuppet::Version.parse(server_version).major < MAJOR_VERSION_JSON_DEFAULT &&
-       Puppet[:preferred_serialization_format] != 'pson'
-      Puppet.warning("Downgrading to PSON for future requests")
-      Puppet[:preferred_serialization_format] = 'pson'
+    if server_version
+      Puppet.push_context({:server_agent_version => server_version})
+      if SemanticPuppet::Version.parse(server_version).major < MAJOR_VERSION_JSON_DEFAULT &&
+          Puppet[:preferred_serialization_format] != 'pson'
+        #TRANSLATORS "PSON" should not be translated
+        Puppet.warning(_("Downgrading to PSON for future requests"))
+        Puppet[:preferred_serialization_format] = 'pson'
+      end
     end
   end
 

data/lib/puppet/indirector/ssl_file.rb

@@ -49,7 +49,7 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
   def initialize
     Puppet.settings.use(:main, :ssl)
 
-    (collection_directory || file_location) or raise Puppet::DevError, "No file or directory setting provided; terminus #{self.class.name} cannot function"
+    (collection_directory || file_location) or raise Puppet::DevError, _("No file or directory setting provided; terminus %{class_name} cannot function") % { class_name: self.class.name }
   end
 
   def path(name)
@@ -190,7 +190,7 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
         raise Puppet::Error, _("Could not write %{path} to %{setting}: %{detail}") % { path: path, setting: setting, detail: detail }, detail.backtrace
       end
     else
-      raise Puppet::DevError, "You must provide a setting to determine where the files are stored"
+      raise Puppet::DevError, _("You must provide a setting to determine where the files are stored")
     end
   end
 end

data/lib/puppet/indirector/terminus.rb

@@ -46,7 +46,7 @@ class Puppet::Indirector::Terminus
     def inherited(subclass)
       longname = subclass.to_s
       if longname =~ /#<Class/
-        raise Puppet::DevError, "Terminus subclasses must have associated constants"
+        raise Puppet::DevError, _("Terminus subclasses must have associated constants")
       end
       names = longname.split("::")
 
@@ -71,7 +71,7 @@ class Puppet::Indirector::Terminus
       processed_name = names.pop.sub(/^[A-Z]/) { |i| i.downcase }.gsub(/[A-Z]/) { |i| "_#{i.downcase}" }
 
       if processed_name.empty?
-        raise Puppet::DevError, "Could not discern indirection model from class constant"
+        raise Puppet::DevError, _("Could not discern indirection model from class constant")
       end
 
       # This will throw an exception if the indirection instance cannot be found.
@@ -129,7 +129,7 @@ class Puppet::Indirector::Terminus
   end
 
   def initialize
-    raise Puppet::DevError, "Cannot create instances of abstract terminus types" if self.class.abstract_terminus?
+    raise Puppet::DevError, _("Cannot create instances of abstract terminus types") if self.class.abstract_terminus?
   end
 
   def model

data/lib/puppet/interface.rb

@@ -149,7 +149,7 @@ class Puppet::Interface
   # @api private
   def initialize(name, version, &block)
     unless SemanticPuppet::Version.valid?(version)
-      raise ArgumentError, "Cannot create face #{name.inspect} with invalid version number '#{version}'!"
+      raise ArgumentError, _("Cannot create face %{name} with invalid version number '%{version}'!") % { name: name.inspect, version: version }
     end
 
     @name    = Puppet::Interface::FaceCollection.underscorize(name)
@@ -178,6 +178,7 @@ class Puppet::Interface
   def to_s
     "Puppet::Face[#{name.inspect}, #{version.inspect}]"
   end
+  alias_method :inspect, :to_s
 
   # @return [void]
   def deprecate

data/lib/puppet/interface/action.rb

@@ -78,7 +78,7 @@ class Puppet::Interface::Action
   # @api private
   def when_rendering(type)
     unless type.is_a? Symbol
-      raise ArgumentError, "The rendering format must be a symbol, not #{type.class.name}"
+      raise ArgumentError, _("The rendering format must be a symbol, not %{class_name}") % { class_name: type.class.name }
     end
     # Do we have a rendering hook for this name?
     return @when_rendering[type].bind(@face) if @when_rendering.has_key? type
@@ -94,28 +94,38 @@ class Puppet::Interface::Action
   # @api private
   def set_rendering_method_for(type, proc)
     unless proc.is_a? Proc
-      msg = "The second argument to set_rendering_method_for must be a Proc"
-      msg += ", not #{proc.class.name}" unless proc.nil?
+      msg = if proc.nil?
+              #TRANSLATORS 'set_rendering_method_for' and 'Proc' should not be translated
+              _("The second argument to set_rendering_method_for must be a Proc")
+            else
+              #TRANSLATORS 'set_rendering_method_for' and 'Proc' should not be translated
+              _("The second argument to set_rendering_method_for must be a Proc, not %{class_name}") %
+                  { class_name: proc.class.name }
+            end
       raise ArgumentError, msg
     end
 
     if proc.arity != 1 and proc.arity != (@positional_arg_count + 1)
-      msg =  "the when_rendering method for the #{@face.name} face #{name} action "
-      msg += "takes either just one argument, the result of when_invoked, "
-      msg += "or the result plus the #{@positional_arg_count} arguments passed "
-      msg += "to the when_invoked block, not "
-      if proc.arity < 0 then
-        msg += "a variable number"
-      else
-        msg += proc.arity.to_s
-      end
+      msg = if proc.arity < 0 then
+              #TRANSLATORS 'when_rendering', 'when_invoked' are method names and should not be translated
+              _("The when_rendering method for the %{face} face %{name} action takes either just one argument,"\
+                  " the result of when_invoked, or the result plus the %{arg_count} arguments passed to the"\
+                  " when_invoked block, not a variable number") %
+                  { face: @face.name, name: name, arg_count: @positional_arg_count }
+            else
+              #TRANSLATORS 'when_rendering', 'when_invoked' are method names and should not be translated
+              _("The when_rendering method for the %{face} face %{name} action takes either just one argument,"\
+                  " the result of when_invoked, or the result plus the %{arg_count} arguments passed to the"\
+                  " when_invoked block, not %{string}") %
+                  { face: @face.name, name: name, arg_count: @positional_arg_count, string: proc.arity.to_s }
+            end
       raise ArgumentError, msg
     end
     unless type.is_a? Symbol
-      raise ArgumentError, "The rendering format must be a symbol, not #{type.class.name}"
+      raise ArgumentError, _("The rendering format must be a symbol, not %{class_name}") % { class_name: type.class.name }
     end
     if @when_rendering.has_key? type then
-      raise ArgumentError, "You can't define a rendering method for #{type} twice"
+      raise ArgumentError, _("You can't define a rendering method for %{type} twice") % { type: type }
     end
     # Now, the ugly bit.  We add the method to our interface object, and
     # retrieve it, to rotate through the dance of getting a suitable method
@@ -213,7 +223,8 @@ class Puppet::Interface::Action
       # but will on 1.9.2, which treats it as "no arguments".  Which bites,
       # because this just begs for us to wind up in the horrible situation
       # where a 1.8 vs 1.9 error bites our end users. --daniel 2011-04-19
-      raise ArgumentError, "when_invoked requires at least one argument (options) for action #{@name}"
+      #TRANSLATORS 'when_invoked' should not be translated
+      raise ArgumentError, _("when_invoked requires at least one argument (options) for action %{name}") % { name: @name }
     elsif arity > 0 then
       range = Range.new(1, arity - 1)
       decl = range.map { |x| "arg#{x}" } << "options = {}"
@@ -259,9 +270,11 @@ WRAPPER
   def add_option(option)
     option.aliases.each do |name|
       if conflict = get_option(name) then
-        raise ArgumentError, "Option #{option} conflicts with existing option #{conflict}"
+        raise ArgumentError, _("Option %{option} conflicts with existing option %{conflict}") %
+            { option: option, conflict: conflict }
       elsif conflict = @face.get_option(name) then
-        raise ArgumentError, "Option #{option} conflicts with existing option #{conflict} on #{@face}"
+        raise ArgumentError, _("Option %{option} conflicts with existing option %{conflict} on %{face}") %
+            { option: option, conflict: conflict, face: @face }
       end
     end
 
@@ -285,7 +298,10 @@ WRAPPER
   def add_display_global_options(*args)
     @display_global_options ||= []
     [args].flatten.each do |refopt|
-      raise ArgumentError, "Global option #{refopt} does not exist in Puppet.settings" unless Puppet.settings.include? refopt
+      unless Puppet.settings.include? refopt
+        #TRANSLATORS 'Puppet.settings' should not be translated
+        raise ArgumentError, _("Global option %{option} does not exist in Puppet.settings") % { option: refopt }
+      end
       @display_global_options << refopt
     end
     @display_global_options.uniq!
@@ -331,13 +347,14 @@ WRAPPER
     end
 
     unless overlap.empty?
-      msg = overlap.map {|k, v| "(#{k}, #{v.sort.join(', ')})" }.join(", ")
-      raise ArgumentError, "Multiple aliases for the same option passed: #{msg}"
+      overlap_list = overlap.map {|k, v| "(#{k}, #{v.sort.join(', ')})" }.join(", ")
+      raise ArgumentError, _("Multiple aliases for the same option passed: %{overlap_list}") %
+          { overlap_list: overlap_list }
     end
 
     unless unknown.empty?
-      msg = unknown.sort.join(", ")
-      raise ArgumentError, "Unknown options passed: #{msg}"
+      unknown_list = unknown.sort.join(", ")
+      raise ArgumentError, _("Unknown options passed: %{unknown_list}") % { unknown_list: unknown_list }
     end
 
     # Inject default arguments and check for missing mandating options.
@@ -354,8 +371,8 @@ WRAPPER
     end
 
     unless missing.empty?
-      msg = missing.sort.join(', ')
-      raise ArgumentError, "The following options are required: #{msg}"
+      missing_list = missing.sort.join(', ')
+      raise ArgumentError, _("The following options are required: %{missing_list}") % { missing_list: missing_list }
     end
 
     # All done.