Merge pull request #956 from puppetlabs/pdksync_maint/main/release_checks_7_config

[puppet-modules/puppetlabs-apt.git] / manifests / setting.pp

diff --git a/manifests/setting.pp b/manifests/setting.pp
index e743a5c2de80b17202d8546d0d76f16a70535582..16124c31f51a2901986722e5d2a2c484908e0e42 100644 (file)
--- a/manifests/setting.pp
+++ b/manifests/setting.pp
@@ -28,11 +28,11 @@ define apt::setting (
 ) {
 
   if $content and $source {
-    fail('apt::setting cannot have both content and source')
+    fail(translate('apt::setting cannot have both content and source'))
   }
 
   if !$content and !$source {
-    fail('apt::setting needs either of content or source')
+    fail(translate('apt::setting needs either of content or source'))
   }
 
   $title_array = split($title, '-')
@@ -40,13 +40,13 @@ define apt::setting (
   $base_name = join(delete_at($title_array, 0), '-')
 
   assert_type(Pattern[/\Aconf\z/, /\Apref\z/, /\Alist\z/], $setting_type) |$a, $b| {
-    fail("apt::setting resource name/title must start with either 'conf-', 'pref-' or 'list-'")
+    fail(translate("apt::setting resource name/title must start with either 'conf-', 'pref-' or 'list-'"))
   }
 
   if $priority !~ Integer {
     # need this to allow zero-padded priority.
     assert_type(Pattern[/^\d+$/], $priority) |$a, $b| {
-      fail('apt::setting priority must be an integer or a zero-padded integer')
+      fail(translate('apt::setting priority must be an integer or a zero-padded integer'))
     }
   }
 
@@ -69,7 +69,6 @@ define apt::setting (
     ensure  => $ensure,
     owner   => 'root',
     group   => 'root',
-    mode    => '0644',
     content => $content,
     source  => $source,
     notify  => $_notify,