haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use localized error message. Update strings for puppet provisioner errors.

This commit is contained in:
Ben Hines 2015-04-12 01:25:40 -07:00
parent 7a4e7929f8
commit cff7c52716
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/provisioners/puppet/config/puppet.rb
View File

@ -117,8 +117,8 @@ module VagrantPlugins
# Calculate the manifests and module paths based on env
this_expanded_module_paths = expanded_module_paths(machine.env.root_path)
if environment_path != UNSET_VALUE && manifests_path != UNSET_VALUE
errors << "You may not specify both environment_path and manifests_path. Please specify environment and environment_path only"
if environment_path != nil && manifests_path != nil
errors << I18n.t("vagrant.provisioners.puppet.environment_manifest_conflict")
end
# Manifests path/file validation

13
templates/locales/en.yml
View File

@ -1859,16 +1859,15 @@ en:
%{manifest}
environment_missing: |-
The configured Puppet environment folder '%{environment}' was not found in the
The configured Puppet environment folder %{environment} was not found in the
specified environmentpath %{environmentpath}.
Please specify a path to an existing Puppet directory environment.
environment_path_missing: "The environment path specified for Puppet does not exist: %{path}"
manifests_path_missing: "The manifests path specified for Puppet does not exist: %{path}"
manifest_missing: |-
The configured Puppet envrionment is missing. Please specify a path to an
existing envrionment file:
%{environment}
manifests_path_missing: "The environment path specified for Puppet does not exist: %{path}"
environment_manifest_conflict: |-
You may not specify both environment_path and manifests_path.
Please specify environment and environment_path without manifests_path, or
manifests_path without environment_path (deprecated).
missing_shared_folders: |-
Shared folders that Puppet requires are missing on the virtual machine.
This is usually due to configuration changing after already booting the