From 6c892b3832299886c311e4f5c707f9705fae0138 Mon Sep 17 00:00:00 2001 From: Bryan McLellan Date: Fri, 26 Sep 2014 15:27:06 -0400 Subject: Quietly keep locale en_US.UTF-8 on Windows We're not sure if anything cares what we set the locale to this way on Windows. For now we'll leave it as en_US.UTF-8 until we find a use case that indicates we should do something else. --- lib/chef/config.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1