Merge pull request #3 from Karlasa/2.1-develop-PR-port-16190

[Backport] magento#16079 translation possibility for moreButtonText

Author: Karlasa

app/code/Magento/Backend/App/AbstractAction.php

@@ -214,6 +214,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
             $this->_view->loadLayout(['default', 'adminhtml_denied'], true, true, false);
             $this->_view->renderLayout();
             $this->_request->setDispatched(true);
+
             return $this->_response;
         }
 
@@ -223,6 +224,11 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
 
         $this->_processLocaleSettings();
 
+        // Need to preload isFirstPageAfterLogin (see https://github.com/magento/magento2/issues/15510)
+        if ($this->_auth->isLoggedIn()) {
+            $this->_auth->getAuthStorage()->isFirstPageAfterLogin();
+        }
+
         return parent::dispatch($request);
     }
 

app/code/Magento/Backend/Block/Dashboard.php

@@ -18,7 +18,7 @@ class Dashboard extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'dashboard/index.phtml';
+    protected $_template = 'Magento_Backend::dashboard/index.phtml';
 
     /**
      * @return void

app/code/Magento/Backend/Block/Dashboard/Graph.php

@@ -90,7 +90,7 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
     /**
      * @var string
      */
-    protected $_template = 'dashboard/graph.phtml';
+    protected $_template = 'Magento_Backend::dashboard/graph.phtml';
 
     /**
      * Adminhtml dashboard data

app/code/Magento/Backend/Block/Dashboard/Grid.php

@@ -15,7 +15,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
     /**
      * @var string
      */
-    protected $_template = 'dashboard/grid.phtml';
+    protected $_template = 'Magento_Backend::dashboard/grid.phtml';
 
     /**
      * Setting default for every grid on dashboard

app/code/Magento/Backend/Block/Dashboard/Sales.php

@@ -16,7 +16,7 @@ class Sales extends \Magento\Backend\Block\Dashboard\Bar
     /**
      * @var string
      */
-    protected $_template = 'dashboard/salebar.phtml';
+    protected $_template = 'Magento_Backend::dashboard/salebar.phtml';
 
     /**
      * @var \Magento\Framework\Module\Manager

app/code/Magento/Backend/Block/Dashboard/Totals.php

@@ -17,7 +17,7 @@ class Totals extends \Magento\Backend\Block\Dashboard\Bar
     /**
      * @var string
      */
-    protected $_template = 'dashboard/totalbar.phtml';
+    protected $_template = 'Magento_Backend::dashboard/totalbar.phtml';
 
     /**
      * @var \Magento\Framework\Module\Manager

app/code/Magento/Backend/Block/Menu.php

@@ -211,9 +211,12 @@ protected function _renderItemCssClass($menuItem, $level)
     protected function _renderAnchor($menuItem, $level)
     {
         if ($level == 1 && $menuItem->getUrl() == '#') {
-            $output = '<strong class="submenu-group-title" role="presentation">'
-                . '<span>' . $this->_getAnchorLabel($menuItem) . '</span>'
-                . '</strong>';
+            $output = '';
+            if ($menuItem->hasChildren()) {
+                $output = '<strong class="submenu-group-title" role="presentation">'
+                    . '<span>' . $this->_getAnchorLabel($menuItem) . '</span>'
+                    . '</strong>';
+            }
         } else {
             $output = '<a href="' . $menuItem->getUrl() . '" ' . $this->_renderItemAnchorTitle(
                 $menuItem

app/code/Magento/Backend/Block/Page/Copyright.php

@@ -15,5 +15,5 @@ class Copyright extends \Magento\Backend\Block\Template
      *
      * @var string
      */
-    protected $_template = 'page/copyright.phtml';
+    protected $_template = 'Magento_Backend::page/copyright.phtml';
 }

app/code/Magento/Backend/Block/Page/Footer.php

@@ -15,7 +15,7 @@ class Footer extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'page/footer.phtml';
+    protected $_template = 'Magento_Backend::page/footer.phtml';
 
     /**
      * @var \Magento\Framework\App\ProductMetadataInterface

app/code/Magento/Backend/Block/Page/Header.php

@@ -18,7 +18,7 @@ class Header extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'page/header.phtml';
+    protected $_template = 'Magento_Backend::page/header.phtml';
 
     /**
      * Backend data

app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php

@@ -23,7 +23,7 @@ class Fieldset extends \Magento\Backend\Block\Template implements \Magento\Frame
     /**
      * @var string
      */
-    protected $_template = 'store/switcher/form/renderer/fieldset.phtml';
+    protected $_template = 'Magento_Backend::store/switcher/form/renderer/fieldset.phtml';
 
     /**
      * Retrieve an element

app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php

@@ -21,7 +21,7 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Eleme
     /**
      * @var string
      */
-    protected $_template = 'store/switcher/form/renderer/fieldset/element.phtml';
+    protected $_template = 'Magento_Backend::store/switcher/form/renderer/fieldset/element.phtml';
 
     /**
      * Retrieve an element

app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml

@@ -41,11 +41,11 @@
     <?php endif; ?>
 </div>
 
-<script>
-require(['jquery'], function($){
-        $('.actions-split')
-            .on('click.splitDefault', '.action-default', function() {
-                $(this).siblings('.dropdown-menu').find('.item-default').trigger('click');
-            });
-});
+<script type="text/x-magento-init">
+    {
+        ".actions-split": {
+            "Magento_Ui/js/grid/controls/button/split": {}
+        }
+    }
 </script>
+

app/code/Magento/Braintree/i18n/en_US.csv

@@ -165,4 +165,5 @@ Debug,Debug
 "credit_card","Credit card"
 "apple_pay_card","Apple pay card"
 "android_pay_card","Android pay card"
-"Accept credit/debit cards and PayPal in your Magento store.<br/>No setup or monthly fees and your customers never leave your store to complete the purchase.","Accept credit/debit cards and PayPal in your Magento store.<br/>No setup or monthly fees and your customers never leave your store to complete the purchase."
+"Accept credit/debit cards and PayPal in your Magento store.<br/>No setup or monthly fees and your customers never leave your store to complete the purchase.","Accept credit/debit cards and PayPal in your Magento store.<br/>No setup or monthly fees and your customers never leave your store to complete the purchase."
+"Save for later use.","Save for later use."

app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml

@@ -84,7 +84,7 @@ $ccType = $block->getInfoData('cc_type');
                    name="payment[is_active_payment_token_enabler]"
                    class="admin__control-checkbox"/>
             <label class="label" for="<?php /* @noEscape */ echo $code; ?>_vault">
-                <span><?php echo $block->escapeHtml('Save for later use.'); ?></span>
+                <span><?php echo $block->escapeHtml(__('Save for later use.')); ?></span>
             </label>
         </div>
     <?php endif; ?>

app/code/Magento/Captcha/Test/Unit/Observer/CaptchaStringResolverTest.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Captcha\Test\Unit\Observer;
+
+use Magento\Captcha\Helper\Data as CaptchaDataHelper;
+use Magento\Captcha\Observer\CaptchaStringResolver;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class CaptchaStringResolverTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var CaptchaStringResolver
+     */
+    private $captchaStringResolver;
+
+    /**
+     * @var HttpRequest|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new ObjectManager($this);
+        $this->requestMock = $this->getMock(HttpRequest::class, [], [], '', false);
+        $this->captchaStringResolver = $this->objectManagerHelper->getObject(CaptchaStringResolver::class);
+    }
+
+    public function testResolveWithFormIdSet()
+    {
+        $formId = 'contact_us';
+        $captchaValue = 'some-value';
+
+        $this->requestMock->expects($this->once())
+            ->method('getPost')
+            ->with(CaptchaDataHelper::INPUT_NAME_FIELD_VALUE)
+            ->willReturn([$formId => $captchaValue]);
+
+        self::assertEquals(
+            $this->captchaStringResolver->resolve($this->requestMock, $formId),
+            $captchaValue
+        );
+    }
+
+    public function testResolveWithNoFormIdInRequest()
+    {
+        $formId = 'contact_us';
+
+        $this->requestMock->expects($this->once())
+            ->method('getPost')
+            ->with(CaptchaDataHelper::INPUT_NAME_FIELD_VALUE)
+            ->willReturn([]);
+
+        self::assertEquals(
+            $this->captchaStringResolver->resolve($this->requestMock, $formId),
+            ''
+        );
+    }
+}