Merge remote-tracking branch 'main/develop' into MAGETWO-33534

Author: dkvashninbay

Gruntfile.js

@@ -68,12 +68,17 @@ module.exports = function (grunt) {
             'less:luma',
             'less:backend'
         ],
+
         /**
          * Documentation
          */
         documentation: [
+            'replace:documentation',
             'less:documentation',
             'styledocco:documentation',
+            'usebanner:documentationCss',
+            'usebanner:documentationLess',
+            'usebanner:documentationHtml',
             'clean:var',
             'clean:pub'
         ],
@@ -82,12 +87,6 @@ module.exports = function (grunt) {
             'mage-minify:legacy'
         ],
 
-        'documentation-banners': [
-            'usebanner:documentationCss',
-            'usebanner:documentationLess',
-            'usebanner:documentationHtml'
-        ],
-
         spec: function (theme) {
             var runner = require('./dev/tests/js/jasmine/spec_runner');
 

app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php

@@ -48,7 +48,7 @@ public function execute()
             $items[] = [
                 'id' => 'error',
                 'type' => __('Error'),
-                'name' => __('Access Denied'),
+                'name' => __('Access Denied.'),
                 'description' => __('You need more permissions to do this.'),
             ];
         } else {

app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml

@@ -15,9 +15,9 @@
 <h1 class="page-heading"><?php echo __('Access denied') ?></h1>
 <?php if (!$block->hasAvailableResources()): ?>
 <p>
-<?php echo __('Please try to log out and sign in again.') ?><br/>
+<?php echo __('Please try to sign out and sign in again.') ?><br/>
 <?php echo __('If you continue to receive this message, please contact the store owner.') ?>
 </p>
 <?php else: ?>
-<p><?php echo __('Access denied.') ?></p>
+<p><?php echo __('You need more permissions to access this.') ?></p>
 <?php endif?>

app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml

@@ -73,7 +73,7 @@ require([
                 $('#' + data.fileId)
                     .delay(2000)
                     .hide('highlight');
-                alert($.mage.__('File extension not known or unsupported type.'));
+                alert($.mage.__('We don\'t recognize or support this file extension type.'));
             }
             $('#' + data.fileId).remove();
         },

app/code/Magento/Backend/view/adminhtml/templates/menu.phtml

@@ -8,7 +8,6 @@
 
 ?>
 
-
 <nav data-mage-init='{"globalNavigation": {}}' class="admin__menu" role="navigation">
     <?php echo $block->renderNavigation($block->getMenuModel(), 0, 12); ?>
 </nav>

app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml

@@ -31,7 +31,7 @@ $numColumns = sizeof($block->getColumns());
 
         <div class="admin__data-grid-header admin__data-grid-toolbar">
             <?php $massActionAvailable = $block->getChildBlock('grid.massaction') && $block->getChildBlock('grid.massaction')->isAvailable() ?>
-            <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getChildBlock('grid.columnSet')->getFilterVisibility()): ?>
+            <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getChildBlock('grid.columnSet')->getFilterVisibility() || $massActionAvailable): ?>
             <div class="admin__data-grid-header-row">
                 <?php if ($massActionAvailable): ?>
                     <?php echo $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : ''; ?>

app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml

@@ -30,8 +30,8 @@ $numColumns = sizeof($block->getColumns());
     <?php else: ?>
         <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
     <?php endif; ?>
-    <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getFilterVisibility()): ?>
-        <?php $massActionAvailable = $block->getMassactionBlock() && $block->getMassactionBlock()->isAvailable() ?>
+    <?php $massActionAvailable = $block->getMassactionBlock() && $block->getMassactionBlock()->isAvailable() ?>
+    <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getFilterVisibility() || $massActionAvailable): ?>
         <div class="admin__data-grid-header admin__data-grid-toolbar">
             <div class="admin__data-grid-header-row">
                 <?php if ($massActionAvailable): ?>

app/code/Magento/Bundle/Model/Product/Type.php

@@ -1319,7 +1319,7 @@ protected function checkIsResult($_result)
 
         if (!isset($_result[0])) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('We cannot add this item to your shopping cart.')
+                __('We can\'t add this item to your cart right now.')
             );
         }
     }

app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php

@@ -695,7 +695,7 @@ function ($key) use ($optionCollection, $selectionCollection) {
             ->willReturn(3.14);
 
         $result = $this->model->prepareForCartAdvanced($buyRequest, $product);
-        $this->assertEquals('We cannot add this item to your shopping cart.', $result);
+        $this->assertEquals('We can\'t add this item to your cart right now.', $result);
     }
 
     /**

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php

@@ -85,7 +85,7 @@ protected function _prepareForm()
                 'label' => __('Attribute Code'),
                 'title' => __('Attribute Code'),
                 'note' => __(
-                    'For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols',
+                    'This is used internally. Make sure you don\'t use spaces or more than %1 symbols.',
                     \Magento\Eav\Model\Entity\Attribute::ATTRIBUTE_CODE_MAX_LENGTH
                 ),
                 'class' => $validateClass