pdk 2.6.1 → 2.7.0

data/lib/pdk/cli/remove.rb

@@ -1,8 +1,8 @@
 module PDK::CLI
   @remove_cmd = @base_cmd.define_command do
     name 'remove'
-    usage _('remove [subcommand] [options]')
-    summary _('Remove or delete information about the PDK or current project.')
+    usage 'remove [subcommand] [options]'
+    summary 'Remove or delete information about the PDK or current project.'
     default_subcommand 'help'
 
     run do |_opts, args, _cmd|

data/lib/pdk/cli/set/config.rb

@@ -12,12 +12,12 @@ module PDK::CLI
       def self.transform_value(type_name, value)
         normalized_name = type_name.downcase.strip
         unless ALLOWED_TYPE_NAMES.include?(normalized_name)
-          raise PDK::CLI::ExitWithError, _('Unknown type %{type_name}. Expected one of %{allowed}') % { type_name: type_name, allowed: pretty_allowed_names }
+          raise PDK::CLI::ExitWithError, 'Unknown type %{type_name}. Expected one of %{allowed}' % { type_name: type_name, allowed: pretty_allowed_names }
         end
 
         # Short circuit string conversions as it's trivial
         if normalized_name == 'string'
-          raise PDK::CLI::ExitWithError, _('An error occured converting \'%{value}\' into a %{type_name}') % { value: value.nil? ? 'nil' : value, type_name: type_name } unless value.is_a?(String)
+          raise PDK::CLI::ExitWithError, 'An error occured converting \'%{value}\' into a %{type_name}' % { value: value.nil? ? 'nil' : value, type_name: type_name } unless value.is_a?(String)
           return value
         end
 
@@ -33,7 +33,7 @@ module PDK::CLI
             value
           end
         rescue ArgumentError, TypeError
-          raise PDK::CLI::ExitWithError, _('An error occured converting \'%{value}\' into a %{type_name}') % { value: value.nil? ? 'nil' : value, type_name: type_name }
+          raise PDK::CLI::ExitWithError, 'An error occured converting \'%{value}\' into a %{type_name}' % { value: value.nil? ? 'nil' : value, type_name: type_name }
         end
       end
 
@@ -70,33 +70,33 @@ module PDK::CLI
         # Transform the value if we need to
         item_value = PDK::CLI::Set::Config.transform_value(opts[:type], item_value) unless opts[:type].nil?
 
-        raise PDK::CLI::ExitWithError, _('Configuration name is required') if item_name.nil?
-        raise PDK::CLI::ExitWithError, _('Configuration value is required. If you wish to remove a value use \'pdk remove config\'') if item_value.nil?
+        raise PDK::CLI::ExitWithError, 'Configuration name is required' if item_name.nil?
+        raise PDK::CLI::ExitWithError, 'Configuration value is required. If you wish to remove a value use \'pdk remove config\'' if item_value.nil?
 
         current_value = PDK.config.get(item_name)
-        raise PDK::CLI::ExitWithError, _("The configuration item '%{name}' can not have a value set.") % { name: item_name } if current_value.is_a?(PDK::Config::Namespace)
+        raise PDK::CLI::ExitWithError, "The configuration item '%{name}' can not have a value set." % { name: item_name } if current_value.is_a?(PDK::Config::Namespace)
 
         # If we're forcing the value, don't do any munging
         unless force
           # Check if the setting already exists
           if current_value.is_a?(Array) && current_value.include?(item_value)
-            PDK.logger.info(_("No changes made to '%{name}' as it already contains value '%{to}'") % { name: item_name, to: item_value })
+            PDK.logger.info("No changes made to '%{name}' as it already contains value '%{to}'" % { name: item_name, to: item_value })
             return 0
           end
         end
 
         new_value = PDK.config.set(item_name, item_value, force: opts[:force])
         if current_value.nil? || force
-          PDK.logger.info(_("Set initial value of '%{name}' to '%{to}'") % { name: item_name, to: new_value })
+          PDK.logger.info("Set initial value of '%{name}' to '%{to}'" % { name: item_name, to: new_value })
         elsif current_value.is_a?(Array)
           # Arrays have a special output format
-          PDK.logger.info(_("Added new value '%{to}' to '%{name}'") % { name: item_name, to: item_value })
+          PDK.logger.info("Added new value '%{to}' to '%{name}'" % { name: item_name, to: item_value })
         else
-          PDK.logger.info(_("Changed existing value of '%{name}' from '%{from}' to '%{to}'") % { name: item_name, from: current_value, to: new_value })
+          PDK.logger.info("Changed existing value of '%{name}' from '%{from}' to '%{to}'" % { name: item_name, from: current_value, to: new_value })
         end
 
         # Same output as `get config`
-        $stdout.puts _('%{name}=%{value}') % { name: item_name, value: PDK.config.get(item_name) }
+        $stdout.puts '%{name}=%{value}' % { name: item_name, value: PDK.config.get(item_name) }
         0
       end
     end
@@ -104,13 +104,13 @@ module PDK::CLI
 
   @set_config_cmd = @set_cmd.define_command do
     name 'config'
-    usage _('config [name] [value]')
-    summary _('Set or update the configuration for <name>')
+    usage 'config [name] [value]'
+    summary 'Set or update the configuration for <name>'
 
-    option :f, :force, _('Force the configuration setting to be overwitten.'), argument: :forbidden
+    option :f, :force, 'Force the configuration setting to be overwitten.', argument: :forbidden
 
-    option :t, :type, _('The type of value to set. Acceptable values: %{values}') % { values: PDK::CLI::Set::Config.pretty_allowed_names }, argument: :required
-    option nil, :as, _('Alias of --type'), argument: :required
+    option :t, :type, 'The type of value to set. Acceptable values: %{values}' % { values: PDK::CLI::Set::Config.pretty_allowed_names }, argument: :required
+    option nil, :as, 'Alias of --type', argument: :required
 
     run do |opts, args, _cmd|
       exit PDK::CLI::Set::Config.run(opts, args)

data/lib/pdk/cli/set.rb

@@ -1,8 +1,8 @@
 module PDK::CLI
   @set_cmd = @base_cmd.define_command do
     name 'set'
-    usage _('set [subcommand] [options]')
-    summary _('Set or update information about the PDK or current project.')
+    usage 'set [subcommand] [options]'
+    summary 'Set or update information about the PDK or current project.'
     default_subcommand 'help'
 
     run do |_opts, args, _cmd|

data/lib/pdk/cli/test/unit.rb

@@ -1,23 +1,23 @@
 module PDK::CLI
   @test_unit_cmd = @test_cmd.define_command do
     name 'unit'
-    usage _('unit [options]')
-    summary _('Run unit tests.')
+    usage 'unit [options]'
+    summary 'Run unit tests.'
 
     PDK::CLI.puppet_version_options(self)
     PDK::CLI.puppet_dev_option(self)
-    flag nil, :list, _('List all available unit test files.')
-    flag nil, :parallel, _('Run unit tests in parallel.')
-    flag :v, :verbose, _('More verbose --list output. Displays a list of examples in each unit test file.')
-    flag :c, 'clean-fixtures', _('Clean up downloaded fixtures after the test run.')
+    flag nil, :list, 'List all available unit test files.'
+    flag nil, :parallel, 'Run unit tests in parallel.'
+    flag :v, :verbose, 'More verbose --list output. Displays a list of examples in each unit test file.'
+    flag :c, 'clean-fixtures', 'Clean up downloaded fixtures after the test run.'
 
-    option nil, :tests, _('Specify a comma-separated list of unit test files to run.'), argument: :required, default: '' do |values|
+    option nil, :tests, 'Specify a comma-separated list of unit test files to run.', argument: :required, default: '' do |values|
       require 'pdk/cli/util/option_validator'
       PDK::CLI::Util::OptionValidator.comma_separated_list?(values)
     end
 
     # TODO
-    # option nil, :runner_options, _("options to pass through to the actual test-runner"), argument: :required
+    # option nil, :runner_options, "options to pass through to the actual test-runner", argument: :required
 
     run do |opts, _args, _cmd|
       require 'pdk/tests/unit'
@@ -27,7 +27,7 @@ module PDK::CLI
       PDK::CLI::Util.validate_puppet_version_opts(opts)
 
       PDK::CLI::Util.ensure_in_module!(
-        message:   _('Unit tests can only be run from inside a valid module directory.'),
+        message:   'Unit tests can only be run from inside a valid module directory.',
         log_level: :info,
       )
 
@@ -49,18 +49,18 @@ module PDK::CLI
         examples = PDK::Test::Unit.list(opts)
 
         if examples.empty?
-          puts _('No unit test files with examples were found.')
+          puts 'No unit test files with examples were found.'
         else
-          puts _('Unit Test Files:')
+          puts 'Unit Test Files:'
           files = examples.map { |example| example[:file_path] }
           files.uniq.each do |file|
-            puts _(file)
+            puts file
 
             next unless opts[:verbose]
 
             file_examples = examples.select { |example| example[:file_path] == file }
             file_examples.each do |file_example|
-              puts _("\t%{id}\t%{description}" % { id: file_example[:id], description: file_example[:full_description] })
+              puts "\t%{id}\t%{description}" % { id: file_example[:id], description: file_example[:full_description] }
             end
           end
         end

data/lib/pdk/cli/test.rb

@@ -1,8 +1,8 @@
 module PDK::CLI
   @test_cmd = @base_cmd.define_command do
     name 'test'
-    usage _('test [subcommand] [options]')
-    summary _('Run tests.')
+    usage 'test [subcommand] [options]'
+    summary 'Run tests.'
     default_subcommand 'help'
   end
   @test_cmd.add_command Cri::Command.new_basic_help

data/lib/pdk/cli/update.rb

@@ -1,11 +1,11 @@
 module PDK::CLI
   @update_cmd = @base_cmd.define_command do
     name 'update'
-    usage _('update [options]')
-    summary _('Update a module that has been created by or converted for use by PDK.')
+    usage 'update [options]'
+    summary 'Update a module that has been created by or converted for use by PDK.'
 
-    flag nil, :noop, _('Do not update the module, just output what would be done.')
-    flag nil, :force, _('Update the module automatically, with no prompts.')
+    flag nil, :noop, 'Do not update the module, just output what would be done.'
+    flag nil, :force, 'Update the module automatically, with no prompts.'
 
     PDK::CLI.template_ref_option(self)
 
@@ -14,31 +14,23 @@ module PDK::CLI
       PDK.context.to_debug_log
 
       unless PDK.context.is_a?(PDK::Context::Module)
-        raise PDK::CLI::ExitWithError, _('`pdk update` can only be run from inside a valid module directory.')
+        raise PDK::CLI::ExitWithError, '`pdk update` can only be run from inside a valid module directory.'
       end
 
-      raise PDK::CLI::ExitWithError, _('This module does not appear to be PDK compatible. To make the module compatible with PDK, run `pdk convert`.') unless PDK::Util.module_pdk_compatible?
+      raise PDK::CLI::ExitWithError, 'This module does not appear to be PDK compatible. To make the module compatible with PDK, run `pdk convert`.' unless PDK::Util.module_pdk_compatible?
 
       if opts[:noop] && opts[:force]
-        raise PDK::CLI::ExitWithError, _('You can not specify --noop and --force when updating a module')
+        raise PDK::CLI::ExitWithError, 'You can not specify --noop and --force when updating a module'
       end
 
       if Gem::Version.new(PDK::VERSION) < Gem::Version.new(PDK::Util.module_pdk_version)
-        PDK.logger.warn _(
-          'This module has been updated to PDK %{module_pdk_version} which ' \
-          'is newer than your PDK version (%{user_pdk_version}), proceed ' \
-          'with caution!',
-        ) % {
-          module_pdk_version: PDK::Util.module_pdk_version,
-          user_pdk_version:   PDK::VERSION,
-        }
+        PDK.logger.warn "This module has been updated to PDK #{PDK::Util.module_pdk_version} which is newer than your PDK version (#{PDK::VERSION}), proceed with caution!"
 
         unless opts[:force]
-          raise PDK::CLI::ExitWithError, _(
-            'Please update your PDK installation and try again. ' \
-            'You may also use the --force flag to override this and ' \
-            'continue at your own risk.',
-          )
+          raise PDK::CLI::ExitWithError,
+                'Please update your PDK installation and try again. ' \
+                'You may also use the --force flag to override this and ' \
+                'continue at your own risk.'
         end
       end
 
@@ -47,15 +39,13 @@ module PDK::CLI
       updater = PDK::Module::Update.new(PDK.context.root_path, opts)
 
       if updater.pinned_to_puppetlabs_template_tag?
-        PDK.logger.info _(
-          'This module is currently pinned to version %{current_version} ' \
-          'of the default template. If you would like to update your ' \
-          'module to the latest version of the template, please run `pdk ' \
-          'update --template-ref %{new_version}`.',
-        ) % {
-          current_version: updater.template_uri.uri_fragment,
-          new_version:     PDK::TEMPLATE_REF,
-        }
+        PDK.logger.info 'This module is currently pinned to version %{current_version} ' \
+                        'of the default template. If you would like to update your ' \
+                        'module to the latest version of the template, please run `pdk ' \
+                        'update --template-ref %{new_version}`.' % {
+                          current_version: updater.template_uri.uri_fragment,
+                          new_version: PDK::TEMPLATE_REF,
+                        }
       end
 
       updater.run

data/lib/pdk/cli/util/command_redirector.rb

@@ -16,7 +16,7 @@ module PDK
         end
 
         def run
-          @prompt.puts _('Did you mean \'%{command}\'?') % { command: pastel.bold(@command) }
+          @prompt.puts 'Did you mean \'%{command}\'?' % { command: pastel.bold(@command) }
           @prompt.yes?('-->')
         rescue PDK::CLI::Util::Interview::READER::InputInterrupt
           nil

data/lib/pdk/cli/util/interview.rb

@@ -30,17 +30,17 @@ module PDK
           num_questions = @questions.count
           @questions.each do |question_name, question|
             @name = question_name
-            @prompt.print pastel.bold(_('[Q %{current_number}/%{questions_total}]') % { current_number: i, questions_total: num_questions }) + ' '
+            @prompt.print pastel.bold('[Q %{current_number}/%{questions_total}]' % { current_number: i, questions_total: num_questions }) + ' '
             @prompt.puts pastel.bold(question[:question])
             @prompt.puts question[:help] if question.key?(:help)
 
             case question[:type]
             when :yes
-              yes?(_('-->')) do |q|
+              yes?('-->') do |q|
                 q.default(question[:default]) if question.key?(:default)
               end
             when :multi_select
-              multi_select(_('-->'), per_page: question[:choices].count) do |q|
+              multi_select('-->', per_page: question[:choices].count) do |q|
                 q.enum ')'
                 q.default(*question[:default]) if question.key?(:default)
 
@@ -49,7 +49,7 @@ module PDK
                 end
               end
             else
-              ask(_('-->')) do |q|
+              ask('-->') do |q|
                 q.required(question.fetch(:required, false))
 
                 if question.key?(:validate_pattern)

data/lib/pdk/cli/util/option_normalizer.rb

@@ -5,7 +5,7 @@ module PDK
     module Util
       class OptionNormalizer
         def self.comma_separated_list_to_array(list, _options = {})
-          raise _('Error: expected comma separated list') unless OptionValidator.comma_separated_list?(list)
+          raise 'Error: expected comma separated list' unless OptionValidator.comma_separated_list?(list)
           list.split(',').compact
         end
 
@@ -31,7 +31,7 @@ module PDK
             begin
               OptionValidator.enum(format, PDK::Report.formats)
             rescue ArgumentError
-              raise PDK::CLI::ExitWithError, _("'%{name}' is not a valid report format (%{valid})") % {
+              raise PDK::CLI::ExitWithError, "'%{name}' is not a valid report format (%{valid})" % {
                 name:  format,
                 valid: PDK::Report.formats.join(', '),
               }

data/lib/pdk/cli/util/option_validator.rb

@@ -18,7 +18,7 @@ module PDK
           invalid_entries = vals.reject { |e| valid_entries.include?(e) }
 
           unless invalid_entries.empty?
-            raise ArgumentError, _('Error: the following values are invalid: %{invalid_entries}') % { invalid_entries: invalid_entries }
+            raise ArgumentError, 'Error: the following values are invalid: %{invalid_entries}' % { invalid_entries: invalid_entries }
           end
 
           val

data/lib/pdk/cli/util.rb

@@ -23,7 +23,7 @@ module PDK
         return unless PDK::Util.module_root.nil?
         return if opts[:check_module_layout] && PDK::Util.in_module_root?
 
-        message = opts.fetch(:message, _('This command must be run from inside a valid module (no metadata.json found).'))
+        message = opts.fetch(:message, 'This command must be run from inside a valid module (no metadata.json found).')
         raise PDK::CLI::ExitWithError.new(message, opts)
       end
       module_function :ensure_in_module!
@@ -49,7 +49,7 @@ module PDK
         begin
           response = prompt.yes?(question_text) do |q|
             q.default opts[:default] unless opts[:default].nil?
-            q.validate(validator, _('Answer "Y" to continue or "n" to cancel.'))
+            q.validate(validator, 'Answer "Y" to continue or "n" to cancel.')
           end
         rescue PDK::CLI::Util::Interview::READER::InputInterrupt
           PDK.logger.info opts[:cancel_message] if opts[:cancel_message]
@@ -96,22 +96,22 @@ module PDK
 
         # This means the module does not have a pdk-version tag in the metadata.json
         # and will require a pdk convert.
-        raise PDK::CLI::ExitWithError, _('This module is not PDK compatible. Run `pdk convert` to make it compatible with your version of PDK.') if module_pdk_ver.nil?
+        raise PDK::CLI::ExitWithError, 'This module is not PDK compatible. Run `pdk convert` to make it compatible with your version of PDK.' if module_pdk_ver.nil?
 
         # This checks that the version of pdk in the module's metadata is older
         # than 1.3.1, which means the module will need to run pdk convert to the
         # new templates.
         if Gem::Version.new(module_pdk_ver) < Gem::Version.new('1.3.1')
-          PDK.logger.warn _('This module template is out of date. Run `pdk convert` to make it compatible with your version of PDK.')
+          PDK.logger.warn 'This module template is out of date. Run `pdk convert` to make it compatible with your version of PDK.'
         # This checks if the version of the installed PDK is older than the
         # version in the module's metadata, and advises the user to upgrade to
         # their install of PDK.
         elsif Gem::Version.new(PDK::VERSION) < Gem::Version.new(module_pdk_ver)
-          PDK.logger.warn _('This module is compatible with a newer version of PDK. Upgrade your version of PDK to ensure compatibility.')
+          PDK.logger.warn 'This module is compatible with a newer version of PDK. Upgrade your version of PDK to ensure compatibility.'
         # This checks if the version listed in the module's metadata is older
         # than the installed PDK, and advises the user to run pdk update.
         elsif Gem::Version.new(PDK::VERSION) > Gem::Version.new(module_pdk_ver)
-          PDK.logger.warn _('This module is compatible with an older version of PDK. Run `pdk update` to update it to your version of PDK.')
+          PDK.logger.warn 'This module is compatible with an older version of PDK. Run `pdk update` to update it to your version of PDK.'
         end
       end
       module_function :module_version_check
@@ -122,10 +122,9 @@ module PDK
         deprecated_below = Gem::Version.new('5.0.0')
         return unless version < deprecated_below
 
-        deprecated_msg = _(
+        deprecated_msg =
           'Support for Puppet versions older than %{version} is ' \
-          'deprecated and will be removed in a future version of PDK.',
-        ) % { version: deprecated_below.to_s }
+          'deprecated and will be removed in a future version of PDK.' % { version: deprecated_below.to_s }
         PDK.logger.warn(deprecated_msg)
       end
       module_function :check_for_deprecated_puppet
@@ -163,7 +162,7 @@ module PDK
 
         # Notify user of what Ruby version will be used.
         unless logging_disabled
-          PDK.logger.info(_('Using Ruby %{version}') % {
+          PDK.logger.info('Using Ruby %{version}' % {
             version: puppet_env[:ruby_version],
           })
         end
@@ -177,7 +176,7 @@ module PDK
           gemset.each do |gem, version|
             next if version.nil?
 
-            PDK.logger.info(_('Using %{gem} %{version}') % {
+            PDK.logger.info('Using %{gem} %{version}' % {
               gem: gem.to_s.capitalize,
               version: version,
             })
@@ -208,7 +207,7 @@ module PDK
           [puppet_ver_specs, pe_ver_specs].each do |offending|
             next if offending.empty?
 
-            raise PDK::CLI::ExitWithError, _('You cannot specify a %{first} and %{second} at the same time.') % {
+            raise PDK::CLI::ExitWithError, 'You cannot specify a %{first} and %{second} at the same time.' % {
               first: pup_dev_spec,
               second: offending.first,
             }
@@ -220,7 +219,7 @@ module PDK
 
           offending = [pup_ver_spec, pe_ver_specs[0]].sort
 
-          raise PDK::CLI::ExitWithError, _('You cannot specify a %{first} and %{second} at the same time.') % {
+          raise PDK::CLI::ExitWithError, 'You cannot specify a %{first} and %{second} at the same time.' % {
             first: offending[0],
             second: offending[1],
           }
@@ -230,7 +229,7 @@ module PDK
           warning_str = 'Puppet dev flag from command line: "--puppet-dev" '
           warning_str += 'overrides value from environment: "PDK_PUPPET_DEV=true". You should not specify both.'
 
-          PDK.logger.warn(_(warning_str) % {
+          PDK.logger.warn(warning_str % {
             pup_ver_opt: opts[:'puppet-dev'],
             pup_ver_env: PDK::Util::Env['PDK_PUPPET_DEV'],
           })
@@ -238,7 +237,7 @@ module PDK
           warning_str = 'Puppet version option from command line: "--puppet-version=%{pup_ver_opt}" '
           warning_str += 'overrides value from environment: "PDK_PUPPET_VERSION=%{pup_ver_env}". You should not specify both.'
 
-          PDK.logger.warn(_(warning_str) % {
+          PDK.logger.warn(warning_str % {
             pup_ver_opt: opts[:'puppet-version'],
             pup_ver_env: PDK::Util::Env['PDK_PUPPET_VERSION'],
           })
@@ -246,9 +245,9 @@ module PDK
           warning_str = 'Puppet Enterprise version option from command line: "--pe-version=%{pe_ver_opt}" '
           warning_str += 'overrides value from environment: "PDK_PE_VERSION=%{pe_ver_env}". You should not specify both.'
 
-          PDK.logger.warn(_(warning_str) % {
-            pup_ver_opt: opts[:'pe-version'],
-            pup_ver_env: PDK::Util::Env['PDK_PE_VERSION'],
+          PDK.logger.warn(warning_str % {
+            pe_ver_opt: opts[:'pe-version'],
+            pe_ver_env: PDK::Util::Env['PDK_PE_VERSION'],
           })
         end
       end
@@ -256,11 +255,11 @@ module PDK
 
       def validate_template_opts(opts)
         if opts[:'template-ref'] && opts[:'template-url'].nil?
-          raise PDK::CLI::ExitWithError, _('--template-ref requires --template-url to also be specified.')
+          raise PDK::CLI::ExitWithError, '--template-ref requires --template-url to also be specified.'
         end
 
         return unless opts[:'template-url'] && opts[:'template-url'].include?('#')
-        raise PDK::CLI::ExitWithError, _('--template-url may not be used to specify paths containing #\'s.')
+        raise PDK::CLI::ExitWithError, '--template-url may not be used to specify paths containing #\'s.'
       end
       module_function :validate_template_opts
 

data/lib/pdk/cli/validate.rb

@@ -1,22 +1,20 @@
 module PDK::CLI
   @validate_cmd = @base_cmd.define_command do
     name 'validate'
-    usage _('validate [validators] [options] [targets]')
-    summary _('Run static analysis tests.')
-    description _(
-      "Run metadata, YAML, Puppet, Ruby, or Tasks validation.\n\n" \
-      '[validators] is an optional comma-separated list of validators to use. ' \
-      'If not specified, all validators are used. ' \
-      "Note that when using PowerShell, the list of validators must be enclosed in single quotes.\n\n" \
-      '[targets] is an optional space-separated list of files or directories to be validated. ' \
-      'If not specified, validators are run against all applicable files in the module.',
-    )
+    usage 'validate [validators] [options] [targets]'
+    summary 'Run static analysis tests.'
+    description "Run metadata, YAML, Puppet, Ruby, or Tasks validation.\n\n" \
+                '[validators] is an optional comma-separated list of validators to use. ' \
+                'If not specified, all validators are used. ' \
+                "Note that when using PowerShell, the list of validators must be enclosed in single quotes.\n\n" \
+                '[targets] is an optional space-separated list of files or directories to be validated. ' \
+                'If not specified, validators are run against all applicable files in the module.'
 
     PDK::CLI.puppet_version_options(self)
     PDK::CLI.puppet_dev_option(self)
-    flag nil, :list, _('List all available validators.')
-    flag :a, 'auto-correct', _('Automatically correct problems where possible.')
-    flag nil, :parallel, _('Run validations in parallel.')
+    flag nil, :list, 'List all available validators.'
+    flag :a, 'auto-correct', 'Automatically correct problems where possible.'
+    flag nil, :parallel, 'Run validations in parallel.'
 
     run do |opts, args, _cmd|
       # Write the context information to the debug log
@@ -31,13 +29,13 @@ module PDK::CLI
 
       if opts[:list]
         PDK::CLI::Util.analytics_screen_view('validate', opts)
-        PDK.logger.info(_('Available validators: %{validator_names}') % { validator_names: PDK::Validate.validator_names.join(', ') })
+        PDK.logger.info('Available validators: %{validator_names}' % { validator_names: PDK::Validate.validator_names.join(', ') })
         exit 0
       end
 
       PDK::CLI::Util.validate_puppet_version_opts(opts)
       unless PDK.feature_flag?('controlrepo') || PDK.context.is_a?(PDK::Context::Module)
-        raise PDK::CLI::ExitWithError.new(_('Code validation can only be run from inside a valid module directory'), log_level: :error)
+        raise PDK::CLI::ExitWithError.new('Code validation can only be run from inside a valid module directory', log_level: :error)
       end
 
       PDK::CLI::Util.module_version_check if PDK.context.is_a?(PDK::Context::Module)
@@ -58,7 +56,7 @@ module PDK::CLI
 
           vals.reject { |v| PDK::Validate.validator_names.include?(v) }
               .each do |v|
-            PDK.logger.warn(_("Unknown validator '%{v}'. Available validators: %{validators}.") % { v: v, validators: PDK::Validate.validator_names.join(', ') })
+            PDK.logger.warn("Unknown validator '%{v}'. Available validators: %{validators}." % { v: v, validators: PDK::Validate.validator_names.join(', ') })
           end
         else
           # This is a single item. Check if it's a known validator, or otherwise treat it as a target.
@@ -68,11 +66,11 @@ module PDK::CLI
           else
             targets = [args[0]]
             # We now know that no validators were passed, so let the user know we're using all of them by default.
-            PDK.logger.info(_('Running all available validators...'))
+            PDK.logger.info('Running all available validators...')
           end
         end
       else
-        PDK.logger.info(_('Running all available validators...'))
+        PDK.logger.info('Running all available validators...')
       end
       validators_to_run = PDK::Validate.validator_names if validators_to_run.nil?