sidolov · sidolov · Jan 22, 2018 · Jan 22, 2018 · Jan 23, 2018 · Jan 24, 2018
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/Authorization/Model/Acl/AclRetriever.php b/app/code/Magento/Authorization/Model/Acl/AclRetriever.php
@@ -84,7 +84,7 @@ public function getAllowedResourcesByUser($userType, $userId)
             $role = $this->_getUserRole($userType, $userId);
             if (!$role) {
                 throw new AuthorizationException(
-                    __('We can\'t find the role for the user you wanted.')
+                    __("The role wasn't found for the user. Verify the role and try again.")
                 );
             }
             $allowedResources = $this->getAllowedResourcesByRole($role->getId());

diff --git a/app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php b/app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php
@@ -60,7 +60,7 @@ public function testGetAllowedResourcesByUserTypeCustomer()
 
     /**
      * @expectedException \Magento\Framework\Exception\AuthorizationException
-     * @expectedExceptionMessage We can't find the role for the user you wanted.
+     * @expectedExceptionMessage The role wasn't found for the user. Verify the role and try again.
      */
     public function testGetAllowedResourcesByUserRoleNotFound()
     {

diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Authorizenet\Controller\Directpost\Payment;
 
 use Magento\Authorizenet\Controller\Directpost\Payment;
@@ -147,7 +148,7 @@ protected function placeCheckoutOrder()
             $result->setData('error', true);
             $result->setData(
                 'error_messages',
-                __('An error occurred on the server. Please try to place the order again.')
+                __('A server error stopped your order from being placed. Please try to place your order again.')
             );
         }
         if ($response instanceof Http) {

diff --git a/app/code/Magento/Authorizenet/Model/TransactionService.php b/app/code/Magento/Authorizenet/Model/TransactionService.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Authorizenet\Model;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -124,15 +125,15 @@ protected function loadTransactionDetails(Authorizenet $context, $transactionId)
             $responseXmlDocument = new Element($responseBody);
             libxml_use_internal_errors(false);
         } catch (\Exception $e) {
-            throw new LocalizedException(__('Unable to get transaction details. Try again later.'));
+            throw new LocalizedException(__('The transaction details are unavailable. Please try again later.'));
         } finally {
             $context->debugData($debugData);
         }
 
         if (!isset($responseXmlDocument->messages->resultCode)
             || $responseXmlDocument->messages->resultCode != static::PAYMENT_UPDATE_STATUS_CODE_SUCCESS
         ) {
-            throw new LocalizedException(__('Unable to get transaction details. Try again later.'));
+            throw new LocalizedException(__('The transaction details are unavailable. Please try again later.'));
         }
 
         $this->transactionDetails[$transactionId] = $responseXmlDocument;

diff --git a/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php b/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Authorizenet\Test\Unit\Controller\Directpost\Payment;
 
 use Magento\Authorizenet\Controller\Directpost\Payment\Place;
@@ -297,7 +298,9 @@ public function textExecuteFailedPlaceOrderDataProvider()
         $objectFailed1 = new \Magento\Framework\DataObject(
             [
                 'error' => true,
-                'error_messages' => __('An error occurred on the server. Please try to place the order again.')
+                'error_messages' => __(
+                    'A server error stopped your order from being placed. Please try to place your order again.'
+                )
             ]
         );
         $generalException = new \Exception('Exception logging will save the world!');

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Block\Widget\Grid\Massaction;
 
 use Magento\Backend\Block\Widget\Grid\Massaction\VisibilityCheckerInterface as VisibilityChecker;
@@ -57,7 +58,7 @@ protected function _construct()
     {
         parent::_construct();
 
-        $this->setErrorText($this->escapeHtml(__('Please select items.')));
+        $this->setErrorText($this->escapeHtml(__('An item needs to be selected. Select and try again.')));
 
         if (null !== $this->getOptions()) {
             foreach ($this->getOptions() as $optionId => $option) {

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Block\Widget\Grid\Massaction;
 
 /**
@@ -69,7 +70,7 @@ public function __construct(
     public function _construct()
     {
         parent::_construct();
-        $this->setErrorText($this->escapeHtml(__('Please select items.')));
+        $this->setErrorText($this->escapeHtml(__('An item needs to be selected. Select and try again.')));
     }
 
     /**

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Controller\Adminhtml;
 
 use Magento\Backend\App\Action;
@@ -73,7 +74,7 @@ protected function _validateTypes(array $types)
         $allTypes = array_keys($this->_cacheTypeList->getTypes());
         $invalidTypes = array_diff($types, $allTypes);
         if (count($invalidTypes) > 0) {
-            throw new LocalizedException(__('Specified cache type(s) don\'t exist: %1', join(', ', $invalidTypes)));
+            throw new LocalizedException(__('These cache type(s) don\'t exist: %1', join(', ', $invalidTypes)));
         }
     }
 }
diff --git a/app/code/Magento/Backend/Model/Auth.php b/app/code/Magento/Backend/Model/Auth.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Model;
 
 use Magento\Framework\Exception\AuthenticationException;
@@ -148,7 +149,12 @@ public function getCredentialStorage()
     public function login($username, $password)
     {
         if (empty($username) || empty($password)) {
-            self::throwException(__('You did not sign in correctly or your account is temporarily disabled.'));
+            self::throwException(
+                __(
+                    'The account sign-in was incorrect or your account is disabled temporarily. '
+                    . 'Please wait and try again later.'
+                )
+            );
         }
 
         try {
@@ -165,7 +171,12 @@ public function login($username, $password)
             }
 
             if (!$this->getAuthStorage()->getUser()) {
-                self::throwException(__('You did not sign in correctly or your account is temporarily disabled.'));
+                self::throwException(
+                    __(
+                        'The account sign-in was incorrect or your account is disabled temporarily. '
+                        . 'Please wait and try again later.'
+                    )
+                );
             }
         } catch (PluginAuthenticationException $e) {
             $this->_eventManager->dispatch(
@@ -179,7 +190,10 @@ public function login($username, $password)
                 ['user_name' => $username, 'exception' => $e]
             );
             self::throwException(
-                __($e->getMessage()? : 'You did not sign in correctly or your account is temporarily disabled.')
+                __(
+                    $e->getMessage()? : 'The account sign-in was incorrect or your account is disabled temporarily. '
+                        . 'Please wait and try again later.'
+                )
             );
         }
     }
@@ -215,7 +229,7 @@ public function isLoggedIn()
     public static function throwException(Phrase $msg = null)
     {
         if ($msg === null) {
-            $msg = __('Authentication error occurred.');
+            $msg = __('An authentication error occurred. Verify and try again.');
         }
         throw new AuthenticationException($msg);
     }

diff --git a/app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php b/app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Model\Config\SessionLifetime;
 
 use Magento\Framework\App\Config\Value;
@@ -26,14 +27,17 @@ class BackendModel extends Value
      */
     public function beforeSave()
     {
-        $value = (int) $this->getValue();
+        $value = (int)$this->getValue();
         if ($value > self::MAX_LIFETIME) {
             throw new LocalizedException(
-                __('Admin session lifetime must be less than or equal to 31536000 seconds (one year)')
+                __(
+                    'The Admin session lifetime is invalid. '
+                    . 'Set the lifetime to 31536000 seconds (one year) or shorter and try again.'
+                )
             );
         } elseif ($value < self::MIN_LIFETIME) {
             throw new LocalizedException(
-                __('Admin session lifetime must be greater than or equal to 60 seconds')
+                __('The Admin session lifetime is invalid. Set the lifetime to 60 seconds or longer and try again.')
             );
         }
         return parent::beforeSave();

diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Test\Unit\Controller\Adminhtml\Cache;
 
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
@@ -156,7 +157,7 @@ public function testExecuteInvalidTypeCache()
 
         $this->messageManagerMock->expects($this->once())
             ->method('addError')
-            ->with('Specified cache type(s) don\'t exist: someCache')
+            ->with('These cache type(s) don\'t exist: someCache')
             ->willReturnSelf();
 
         $this->assertSame($this->redirectMock, $this->controller->execute());

diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Test\Unit\Controller\Adminhtml\Cache;
 
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
@@ -156,7 +157,7 @@ public function testExecuteInvalidTypeCache()
 
         $this->messageManagerMock->expects($this->once())
             ->method('addError')
-            ->with('Specified cache type(s) don\'t exist: someCache')
+            ->with('These cache type(s) don\'t exist: someCache')
             ->willReturnSelf();
 
         $this->assertSame($this->redirectMock, $this->controller->execute());

diff --git a/app/code/Magento/Backend/Test/Unit/Model/AuthTest.php b/app/code/Magento/Backend/Test/Unit/Model/AuthTest.php
@@ -54,7 +54,6 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\AuthenticationException
-     * @expectedExceptionMessage You did not sign in correctly or your account is temporarily disabled.
      */
     public function testLoginFailed()
     {
@@ -64,7 +63,10 @@ public function testLoginFailed()
             ->with(\Magento\Backend\Model\Auth\Credential\StorageInterface::class)
             ->will($this->returnValue($this->_credentialStorage));
         $exceptionMock = new \Magento\Framework\Exception\LocalizedException(
-            __('You did not sign in correctly or your account is temporarily disabled.')
+            __(
+                'The account sign-in was incorrect or your account is disabled temporarily. '
+                . 'Please wait and try again later.'
+            )
         );
         $this->_credentialStorage
             ->expects($this->once())
@@ -74,5 +76,10 @@ public function testLoginFailed()
         $this->_credentialStorage->expects($this->never())->method('getId');
         $this->_eventManagerMock->expects($this->once())->method('dispatch')->with('backend_auth_user_login_failed');
         $this->_model->login('username', 'password');
+
+        $this->expectExceptionMessage(
+            'The account sign-in was incorrect or your account is disabled temporarily. '
+            . 'Please wait and try again later.'
+        );
     }
 }
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php b/app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Test\Unit\Model\Config\SessionLifetime;
 
 use Magento\Backend\Model\Config\SessionLifetime\BackendModel;
@@ -32,11 +33,12 @@ public function adminSessionLifetimeDataProvider()
         return [
             [
                 BackendModel::MIN_LIFETIME - 1,
-                'Admin session lifetime must be greater than or equal to 60 seconds'
+                'The Admin session lifetime is invalid. Set the lifetime to 60 seconds or longer and try again.'
             ],
             [
                 BackendModel::MAX_LIFETIME + 1,
-                'Admin session lifetime must be less than or equal to 31536000 seconds (one year)'
+                'The Admin session lifetime is invalid. '
+                . 'Set the lifetime to 31536000 seconds (one year) or shorter and try again.'
             ],
             [
                 900

diff --git a/app/code/Magento/Braintree/Controller/Paypal/AbstractAction.php b/app/code/Magento/Braintree/Controller/Paypal/AbstractAction.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Braintree\Controller\Paypal;
 
 use Magento\Checkout\Model\Session;
@@ -73,7 +74,7 @@ public function dispatch(RequestInterface $request)
     protected function validateQuote($quote)
     {
         if (!$quote || !$quote->getItemsCount()) {
-            throw new \InvalidArgumentException(__('We can\'t initialize checkout.'));
+            throw new \InvalidArgumentException(__('Checkout failed to initialize. Verify and try again.'));
         }
     }
 }
diff --git a/app/code/Magento/Braintree/Controller/Paypal/Review.php b/app/code/Magento/Braintree/Controller/Paypal/Review.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Braintree\Controller\Paypal;
 
 use Magento\Checkout\Model\Session;
@@ -66,7 +67,7 @@ public function execute()
                     $quote
                 );
             } elseif (!$quote->getPayment()->getAdditionalInformation(self::$paymentMethodNonce)) {
-                throw new LocalizedException(__('We can\'t initialize checkout.'));
+                throw new LocalizedException(__('Checkout failed to initialize. Verify and try again.'));
             }
 
             /** @var \Magento\Framework\View\Result\Page $resultPage */

diff --git a/app/code/Magento/Braintree/Gateway/Command/GetPaymentNonceCommand.php b/app/code/Magento/Braintree/Gateway/Command/GetPaymentNonceCommand.php
@@ -77,7 +77,7 @@ public function execute(array $commandSubject)
         $customerId = $this->subjectReader->readCustomerId($commandSubject);
         $paymentToken = $this->tokenManagement->getByPublicHash($publicHash, $customerId);
         if (!$paymentToken) {
-            throw new Exception('No available payment tokens');
+            throw new Exception('No payment tokens are available.');
         }
 
         $data = $this->adapter->createNonce($paymentToken->getGatewayToken());