Merge remote-tracking branch 'mainline/develop' into MAGETWO-35512

Author: vkholoshenko

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/Block/Dashboard.php

@@ -31,15 +31,22 @@ protected function _prepareLayout()
 
         $this->addChild('sales', 'Magento\Backend\Block\Dashboard\Sales');
 
-        if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
+        $isChartEnabled = $this->_scopeConfig->getValue(
+            self::XML_PATH_ENABLE_CHARTS,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+        if ($isChartEnabled) {
             $block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams');
         } else {
             $block = $this->getLayout()->createBlock(
                 'Magento\Backend\Block\Template'
             )->setTemplate(
                 'dashboard/graph/disabled.phtml'
             )->setConfigUrl(
-                $this->getUrl('adminhtml/system_config/edit', ['section' => 'admin'])
+                $this->getUrl(
+                    'adminhtml/system_config/edit',
+                    ['section' => 'admin', '_fragment' => 'admin_dashboard-link']
+                )
             );
         }
         $this->setChild('diagrams', $block);

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/Model/Auth.php

@@ -145,7 +145,7 @@ public function getCredentialStorage()
     public function login($username, $password)
     {
         if (empty($username) || empty($password)) {
-            self::throwException(__('Please correct the user name or password.'));
+            self::throwException(__('You did not sign in correctly or your account is temporarily disabled.'));
         }
 
         try {
@@ -162,7 +162,7 @@ public function login($username, $password)
             }
 
             if (!$this->getAuthStorage()->getUser()) {
-                self::throwException(__('Please correct the user name or password.'));
+                self::throwException(__('You did not sign in correctly or your account is temporarily disabled.'));
             }
         } catch (PluginAuthenticationException $e) {
             $this->_eventManager->dispatch(
@@ -175,7 +175,9 @@ public function login($username, $password)
                 'backend_auth_user_login_failed',
                 ['user_name' => $username, 'exception' => $e]
             );
-            self::throwException(__($e->getMessage()? : 'Please correct the user name or password.'));
+            self::throwException(
+                __($e->getMessage()? : 'You did not sign in correctly or your account is temporarily disabled.')
+            );
         }
     }
 

app/code/Magento/Backend/Test/Unit/Model/AuthTest.php

@@ -50,7 +50,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\AuthenticationException
-     * @expectedExceptionMessage Please correct the user name or password.
+     * @expectedExceptionMessage You did not sign in correctly or your account is temporarily disabled.
      */
     public function testLoginFailed()
     {
@@ -59,8 +59,9 @@ public function testLoginFailed()
             ->method('create')
             ->with('Magento\Backend\Model\Auth\Credential\StorageInterface')
             ->will($this->returnValue($this->_credentialStorage));
-        $exceptionMock =
-            new \Magento\Framework\Exception\LocalizedException(__('Please correct the user name or password.'));
+        $exceptionMock = new \Magento\Framework\Exception\LocalizedException(
+            __('You did not sign in correctly or your account is temporarily disabled.')
+        );
         $this->_credentialStorage
             ->expects($this->once())
             ->method('login')

app/code/Magento/Backend/i18n/de_DE.csv

@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"

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

@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"

app/code/Magento/Backend/i18n/es_ES.csv

@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"

app/code/Magento/Backend/i18n/fr_FR.csv

@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"

app/code/Magento/Backend/i18n/nl_NL.csv

@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"