Merge pull request #2122 from opscode/btm/windows-locale

Quietly keep locale en_US.UTF-8 on Windows

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/chef/config.rb b/lib/chef/config.rb
index 74607e8368..107b50ee85 100644
--- a/lib/chef/config.rb
+++ b/lib/chef/config.rb
@@ -619,7 +619,11 @@ class Chef
           'C'
         end
       rescue
-        Chef::Log.warn "No usable locale -a command found, assuming you have en_US.UTF-8 installed."
+        if Chef::Platform.windows?
+          Chef::Log.debug "Defaulting to locale en_US.UTF-8 on Windows, until it matters that we do something else."
+        else
+          Chef::Log.warn "No usable locale -a command found, assuming you have en_US.UTF-8 installed."
+        end
         'en_US.UTF-8'
       end
     end