Merge remote-tracking branch 'magento2/develop' into MPI-BUGFIX-S69

app/code/Magento/Authorizenet/view/frontend/web/template/payment/authorizenet-directpost.html

@@ -61,7 +61,7 @@
                             "
                             class="action primary checkout"
                             disabled>
-                        <span data-bind="text: $t('Place Order')"></span>
+                        <span data-bind="i18n: 'Place Order'"></span>
                     </button>
                 </div>
             </div>

app/code/Magento/Backend/view/adminhtml/layout/default.xml

@@ -69,6 +69,7 @@
         </referenceContainer>
         <referenceContainer name="after.body.start">
             <block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
+            <block class="Magento\Translation\Block\Html\Head\Config" name="translate-config"/>
             <block class="Magento\Translation\Block\Js" name="translate" template="Magento_Translation::translate.phtml"/>
             <block class="Magento\Framework\View\Element\Js\Components" name="head.components" as="components" template="Magento_Backend::page/js/components.phtml"/>
             <block class="Magento\Framework\View\Element\Html\Calendar" name="head.calendar" as="calendar" template="Magento_Backend::page/js/calendar.phtml"/>

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

@@ -49,15 +49,25 @@ $numColumns = sizeof($block->getColumns());
 </div>
 <?php if ($block->canDisplayContainer()): ?>
 <script>
-var deps = ['mage/adminhtml/grid'];
+var deps = [];
+
+<?php if ($block->getDependencyJsObject()): ?>
+deps.push('uiRegistry');
+<?php endif; ?>
 
 <?php if (strpos($block->getRowClickCallback(), 'order.') !== false): ?>
-deps.push('Magento_Sales/order/create/form')
+deps.push('Magento_Sales/order/create/form');
 <?php endif; ?>
 
-require(deps, function(){
+deps.push('mage/adminhtml/grid');
+
+require(deps, function(<?php echo ($block->getDependencyJsObject() ? 'registry' : '') ?>){
     <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
 
+    <?php if ($block->getDependencyJsObject()): ?>
+        registry.get('<?php echo $block->getDependencyJsObject() ?>', function (<?php echo $block->getDependencyJsObject() ?>) {
+    <?php endif; ?>
+
     <?php echo $block->getJsObjectName() ?> = new varienGrid('<?php echo $block->getId() ?>', '<?php echo $block->getGridUrl() ?>', '<?php echo $block->getVarNamePage() ?>', '<?php echo $block->getVarNameSort() ?>', '<?php echo $block->getVarNameDir() ?>', '<?php echo $block->getVarNameFilter() ?>');
     <?php echo $block->getJsObjectName() ?>.useAjax = '<?php echo $block->getUseAjax() ?>';
     <?php if ($block->getRowClickCallback()): ?>
@@ -74,6 +84,10 @@ require(deps, function(){
     <?php echo $block->getMassactionBlock()->getJavaScript() ?>
     <?php endif ?>
 
+    <?php if ($block->getDependencyJsObject()): ?>
+    });
+    <?php endif; ?>
+
 });
 </script>
 <?php endif; ?>

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

@@ -142,15 +142,25 @@ $numColumns = sizeof($block->getColumns());
 <?php if ($block->canDisplayContainer()): ?>
 </div>
 <script>
-    var deps = ['mage/adminhtml/grid'];
+    var deps = [];
+
+    <?php if ($block->getDependencyJsObject()): ?>
+    deps.push('uiRegistry');
+    <?php endif; ?>
 
     <?php if (strpos($block->getRowClickCallback(), 'order.') !== false): ?>
-    deps.push('Magento_Sales/order/create/form');
+    deps.push('Magento_Sales/order/create/form')
     <?php endif; ?>
 
-    require(deps, function(){
+    deps.push('mage/adminhtml/grid');
+
+    require(deps, function(<?php echo ($block->getDependencyJsObject() ? 'registry' : '') ?>){
         <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
 
+        <?php if ($block->getDependencyJsObject()): ?>
+            registry.get('<?php echo $block->getDependencyJsObject() ?>', function (<?php echo $block->getDependencyJsObject() ?>) {
+        <?php endif; ?>
+
         <?php echo $block->getJsObjectName() ?> = new varienGrid('<?php echo $block->getId() ?>', '<?php echo $block->getGridUrl() ?>', '<?php echo $block->getVarNamePage() ?>', '<?php echo $block->getVarNameSort() ?>', '<?php echo $block->getVarNameDir() ?>', '<?php echo $block->getVarNameFilter() ?>');
         <?php echo $block->getJsObjectName() ?>.useAjax = <?php echo $block->getUseAjax() ? 'true' : 'false' ?>;
         <?php if ($block->getRowClickCallback()): ?>
@@ -171,6 +181,10 @@ $numColumns = sizeof($block->getColumns());
         <?php echo $block->getChildBlock('grid.massaction')->getJavaScript() ?>
         <?php endif ?>
         <?php echo $block->getAdditionalJavaScript(); ?>
+
+        <?php if ($block->getDependencyJsObject()): ?>
+            });
+        <?php endif; ?>
     });
 </script>
 <?php endif; ?>

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

@@ -243,16 +243,26 @@ $numColumns = sizeof($block->getColumns());
     <?php if ($block->canDisplayContainer()): ?>
 </div>
 <script>
-    var deps = ['mage/adminhtml/grid'];
+    var deps = [];
+
+    <?php if ($block->getDependencyJsObject()): ?>
+    deps.push('uiRegistry');
+    <?php endif; ?>
 
     <?php if (strpos($block->getRowClickCallback(), 'order.') !== false): ?>
     deps.push('Magento_Sales/order/create/form')
     <?php endif; ?>
 
-    require(deps, function(){
+    deps.push('mage/adminhtml/grid');
+
+    require(deps, function(<?php echo ($block->getDependencyJsObject() ? 'registry' : '') ?>){
         <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
 
         //<![CDATA[
+    <?php if ($block->getDependencyJsObject()): ?>
+        registry.get('<?php echo $block->getDependencyJsObject() ?>', function (<?php echo $block->getDependencyJsObject() ?>) {
+    <?php endif; ?>
+
     <?php echo $block->getJsObjectName() ?> = new varienGrid('<?php echo $block->getId() ?>', '<?php echo $block->getGridUrl() ?>', '<?php echo $block->getVarNamePage() ?>', '<?php echo $block->getVarNameSort() ?>', '<?php echo $block->getVarNameDir() ?>', '<?php echo $block->getVarNameFilter() ?>');
     <?php echo $block->getJsObjectName() ?>.useAjax = '<?php echo $block->getUseAjax() ?>';
     <?php if ($block->getRowClickCallback()): ?>
@@ -269,6 +279,10 @@ $numColumns = sizeof($block->getColumns());
     <?php echo $block->getMassactionBlock()->getJavaScript() ?>
     <?php endif ?>
     <?php echo $block->getAdditionalJavaScript(); ?>
+
+    <?php if ($block->getDependencyJsObject()): ?>
+        });
+    <?php endif; ?>
     //]]>
 
 });

app/code/Magento/Braintree/view/frontend/web/template/payment/braintree-paypal-form.html

@@ -41,7 +41,7 @@
                         "
                         class="action primary checkout"
                         disabled>
-                    <span data-bind="text: $t('Place Order')"></span>
+                    <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>
         </div>

app/code/Magento/Braintree/view/frontend/web/template/payment/cc-form.html

@@ -36,12 +36,12 @@
 
         <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'braintree_form_cc'}">
             <!-- ko if: (isShowLegend())-->
-            <legend class="legend"><span><!-- ko text: $t('Credit Card Information')--><!-- /ko --></span></legend><br />
+            <legend class="legend"><span><!-- ko i18n: 'Credit Card Information'--><!-- /ko --></span></legend><br />
             <!-- /ko -->
             <!-- ko if: (useVault()) -->
             <div>
                 <label data-bind="attr: {for: getCode() + '_cc_token'}" class="label">
-                    <span><!-- ko text: $t('Payment Information')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Payment Information'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <select name="payment[cc_token]" class="select"
@@ -60,7 +60,7 @@
             <!-- /ko -->
             <div class="field type required" data-bind="visible: isCcFormShown">
                 <label data-bind="attr: {for: getCode() + '_cc_type'}" class="label">
-                    <span><!-- ko text: $t('Credit Card Type')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Credit Card Type'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <!-- ko if: (!isCcDetectionEnabled())-->
@@ -102,7 +102,7 @@
             </div>
             <div class="field number required" data-bind="visible: isCcFormShown">
                 <label data-bind="attr: {for: getCode() + '_cc_number'}" class="label">
-                    <span><!-- ko text: $t('Credit Card Number')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Credit Card Number'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <input type="number" name="payment[cc_number]" class="input-text" value=""
@@ -112,7 +112,7 @@
             </div>
             <div class="field date required" data-bind="attr: {id: getCode() + '_cc_type_exp_div'}, visible: isCcFormShown">
                 <label data-bind="attr: {for: getCode() + '_expiration'}" class="label">
-                    <span><!-- ko text: $t('Expiration Date')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Expiration Date'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <div class="fields group group-2">
@@ -148,7 +148,7 @@
             <!-- ko if: (hasVerification())-->
             <div class="field cvv required" data-bind="attr: {id: getCode() + '_cc_type_cvv_div'}, visible: isCcFormShown">
                 <label data-bind="attr: {for: getCode() + '_cc_cid'}" class="label">
-                    <span><!-- ko text: $t('Card Verification Number')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Card Verification Number'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <input type="number"
@@ -166,7 +166,7 @@
                               tabindex="0"
                               data-toggle="dropdown"
                               data-bind="attr: {title: $t('What is this?')}, mageInit: {'dropdown':{'activeClass': '_active'}}">
-                            <span><!-- ko text: $t('What is this?')--><!-- /ko --></span>
+                            <span><!-- ko i18n: 'What is this?'--><!-- /ko --></span>
                         </span>
                         <div class="field-tooltip-content"
                              data-target="dropdown"
@@ -189,7 +189,7 @@
                            class="checkbox"
                            data-bind="checked: storeInVault"/>
                     <label class="label" for="braintree_store_in_vault">
-                        <span><!-- ko text: $t('Save this card for future use')--><!-- /ko --></span>
+                        <span><!-- ko i18n: 'Save this card for future use'--><!-- /ko --></span>
                     </label>
                 </div>
             </div>
@@ -212,7 +212,7 @@
                             css: {disabled: !isPlaceOrderActionAllowed()}
                             "
                             disabled>
-                        <span data-bind="text: $t('Place Order')"></span>
+                        <span data-bind="i18n: 'Place Order'"></span>
                     </button>
                 </div>
             </div>

app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html

@@ -6,7 +6,7 @@
 -->
 <!-- ko if: (isRequired() && getIsVisible())-->
 <div class="field captcha required" data-bind="blockLoader: getIsLoading()">
-    <label data-bind="attr: {for: 'captcha_' + formId}" class="label"><span data-bind="text: $t('Please type the letters below')"></span></label>
+    <label data-bind="attr: {for: 'captcha_' + formId}" class="label"><span data-bind="i18n: 'Please type the letters below'"></span></label>
     <div class="control captcha">
         <input name="captcha_string" type="text" class="input-text required-entry" data-bind="value: captchaValue(), attr: {id: 'captcha_' + formId, 'data-scope': dataScope}" />
         <input name="captcha_form_id" type="hidden" data-bind="value: formId,  attr: {'data-scope': dataScope}" />
@@ -20,12 +20,12 @@
                                         }"
                          class="captcha-img"/>
                     <button type="button" class="action reload captcha-reload" data-bind="attr: {title: $t('Reload captcha')}, click: refresh">
-                        <span data-bind="text: $t('Reload captcha')"></span>
+                        <span data-bind="i18n: 'Reload captcha'"></span>
                     </button>
                 </div>
             </div>
             <!-- ko if: isCaseSensitive()-->
-            <div class="captcha-note note" data-bind="text: $t('Attention: Captcha is case sensitive.')"></div>
+            <div class="captcha-note note" data-bind="i18n: 'Attention: Captcha is case sensitive.'"></div>
             <!-- /ko -->
         </div>
     </div>

app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml

@@ -191,6 +191,7 @@
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="selectProvider" xsi:type="string">product_listing.product_listing.product_columns.ids</item>
+                    <item name="component" xsi:type="string">Magento_Ui/js/grid/tree-massactions</item>
                     <item name="displayArea" xsi:type="string">bottom</item>
                     <item name="actions" xsi:type="array">
                         <item name="delete" xsi:type="array">
@@ -202,12 +203,23 @@
                             <item name="label" xsi:type="string" translate="true">Delete</item>
                             <item name="url" xsi:type="string">catalog/product/massDelete</item>
                         </item>
-                        <item name="disable" xsi:type="array">
+                        <item name="status" xsi:type="array">
                             <item name="type" xsi:type="string">status</item>
                             <item name="label" xsi:type="string" translate="true">Change status</item>
-                            <item name="url" xsi:type="string">catalog/*/massStatus</item>
+                            <item name="actions" xsi:type="array">
+                                <item name="0" xsi:type="array">
+                                    <item name="type" xsi:type="string">enable</item>
+                                    <item name="label" xsi:type="string" translate="true">Enable</item>
+                                    <item name="url" xsi:type="string">catalog/product/massEnable</item>
+                                </item>
+                                <item name="1" xsi:type="array">
+                                    <item name="type" xsi:type="string">disable</item>
+                                    <item name="label" xsi:type="string" translate="true">Disable</item>
+                                    <item name="url" xsi:type="string">catalog/product/massDisable</item>
+                                </item>
+                            </item>
                         </item>
-                        <item name="enable" xsi:type="array">
+                        <item name="attributes" xsi:type="array">
                             <item name="type" xsi:type="string">attributes</item>
                             <item name="label" xsi:type="string" translate="true">Update attributes</item>
                             <item name="url" xsi:type="string">catalog/product_action_attribute/edit</item>

app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml

@@ -19,7 +19,7 @@
             <span class="counter-label">
             <!-- ko if: cart().summary_count -->
                 <!-- ko text: cart().summary_count --><!-- /ko -->
-                <!-- ko text: $t('items') --><!-- /ko -->
+                <!-- ko i18n: 'items' --><!-- /ko -->
             <!-- /ko -->
             </span>
         </span>

app/code/Magento/Checkout/view/frontend/web/template/authentication.html

@@ -9,7 +9,7 @@
         type="button"
         class="action action-auth-toggle"
         data-trigger="authentication">
-        <span data-bind="text: $t('Sign In')"></span>
+        <span data-bind="i18n: 'Sign In'"></span>
     </button>
     <div class="block-authentication"
          style="display: none"
@@ -34,7 +34,7 @@
                 <strong id="block-customer-login-heading"
                         role="heading"
                         aria-level="2"
-                        data-bind="text: $t('Sign In')"></strong>
+                        data-bind="i18n: 'Sign In'"></strong>
             </div>
             <div class="block-content" aria-labelledby="block-customer-login-heading">
                 <form data-role="login"
@@ -43,7 +43,7 @@
                     <div class="fieldset"
                               data-bind="attr: {'data-hasrequired': $t('* Required Fields')}">
                         <div class="field field-email required">
-                            <label class="label" for="login-email"><span data-bind="text: $t('Email Address')"></span></label>
+                            <label class="label" for="login-email"><span data-bind="i18n: 'Email Address'"></span></label>
                             <div class="control">
                                 <input type="email"
                                        class="input-text"
@@ -53,7 +53,7 @@
                             </div>
                         </div>
                         <div class="field field-password required">
-                            <label for="login-password" class="label"><span data-bind="text: $t('Password')"></span></label>
+                            <label for="login-password" class="label"><span data-bind="i18n: 'Password'"></span></label>
                             <div class="control">
                                 <input type="password"
                                        class="input-text"
@@ -69,11 +69,11 @@
                     <div class="actions-toolbar">
                         <input name="context" type="hidden" value="checkout" />
                         <div class="primary">
-                            <button type="submit" class="action action-login secondary"><span data-bind="text: $t('Sign In')"></span></button>
+                            <button type="submit" class="action action-login secondary"><span data-bind="i18n: 'Sign In'"></span></button>
                         </div>
                         <div class="secondary">
                             <a class="action action-remind" data-bind="attr: { href: forgotPasswordUrl }">
-                                <span data-bind="text: $t('Forgot Password')"></span>
+                                <span data-bind="i18n: 'Forgot Password'"></span>
                             </a>
                         </div>
                     </div>

app/code/Magento/Checkout/view/frontend/web/template/billing-address.html

@@ -6,7 +6,7 @@
 -->
 <div class="billing-address-same-as-shipping-block field choice" data-bind="visible: canUseShippingAddress()">
     <input type="checkbox" name="billing-address-same-as-shipping" data-bind="checked: isAddressSameAsShipping, click: useShippingAddress, attr: {id: 'billing-address-same-as-shipping-' + $parent.getCode()}"/>
-    <label data-bind="text: $t('My billing and shipping address are the same'), attr: {for: 'billing-address-same-as-shipping-' + $parent.getCode()}"></label>
+    <label data-bind="i18n: 'My billing and shipping address are the same', attr: {for: 'billing-address-same-as-shipping-' + $parent.getCode()}"></label>
 </div>
 
 <!-- ko template: 'Magento_Checkout/billing-address/details' --><!-- /ko -->
@@ -16,10 +16,10 @@
     <div class="actions-toolbar">
         <div class="primary">
             <button class="action action-update" type="button" data-bind="click: updateAddress">
-                <span data-bind="text: $t('Update')"></span>
+                <span data-bind="i18n: 'Update'"></span>
             </button>
             <button class="action action-cancel" type="button" data-bind="click: cancelAddressEdit">
-                <span data-bind="text: $t('Cancel')"></span>
+                <span data-bind="i18n: 'Cancel'"></span>
             </button>
         </div>
     </div>

app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html

@@ -13,6 +13,6 @@
     <button type="button"
             class="action action-edit-address"
             data-bind="visible: !isAddressSameAsShipping(), click: editAddress">
-        <span data-bind="text: $t('Edit')"></span>
+        <span data-bind="i18n: 'Edit'"></span>
     </button>
 </div>