summaryrefslogtreecommitdiff
path: root/lib/chef/resource/locale.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/chef/resource/locale.rb')
-rw-r--r--lib/chef/resource/locale.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/chef/resource/locale.rb b/lib/chef/resource/locale.rb
index 5e4a63c06b..90377ef93a 100644
--- a/lib/chef/resource/locale.rb
+++ b/lib/chef/resource/locale.rb
@@ -49,7 +49,7 @@ class Chef
property :lc_env, Hash,
description: "A Hash of LC_* env variables in the form of `({ 'LC_ENV_VARIABLE' => 'VALUE' })`.",
- default: lazy { {} },
+ default: {},
coerce: proc { |h|
if h.respond_to?(:keys)
invalid_keys = h.keys - LC_VARIABLES
@@ -97,8 +97,7 @@ class Chef
powershell_exec("Get-WinSystemLocale").result["Name"]
end
- action :update do
- description "Update the system's locale."
+ action :update, description: "Update the system's locale." do
converge_if_changed do
set_system_locale
end
@@ -125,7 +124,7 @@ class Chef
# @raise [Mixlib::ShellOut::ShellCommandFailed] not a supported language or locale
#
def generate_locales
- shell_out!("locale-gen #{unavailable_locales.join(" ")}")
+ shell_out!("locale-gen #{unavailable_locales.join(" ")}", timeout: 1800)
end
# Sets the system locale for the current computer.