Merge pull request #2725 from MarcMeszaros/salt-i18n

provisioners/salt: provisioner missing error messages in localization file

plugins/provisioners/salt/config.rb

@@ -91,15 +91,15 @@ module VagrantPlugins
 
         if @master_key && @master_pub
           if !@minion_key && !@minion_pub
-            errors << I18n.t("salt.missing_key")
+            errors << I18n.t("vagrant.provisioners.salt.missing_key")
           end
         end
 
         if @install_master && !@no_minion && !@seed_master && @run_highstate
-          errors << I18n.t("salt.must_accept_keys")
+          errors << I18n.t("vagrant.provisioners.salt.must_accept_keys")
         end
 
-        return {"salt" => errors}
+        return {"salt provisioner" => errors}
       end
 
 

plugins/provisioners/salt/errors.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
   module Salt
     module Errors
       class SaltError < Vagrant::Errors::VagrantError
-        error_namespace("salt")
+        error_namespace("vagrant.provisioners.salt")
       end
     end
   end

templates/locales/en.yml

@@ -1377,3 +1377,9 @@ en:
       docker:
         not_running: "Docker is not running on the guest VM."
         install_failed: "Docker installation failed."
+
+      salt:
+        missing_key: |-
+          You must include both public and private keys.
+        must_accept_keys: |-
+          You must accept keys when running highstate with master!