Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-87619

Author: Bohdan Korablov

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 = [

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);
     }

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);

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());

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()
     {

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) {

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;

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!');

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) {

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.')));
     }
 
     /**