From 8c4a7350fecc1547c343169b75fc8a624e99c976 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 21 Jan 2013 11:35:46 -0600 Subject: [PATCH] vagrant status uses new MachineState results --- plugins/commands/status/command.rb | 6 +++--- plugins/providers/virtualbox/provider.rb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/commands/status/command.rb b/plugins/commands/status/command.rb index 0cc45ceb0..460dd73d2 100644 --- a/plugins/commands/status/command.rb +++ b/plugins/commands/status/command.rb @@ -15,15 +15,15 @@ module VagrantPlugins state = nil results = [] with_target_vms(argv) do |machine| - state = machine.state.to_s if !state - results << "#{machine.name.to_s.ljust(25)}#{machine.state.to_s.gsub("_", " ")}" + state = machine.state if !state + results << "#{machine.name.to_s.ljust(25)}#{machine.state.short_description}" end state = results.length == 1 ? state : "listing" @env.ui.info(I18n.t("vagrant.commands.status.output", :states => results.join("\n"), - :message => I18n.t("vagrant.commands.status.#{state}")), + :message => state.long_description), :prefix => false) # Success, exit status 0 diff --git a/plugins/providers/virtualbox/provider.rb b/plugins/providers/virtualbox/provider.rb index c955af910..1e4bdce45 100644 --- a/plugins/providers/virtualbox/provider.rb +++ b/plugins/providers/virtualbox/provider.rb @@ -71,8 +71,8 @@ module VagrantPlugins state_id = :unknown if !state_id # Translate into short/long descriptions - short = state_id.to_s - long = I18n.t("vagrant.commands.state.#{state_id}") + short = state_id.to_s.gsub("_", " ") + long = I18n.t("vagrant.commands.status.#{state_id}") # Return the state Vagrant::MachineState.new(state_id, short, long)