MAGETWO-84702: [SE Dev] Error Messages edits, part 1 (966 of 1166 total)

Dmytro Vilchynskyi · Dmytro Vilchynskyi · commit 143b1fc11976 · 2018-01-24T14:22:46.000+02:00
- several messages are updated
diff --git a/app/code/Magento/Analytics/Model/Config/Backend/CollectionTime.php b/app/code/Magento/Analytics/Model/Config/Backend/CollectionTime.php
@@ -66,7 +66,9 @@ public function afterSave()
         $result = preg_match('#(?<hour>\d{2}),(?<min>\d{2}),(?<sec>\d{2})#', $this->getValue(), $time);
 
         if (!$result) {
-            throw new LocalizedException(__('Time value has an unsupported format'));
+            throw new LocalizedException(
+                __('The time value is using an unsupported format. Enter a supported format and try again.')
+            );
         }
 
         $cronExprArray = [
diff --git a/app/code/Magento/Analytics/Model/Cryptographer.php b/app/code/Magento/Analytics/Model/Cryptographer.php
@@ -56,13 +56,18 @@ public function encode($source)
             try {
                 $source = (string)$source;
             } catch (\Exception $e) {
-                throw new LocalizedException(__('Input data must be string or convertible into string.'));
+                throw new LocalizedException(
+                    __(
+                        'The data is invalid. '
+                        . 'Enter the data as a string or data that can be converted into a string and try again.'
+                    )
+                );
             }
         } elseif (!$source) {
-            throw new LocalizedException(__('Input data must be non-empty string.'));
+            throw new LocalizedException(__('The data is invalid. Enter the data as a string and try again.'));
         }
         if (!$this->validateCipherMethod($this->cipherMethod)) {
-            throw new LocalizedException(__('Not valid cipher method.'));
+            throw new LocalizedException(__('The data is invalid. Use a valid cipher method and try again.'));
         }
         $initializationVector = $this->getInitializationVector();
 
@@ -90,7 +95,7 @@ private function getKey()
     {
         $token = $this->analyticsToken->getToken();
         if (!$token) {
-            throw new LocalizedException(__('Encryption key can\'t be empty.'));
+            throw new LocalizedException(__('Enter the encryption key and try again.'));
         }
         return hash('sha256', $token);
     }
diff --git a/app/code/Magento/Analytics/Model/ExportDataHandler.php b/app/code/Magento/Analytics/Model/ExportDataHandler.php
@@ -195,7 +195,7 @@ private function pack($source, $destination)
     private function validateSource(WriteInterface $directory, $path)
     {
         if (!$directory->isExist($path)) {
-            throw new LocalizedException(__('Source "%1" is not exist', $directory->getAbsolutePath($path)));
+            throw new LocalizedException(__('The "%1" source doesn\'t exist.', $directory->getAbsolutePath($path)));
         }
 
         return $directory->getAbsolutePath($path);
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
@@ -123,7 +123,10 @@ public function validateUserValue($values)
                 );
             } else {
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Please specify product\'s required option(s).')
+                    __(
+                        "The product's required option(s) weren't entered. "
+                        . "Make sure the options are entered and try again."
+                    )
                 );
             }
         } else {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -212,7 +212,9 @@ public function validateUserValue($values)
 
         $option = $this->getOption();
         if (!isset($values[$option->getId()]) && $option->getIsRequire() && !$this->getSkipCheckRequiredOption()) {
-            throw new LocalizedException(__('Please specify product\'s required option(s).'));
+            throw new LocalizedException(
+                __("The product's required option(s) weren't entered. Make sure the options are entered and try again.")
+            );
         } elseif (isset($values[$option->getId()])) {
             $this->setUserValue($values[$option->getId()]);
             $this->setIsValid(true);
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
@@ -256,7 +256,12 @@ public function validateUserValue($values)
         } catch (ProductException $e) {
             switch ($this->getProcessMode()) {
                 case \Magento\Catalog\Model\Product\Type\AbstractType::PROCESS_MODE_FULL:
-                    throw new LocalizedException(__('Please specify product\'s required option(s).'));
+                    throw new LocalizedException(
+                        __(
+                            "The product's required option(s) weren't entered. "
+                            . "Make sure the options are entered and try again."
+                        )
+                    );
                     break;
                 default:
                     $this->setUserValue(null);
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php
@@ -216,7 +216,9 @@ public function validate($processingParams, $option)
                 throw new LocalizedException(__(implode("\n", $errors)));
             }
         } else {
-            throw new LocalizedException(__('Please specify product\'s required option(s).'));
+            throw new LocalizedException(
+                __("The product's required option(s) weren't entered. Make sure the options are entered and try again.")
+            );
         }
         return $userValue;
     }
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfo.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfo.php
@@ -102,7 +102,7 @@ public function validate($optionValue, $option)
             }
         } else {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('Please specify product\'s required option(s).')
+                __("The product's required option(s) weren't entered. Make sure the options are entered and try again.")
             );
         }
         return $result;
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
@@ -65,13 +65,20 @@ public function validateUserValue($values)
 
         if (empty($value) && $option->getIsRequire() && !$this->getSkipCheckRequiredOption()) {
             $this->setIsValid(false);
-            throw new LocalizedException(__('Please specify product\'s required option(s).'));
+            throw new LocalizedException(
+                __("The product's required option(s) weren't entered. Make sure the options are entered and try again.")
+            );
         }
         if (!$this->_isSingleSelection()) {
             $valuesCollection = $option->getOptionValuesByOptionId($value, $this->getProduct()->getStoreId())->load();
             if ($valuesCollection->count() != count($value)) {
                 $this->setIsValid(false);
-                throw new LocalizedException(__('Please specify product\'s required option(s).'));
+                throw new LocalizedException(
+                    __(
+                        "The product's required option(s) weren't entered. "
+                        . "Make sure the options are entered and try again."
+                    )
+                );
             }
         }
         return $this;
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Text.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Text.php
@@ -61,7 +61,9 @@ public function validateUserValue($values)
         // Check requires option to have some value
         if (strlen($value) == 0 && $option->getIsRequire() && !$this->getSkipCheckRequiredOption()) {
             $this->setIsValid(false);
-            throw new LocalizedException(__('Please specify product\'s required option(s).'));
+            throw new LocalizedException(
+                __("The product's required option(s) weren't entered. Make sure the options are entered and try again.")
+            );
         }
 
         // Check maximal length limit
diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
@@ -567,7 +567,7 @@ protected function _isStrictProcessMode($processMode)
      */
     public function getSpecifyOptionMessage()
     {
-        return __('Please specify product\'s required option(s).');
+        return __("The product's required option(s) weren't entered. Make sure the options are entered and try again.");
     }
 
     /**
diff --git a/dev/tests/api-functional/_files/Magento/TestModule3/Service/V1/Error.php b/dev/tests/api-functional/_files/Magento/TestModule3/Service/V1/Error.php
@@ -64,7 +64,7 @@ public function serviceException()
      */
     public function authorizationException()
     {
-        throw new AuthorizationException(__("The consumer isn't authorized to access %resources.", 'resourceN'));
+        throw new AuthorizationException(__("The consumer isn't authorized to access %1.", 'resourceN'));
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php
@@ -125,7 +125,6 @@ public function testOptionRequiredException()
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Please specify product's required option(s).
      * @return void
      */
     public function testException()
@@ -142,6 +141,10 @@ public function testException()
             $this->objectManager->create(\Magento\Framework\DataObject::class),
             $this->getProductOption()
         );
+
+        $this->expectExceptionMessage(
+            "The product's required option(s) weren't entered. Make sure the options are entered and try again."
+        );
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfoTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfoTest.php
@@ -90,7 +90,7 @@ public function testExceptionWithoutErrors()
     {
         $this->expectException(
             \Magento\Framework\Exception\LocalizedException::class,
-            "Please specify product's required option(s)."
+            "The product's required option(s) weren't entered. Make sure the options are entered and try again."
         );
 
         $validateMock = $this->createPartialMock(\Zend_Validate::class, ['isValid', 'getErrors']);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/AbstractTypeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/AbstractTypeTest.php
@@ -200,15 +200,15 @@ public function testPrepareForCartOptionsException()
         // fixture
 
         $this->assertContains(
-            'Please specify product\'s required option(s).',
+            "The product's required option(s) weren't entered. Make sure the options are entered and try again.",
             $this->_model->prepareForCart(new \Magento\Framework\DataObject(), $product)
         );
     }
 
     public function testGetSpecifyOptionMessage()
     {
         $this->assertEquals(
-            'Please specify product\'s required option(s).',
+            "The product's required option(s) weren't entered. Make sure the options are entered and try again.",
             $this->_model->getSpecifyOptionMessage()
         );
     }
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Tree/NodeTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Tree/NodeTest.php
@@ -108,7 +108,7 @@ public function constructorDataProvider()
                     'node_data' => true,
                     'keys' => null,
                 ], \Magento\Framework\Exception\LocalizedException::class,
-                "The encryption key can't be empty. Enter the key and try again."
+                'Enter the encryption key and try again.'
             ]
         ];
     }
diff --git a/lib/internal/Magento/Framework/Search/Request/Cleaner.php b/lib/internal/Magento/Framework/Search/Request/Cleaner.php
@@ -61,7 +61,9 @@ public function clean(array $requestData)
         $this->clear();
 
         if (empty($requestData['queries']) && empty($requestData['filters'])) {
-            throw new EmptyRequestDataException(new Phrase('Request query and filters are not set'));
+            throw new EmptyRequestDataException(
+                new Phrase("The request query and filters aren't set. Verify the query and filters and try again.")
+            );
         }
 
         return $requestData;
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Request/CleanerTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Request/CleanerTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Search\Test\Unit\Request;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -338,7 +339,7 @@ public function testCleanQueryNotExists()
 
     /**
      * @expectedException \Magento\Framework\Search\Request\EmptyRequestDataException
-     * @expectedExceptionMessage Request query and filters are not set
+     * @expectedExceptionMessage The request query and filters aren't set. Verify the query and filters and try again.
      */
     public function testCleanEmptyQueryAndFilter()
     {

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,9 @@ public function afterSave()`
`66`	`66`	`$result = preg_match('#(?<hour>\d{2}),(?<min>\d{2}),(?<sec>\d{2})#', $this->getValue(), $time);`
`67`	`67`
`68`	`68`	`if (!$result) {`
`69`		`- throw new LocalizedException(__('Time value has an unsupported format'));`
	`69`	`+ throw new LocalizedException(`
	`70`	`+ __('The time value is using an unsupported format. Enter a supported format and try again.')`
	`71`	`+ );`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`$cronExprArray = [`
Original file line number	Diff line number	Diff line change
`@@ -56,13 +56,18 @@ public function encode($source)`
`56`	`56`	`try {`
`57`	`57`	`$source = (string)$source;`
`58`	`58`	`} catch (\Exception $e) {`
`59`		`- throw new LocalizedException(__('Input data must be string or convertible into string.'));`
	`59`	`+ throw new LocalizedException(`
	`60`	`+ __(`
	`61`	`+ 'The data is invalid. '`
	`62`	`+ . 'Enter the data as a string or data that can be converted into a string and try again.'`
	`63`	`+ )`
	`64`	`+ );`
`60`	`65`	`}`
`61`	`66`	`} elseif (!$source) {`
`62`		`- throw new LocalizedException(__('Input data must be non-empty string.'));`
	`67`	`+ throw new LocalizedException(__('The data is invalid. Enter the data as a string and try again.'));`
`63`	`68`	`}`
`64`	`69`	`if (!$this->validateCipherMethod($this->cipherMethod)) {`
`65`		`- throw new LocalizedException(__('Not valid cipher method.'));`
	`70`	`+ throw new LocalizedException(__('The data is invalid. Use a valid cipher method and try again.'));`
`66`	`71`	`}`
`67`	`72`	`$initializationVector = $this->getInitializationVector();`
`68`	`73`
`@@ -90,7 +95,7 @@ private function getKey()`
`90`	`95`	`{`
`91`	`96`	`$token = $this->analyticsToken->getToken();`
`92`	`97`	`if (!$token) {`
`93`		`- throw new LocalizedException(__('Encryption key can\'t be empty.'));`
	`98`	`+ throw new LocalizedException(__('Enter the encryption key and try again.'));`
`94`	`99`	`}`
`95`	`100`	`return hash('sha256', $token);`
`96`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ private function pack($source, $destination)`
`195`	`195`	`private function validateSource(WriteInterface $directory, $path)`
`196`	`196`	`{`
`197`	`197`	`if (!$directory->isExist($path)) {`
`198`		`- throw new LocalizedException(__('Source "%1" is not exist', $directory->getAbsolutePath($path)));`
	`198`	`+ throw new LocalizedException(__('The "%1" source doesn\'t exist.', $directory->getAbsolutePath($path)));`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`return $directory->getAbsolutePath($path);`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,9 @@ public function validate($processingParams, $option)`
`216`	`216`	`throw new LocalizedException(__(implode("\n", $errors)));`
`217`	`217`	`}`
`218`	`218`	`} else {`
`219`		`- throw new LocalizedException(__('Please specify product\'s required option(s).'));`
	`219`	`+ throw new LocalizedException(`
	`220`	`+ __("The product's required option(s) weren't entered. Make sure the options are entered and try again.")`
	`221`	`+ );`
`220`	`222`	`}`
`221`	`223`	`return $userValue;`
`222`	`224`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public function validate($optionValue, $option)`
`102`	`102`	`}`
`103`	`103`	`} else {`
`104`	`104`	`throw new \Magento\Framework\Exception\LocalizedException(`
`105`		`- __('Please specify product\'s required option(s).')`
	`105`	`+ __("The product's required option(s) weren't entered. Make sure the options are entered and try again.")`
`106`	`106`	`);`
`107`	`107`	`}`
`108`	`108`	`return $result;`