Re-word Linux RDP error to include `xfreerdp`.

Changed the name of the error LinuxRDesktopNotFound to
LinuxRDPClientNotFound and re-worded error text in
templates/locales/en.yml to include `xfreerdp` when listing supported
RDP clients.
This commit is contained in:
Eric Winkelmann 2015-11-02 23:42:01 -08:00
parent 879977832c
commit e687f81fce
3 changed files with 8 additions and 7 deletions

View File

@ -408,8 +408,8 @@ module Vagrant
error_key(:linux_nfs_mount_failed) error_key(:linux_nfs_mount_failed)
end end
class LinuxRDesktopNotFound < VagrantError class LinuxRDPClientNotFound < VagrantError
error_key(:linux_rdesktop_not_found) error_key(:linux_rdp_client_not_found)
end end
class LocalDataDirectoryNotAccessible < VagrantError class LocalDataDirectoryNotAccessible < VagrantError

View File

@ -13,7 +13,7 @@ module VagrantPlugins
elsif Vagrant::Util::Which.which("rdesktop") elsif Vagrant::Util::Which.which("rdesktop")
"rdesktop" "rdesktop"
else else
raise Vagrant::Errors::LinuxRDesktopNotFound raise Vagrant::Errors::LinuxRDPClientNotFound
end end
args = [] args = []

View File

@ -818,10 +818,11 @@ en:
that the NFS client software is properly installed, and consult any resources that the NFS client software is properly installed, and consult any resources
specific to the linux distro you're using for more information on how to specific to the linux distro you're using for more information on how to
do this. do this.
linux_rdesktop_not_found: |- linux_rdp_client_not_found: |-
The `rdesktop` application was not found. Vagrant requires this An appropriate RDP client was not found. Vagrant requires either
in order to connect via RDP to the Vagrant environment. Please ensure `xfreerdp` or `rdesktop` in order to connect via RDP to the Vagrant
this application is installed and available on the path and try again. environment. Please ensure one of these applications is installed and
available on the path and try again.
machine_action_locked: |- machine_action_locked: |-
An action '%{action}' was attempted on the machine '%{name}', An action '%{action}' was attempted on the machine '%{name}',
but another process is already executing an action on the machine. but another process is already executing an action on the machine.