diff options
| author | Claire McQuin <claire@getchef.com> | 2014-10-13 13:31:26 -0700 |
|---|---|---|
| committer | Claire McQuin <claire@getchef.com> | 2014-10-13 13:36:12 -0700 |
| commit | 6186f4793517311b3c6aade8c8ca0ae1acc6f3e8 (patch) | |
| tree | 9bb25819bf42d9cffbe430e8a5cff352341b9b4e | |
| parent | 473089900f6aad1b12273a904f3a228159c1d1f7 (diff) | |
| download | chef-6186f4793517311b3c6aade8c8ca0ae1acc6f3e8.tar.gz | |
Standardize guessed locale
| -rw-r--r-- | lib/chef/config.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/chef/config.rb b/lib/chef/config.rb index 102fa487df..5213acf866 100644 --- a/lib/chef/config.rb +++ b/lib/chef/config.rb @@ -622,7 +622,10 @@ class Chef 'en.UTF-8' when guesses = locales.select { |l| l =~ /^en_.*UTF-?8$/i } # Will match en_ZZ.UTF-8, en_ZZ.utf-8, en_ZZ.UTF8, en_ZZ.utf8 - guesses.first + guessed_locale = guesses.first + # Transform into the form en_ZZ.UTF-8 + guessed_locale.gsub(/UTF-?8$/i, "UTF-8") + guessed_locale else Chef::Log.warn "Please install an English UTF-8 locale for Chef to use, falling back to C locale and disabling UTF-8 support." 'C' |