ACP2E-1999: remove hard dependency of theme module from config module; fix unit tests errors; updated module config translations

Author: alzota

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

@@ -11,7 +11,6 @@
 use Magento\Framework\Phrase;
 use Magento\Framework\Phrase\RendererInterface;
 use Magento\Framework\TranslateInterface;
-use Magento\Theme\Model\View\Design;
 
 class LocaleEmulator implements LocaleEmulatorInterface
 {

app/code/Magento/Config/Test/Unit/Console/Command/ConfigShowCommandTest.php

@@ -11,13 +11,14 @@
 use Magento\Config\Console\Command\ConfigShow\ValueProcessor;
 use Magento\Config\Console\Command\ConfigShowCommand;
 use Magento\Config\Console\Command\EmulatedAdminhtmlAreaProcessor;
+use Magento\Config\Console\Command\LocaleEmulatorInterface;
+use Magento\Config\Model\Config\PathValidator;
+use Magento\Config\Model\Config\PathValidatorFactory;
 use Magento\Framework\App\Config\ConfigPathResolver;
 use Magento\Framework\App\Config\ConfigSourceInterface;
 use Magento\Framework\App\Scope\ValidatorInterface;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Config\Model\Config\PathValidatorFactory;
-use Magento\Config\Model\Config\PathValidator;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -68,6 +69,11 @@ class ConfigShowCommandTest extends TestCase
      */
     private $pathValidatorMock;
 
+    /**
+     * @var LocaleEmulatorInterface|MockObject
+     */
+    private $localeEmulatorMock;
+
     /**
      * @inheritdoc
      */
@@ -99,6 +105,9 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->localeEmulatorMock = $this->getMockBuilder(LocaleEmulatorInterface::class)
+            ->getMockForAbstractClass();
+
         $this->model = $objectManager->getObject(
             ConfigShowCommand::class,
             [
@@ -108,6 +117,7 @@ protected function setUp(): void
                 'valueProcessor' => $this->valueProcessorMock,
                 'pathValidatorFactory' => $pathValidatorFactoryMock,
                 'emulatedAreaProcessor' => $this->emulatedAreProcessorMock,
+                'localeEmulator' => $this->localeEmulatorMock
             ]
         );
     }
@@ -175,6 +185,11 @@ public function testNotValidScopeOrScopeCode(): void
             ->willReturnCallback(function ($function) {
                 return $function();
             });
+        $this->localeEmulatorMock->expects($this->once())
+            ->method('emulate')
+            ->willReturnCallback(function ($function) {
+                return $function();
+            });
 
         $tester = $this->getConfigShowCommandTester(
             self::CONFIG_PATH,
@@ -213,6 +228,12 @@ public function testConfigPathNotExist(): void
                 return $function();
             });
 
+        $this->localeEmulatorMock->expects($this->once())
+            ->method('emulate')
+            ->willReturnCallback(function ($function) {
+                return $function();
+            });
+
         $tester = $this->getConfigShowCommandTester(self::CONFIG_PATH);
 
         $this->assertEquals(

app/code/Magento/Config/i18n/en_US.csv

@@ -15,15 +15,14 @@ Add,Add
 Enable,Enable
 Disable,Disable
 Configuration,Configuration
-"Class for type ""%1"" was not declared","Class for type ""%1"" was not declared"
+"The class for ""%1"" type wasn't declared. Enter the class and try again.","The class for ""%1"" type wasn't declared. Enter the class and try again."
 "%1 should implement %2","%1 should implement %2"
-"We can't save this option because Magento is not installed. To lock this value, enter the command again using the --%1 option.","We can't save this option because Magento is not installed. To lock this value, enter the command again using the --%1 option."
 "The value you set has already been locked. To change the value, use the --%1 option.","The value you set has already been locked. To change the value, use the --%1 option."
 %1,%1
-"Configuration for path: ""%1"" doesn't exist","Configuration for path: ""%1"" doesn't exist"
 System,System
 "You saved the configuration.","You saved the configuration."
 "Something went wrong while saving this configuration:","Something went wrong while saving this configuration:"
+"Something went wrong while saving this configuration.","Something went wrong while saving this configuration."
 "Page not found.","Page not found."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"
@@ -37,7 +36,7 @@ System,System
 "We can't save the Cron expression.","We can't save the Cron expression."
 "Sorry, we haven't installed the default display currency you selected.","Sorry, we haven't installed the default display currency you selected."
 "Sorry, the default display currency you selected is not available in allowed currencies.","Sorry, the default display currency you selected is not available in allowed currencies."
-"Please correct the email address: ""%1"".","Please correct the email address: ""%1""."
+"The ""%1"" email address is incorrect. Verify the email address and try again.","The ""%1"" email address is incorrect. Verify the email address and try again."
 "The sender name ""%1"" is not valid. Please use only visible characters and spaces.","The sender name ""%1"" is not valid. Please use only visible characters and spaces."
 "Maximum sender name length is 255. Please correct your settings.","Maximum sender name length is 255. Please correct your settings."
 "The file you're uploading exceeds the server size limit of %1 kilobytes.","The file you're uploading exceeds the server size limit of %1 kilobytes."
@@ -49,9 +48,9 @@ System,System
 "website(%1) scope","website(%1) scope"
 "store(%1) scope","store(%1) scope"
 "Currency ""%1"" is used as %2 in %3.","Currency ""%1"" is used as %2 in %3."
-"Please correct the timezone.","Please correct the timezone."
-"The file ""%1"" does not exist","The file ""%1"" does not exist"
-"The ""%1"" path does not exist","The ""%1"" path does not exist"
+"The time zone is incorrect. Verify the time zone and try again.","The time zone is incorrect. Verify the time zone and try again."
+"The ""%1"" file doesn't exist.","The ""%1"" file doesn't exist."
+"The ""%1"" path doesn't exist. Verify and try again.","The ""%1"" path doesn't exist. Verify and try again."
 "Always (during development)","Always (during development)"
 "Only Once (version upgrade)","Only Once (version upgrade)"
 "Never (production)","Never (production)"
@@ -71,18 +70,21 @@ Store,Store
 "Yes (301 Moved Permanently)","Yes (301 Moved Permanently)"
 Yes,Yes
 Specified,Specified
+"Visible section not found.","Visible section not found."
 "Config form fieldset clone model required to be able to clone fields","Config form fieldset clone model required to be able to clone fields"
 "%1: Instance of %2 is expected, got %3 instead","%1: Instance of %2 is expected, got %3 instead"
-"Invalid XML in file %1:\n%2","Invalid XML in file %1:\n%2"
+"'The XML in file ""%1"" is invalid:' . ""\n%2\nVerify the XML and try again.""","'The XML in file ""%1"" is invalid:' . ""\n%2\nVerify the XML and try again."""
 .,.
 "'There is no defined type ' .","'There is no defined type ' ."
 "'Object is not instance of ' .","'Object is not instance of ' ."
 "Filesystem is not writable.","Filesystem is not writable."
 "Some error","Some error"
 "Some message","Some message"
+"You cannot run this command because the Magento application is not installed.","You cannot run this command because the Magento application is not installed."
 "This command is unavailable right now.","This command is unavailable right now."
 "The ""test/test/test"" path does not exists","The ""test/test/test"" path does not exists"
 "error message","error message"
+"The  ""%1"" path doesn't exist. Verify and try again.","The  ""%1"" path doesn't exist. Verify and try again."
 some_label,some_label
 some_comment,some_comment
 "some prefix","some prefix"
@@ -92,6 +94,7 @@ some_comment,some_comment
 "element tooltip","element tooltip"
 test,test
 test2,test2
+Action,Action
 "Add after","Add after"
 Delete,Delete
 "Current Configuration Scope:","Current Configuration Scope:"
@@ -118,4 +121,3 @@ Dashboard,Dashboard
 "Web Section","Web Section"
 "Store Email Addresses Section","Store Email Addresses Section"
 "Email to a Friend","Email to a Friend"
-"Taiwan","Taiwan, Province of China"

app/design/adminhtml/Magento/backend/i18n/en_US.csv

@@ -341,7 +341,6 @@ msg,msg
 "Could not append time to DateTime","Could not append time to DateTime"
 "The transition year isn't included in the system date range. Verify the year date range and try again.","The transition year isn't included in the system date range. Verify the year date range and try again."
 "Transition year is out of specified date range.","Transition year is out of specified date range."
-test,test
 "Invalid attribute for %1","Invalid attribute for %1"
 "Invalid tag","Invalid tag"
 "The scope object is invalid. Verify the scope object and try again.","The scope object is invalid. Verify the scope object and try again."
@@ -416,7 +415,6 @@ label,label
 "Consumer %consumer_id is not authorized to access %resources","Consumer %consumer_id is not authorized to access %resources"
 "Exception message.","Exception message."
 Message.,Message.
-Message,Message
 "Maximum items of type ""%type"" is %max","Maximum items of type ""%type"" is %max"
 "Maximum SearchCriteria pageSize is %max","Maximum SearchCriteria pageSize is %max"
 "String with translate","String with translate"
@@ -433,3 +431,119 @@ CSV,CSV
 One,One
 Two,Two
 "Home Page","Home Page"
+"Default Config","Default Config"
+"Save Config","Save Config"
+[GLOBAL],[GLOBAL]
+[WEBSITE],[WEBSITE]
+"[STORE VIEW]","[STORE VIEW]"
+"Use system value","Use system value"
+"Use Default","Use Default"
+"Use Website","Use Website"
+Add,Add
+"Delete File","Delete File"
+"Search String","Search String"
+"Design Theme","Design Theme"
+"Add \Exception","Add \Exception"
+Enable,Enable
+Disable,Disable
+Configuration,Configuration
+"The class for ""%1"" type wasn't declared. Enter the class and try again.","The class for ""%1"" type wasn't declared. Enter the class and try again."
+"%1 should implement %2","%1 should implement %2"
+"The value you set has already been locked. To change the value, use the --%1 option.","The value you set has already been locked. To change the value, use the --%1 option."
+%1,%1
+System,System
+"You saved the configuration.","You saved the configuration."
+"Something went wrong while saving this configuration:","Something went wrong while saving this configuration:"
+"Something went wrong while saving this configuration.","Something went wrong while saving this configuration."
+"Please specify the admin custom URL.","Please specify the admin custom URL."
+"Invalid %1. %2","Invalid %1. %2"
+"Value must be a URL or one of placeholders: %1","Value must be a URL or one of placeholders: %1"
+"Specify a URL or path that starts with placeholder(s): %1, and ends with ""/"".","Specify a URL or path that starts with placeholder(s): %1, and ends with ""/""."
+"%1 An empty value is allowed as well.","%1 An empty value is allowed as well."
+"Specify a fully qualified URL.","Specify a fully qualified URL."
+"Selected allowed currency ""%1"" is not available in installed currencies.","Selected allowed currency ""%1"" is not available in installed currencies."
+"Default display currency ""%1"" is not available in allowed currencies.","Default display currency ""%1"" is not available in allowed currencies."
+"Sorry, we haven't installed the base currency you selected.","Sorry, we haven't installed the base currency you selected."
+"We can't save the Cron expression.","We can't save the Cron expression."
+"Sorry, we haven't installed the default display currency you selected.","Sorry, we haven't installed the default display currency you selected."
+"Sorry, the default display currency you selected is not available in allowed currencies.","Sorry, the default display currency you selected is not available in allowed currencies."
+"The ""%1"" email address is incorrect. Verify the email address and try again.","The ""%1"" email address is incorrect. Verify the email address and try again."
+"The sender name ""%1"" is not valid. Please use only visible characters and spaces.","The sender name ""%1"" is not valid. Please use only visible characters and spaces."
+"Maximum sender name length is 255. Please correct your settings.","Maximum sender name length is 255. Please correct your settings."
+"The file you're uploading exceeds the server size limit of %1 kilobytes.","The file you're uploading exceeds the server size limit of %1 kilobytes."
+"The base directory to upload file is not specified.","The base directory to upload file is not specified."
+"The specified image adapter cannot be used because of: %1","The specified image adapter cannot be used because of: %1"
+"Default scope","Default scope"
+"Base currency","Base currency"
+"Display default currency","Display default currency"
+"website(%1) scope","website(%1) scope"
+"store(%1) scope","store(%1) scope"
+"Currency ""%1"" is used as %2 in %3.","Currency ""%1"" is used as %2 in %3."
+"The time zone is incorrect. Verify the time zone and try again.","The time zone is incorrect. Verify the time zone and try again."
+"The ""%1"" path doesn't exist. Verify and try again.","The ""%1"" path doesn't exist. Verify and try again."
+"Always (during development)","Always (during development)"
+"Only Once (version upgrade)","Only Once (version upgrade)"
+"Never (production)","Never (production)"
+Bcc,Bcc
+"Separate Email","Separate Email"
+"%1 (Default)","%1 (Default)"
+title,title
+No,No
+Optional,Optional
+Required,Required
+Website,Website
+Store,Store
+"Store View","Store View"
+"HTTP (unsecure)","HTTP (unsecure)"
+"HTTPS (SSL)","HTTPS (SSL)"
+"Yes (302 Found)","Yes (302 Found)"
+"Yes (301 Moved Permanently)","Yes (301 Moved Permanently)"
+Yes,Yes
+Specified,Specified
+"Visible section not found.","Visible section not found."
+"Config form fieldset clone model required to be able to clone fields","Config form fieldset clone model required to be able to clone fields"
+"%1: Instance of %2 is expected, got %3 instead","%1: Instance of %2 is expected, got %3 instead"
+"'There is no defined type ' .","'There is no defined type ' ."
+"'Object is not instance of ' .","'Object is not instance of ' ."
+"Filesystem is not writable.","Filesystem is not writable."
+"Some message","Some message"
+"You cannot run this command because the Magento application is not installed.","You cannot run this command because the Magento application is not installed."
+"This command is unavailable right now.","This command is unavailable right now."
+"The ""test/test/test"" path does not exists","The ""test/test/test"" path does not exists"
+"error message","error message"
+"The  ""%1"" path doesn't exist. Verify and try again.","The  ""%1"" path doesn't exist. Verify and try again."
+some_label,some_label
+some_comment,some_comment
+"some prefix","some prefix"
+"element label","element label"
+"element hint","element hint"
+"element comment","element comment"
+"element tooltip","element tooltip"
+test2,test2
+Action,Action
+"Add after","Add after"
+Delete,Delete
+"Current Configuration Scope:","Current Configuration Scope:"
+Stores,Stores
+"Group Label","Group Label"
+"Some Label","Some Label"
+"Tab Label","Tab Label"
+"Allow everything","Allow everything"
+"Magento Admin","Magento Admin"
+Dashboard,Dashboard
+"Manage Stores","Manage Stores"
+"Field 2","Field 2"
+"Field 3","Field 3"
+"Field 3.1","Field 3.1"
+"Field 3.1.1","Field 3.1.1"
+"Field 4","Field 4"
+"Advanced Section","Advanced Section"
+"Advanced Admin Section","Advanced Admin Section"
+"Design Section","Design Section"
+"General Section","General Section"
+"System Section","System Section"
+"Currency Setup Section","Currency Setup Section"
+"Developer Section","Developer Section"
+"Web Section","Web Section"
+"Store Email Addresses Section","Store Email Addresses Section"
+"Email to a Friend","Email to a Friend"