ACP2E-1999: translation for show and set config

Author: alzota

app/code/Magento/Config/Console/Command/ConfigSetCommand.php

@@ -9,10 +9,13 @@
 use Magento\Config\App\Config\Type\System;
 use Magento\Config\Console\Command\ConfigSet\ProcessorFacadeFactory;
 use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
-use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Console\Cli;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\RuntimeException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -64,6 +67,11 @@ class ConfigSetCommand extends Command
      */
     private $deploymentConfig;
 
+    /**
+     * @var LocaleEmulatorInterface
+     */
+    private $localeEmulator;
+
     /**
      * @param EmulatedAdminhtmlAreaProcessor $emulatedAreaProcessor Emulator adminhtml area for CLI command
      * @param ChangeDetector $changeDetector The config change detector
@@ -74,12 +82,15 @@ public function __construct(
         EmulatedAdminhtmlAreaProcessor $emulatedAreaProcessor,
         ChangeDetector $changeDetector,
         ProcessorFacadeFactory $processorFacadeFactory,
-        DeploymentConfig $deploymentConfig
+        DeploymentConfig $deploymentConfig,
+        LocaleEmulatorInterface $localeEmulator = null
     ) {
         $this->emulatedAreaProcessor = $emulatedAreaProcessor;
         $this->changeDetector = $changeDetector;
         $this->processorFacadeFactory = $processorFacadeFactory;
         $this->deploymentConfig = $deploymentConfig;
+        $this->localeEmulator = $localeEmulator ??
+            ObjectManager::getInstance()->get(LocaleEmulatorInterface::class);
 
         parent::__construct();
     }
@@ -141,8 +152,10 @@ protected function configure()
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     * @since 101.0.0
      * @return int|null
+     * @throws FileSystemException
+     * @throws RuntimeException
+     * @since 101.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -165,7 +178,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         try {
             $message = $this->emulatedAreaProcessor->process(function () use ($input) {
-
                 $lock = $input->getOption(static::OPTION_LOCK_ENV)
                     || $input->getOption(static::OPTION_LOCK_CONFIG)
                     || $input->getOption(static::OPTION_LOCK);
@@ -189,8 +201,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             return Cli::RETURN_SUCCESS;
         } catch (\Exception $exception) {
-            $output->writeln('<error>' . $exception->getMessage() . '</error>');
-
+            $this->localeEmulator->emulate(
+                fn () => $output->writeln(sprintf('<error>%s</error>', __($exception->getMessage())))
+            );
             return Cli::RETURN_FAILURE;
         }
     }

app/code/Magento/Config/Console/Command/ConfigShowCommand.php

@@ -204,7 +204,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return Cli::RETURN_SUCCESS;
         } catch (\Exception $e) {
             $this->localeEmulator->emulate(
-                fn () => $output->writeln(sprintf('<error>%s</error>', __($e->getMessage()))),
+                fn () => $output->writeln(sprintf('<error>%s</error>', __($e->getMessage())))
             );
             return Cli::RETURN_FAILURE;
         }

app/code/Magento/Config/Console/Command/LocaleEmulator.php

@@ -12,25 +12,52 @@
 use Magento\Framework\Phrase\RendererInterface;
 use Magento\Framework\TranslateInterface;
 
+/**
+ * Locale emulator for import and export
+ */
 class LocaleEmulator implements LocaleEmulatorInterface
 {
     /**
      * @var bool
      */
     private bool $isEmulating = false;
 
+    /**
+     * @var TranslateInterface
+     */
+    private TranslateInterface $translate;
+
+    /**
+     * @var RendererInterface
+     */
+    private RendererInterface $phraseRenderer;
+
+    /**
+     * @var ResolverInterface
+     */
+    private ResolverInterface $localeResolver;
+
+    /**
+     * @var ResolverInterface
+     */
+    private ResolverInterface $defaultLocaleResolver;
+
     /**
      * @param TranslateInterface $translate
      * @param RendererInterface $phraseRenderer
      * @param ResolverInterface $localeResolver
      * @param ResolverInterface $defaultLocaleResolver
      */
     public function __construct(
-        private readonly TranslateInterface $translate,
-        private readonly RendererInterface $phraseRenderer,
-        private readonly ResolverInterface $localeResolver,
-        private readonly ResolverInterface $defaultLocaleResolver,
+        TranslateInterface $translate,
+        RendererInterface $phraseRenderer,
+        ResolverInterface $localeResolver,
+        ResolverInterface $defaultLocaleResolver,
     ) {
+        $this->translate = $translate;
+        $this->phraseRenderer = $phraseRenderer;
+        $this->localeResolver = $localeResolver;
+        $this->defaultLocaleResolver = $defaultLocaleResolver;
     }
 
     /**
@@ -50,14 +77,13 @@ public function emulate(callable $callback, ?string $locale = null): mixed
         $this->translate->setLocale($locale);
         $this->translate->loadData();
         try {
-            $result = $callback();
+            return $callback();
         } finally {
             Phrase::setRenderer($initialPhraseRenderer);
             $this->localeResolver->setLocale($initialLocale);
             $this->translate->setLocale($initialLocale);
             $this->translate->loadData();
             $this->isEmulating = false;
         }
-        return $result;
     }
 }

app/code/Magento/Theme/Plugin/LocaleEmulator.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Theme\Plugin;
 
@@ -41,7 +42,9 @@ public function aroundEmulate(
         try {
             $proceed($callback, $locale);
         } finally {
-            $this->design->setDesignTheme($initialTheme);
+            if ($initialTheme) {
+                $this->design->setDesignTheme($initialTheme);
+            }
         }
     }
 }