MAGETWO-44043: Wording error in readiness check

- Fixes for all possible uses of readiness-check

Author: mazhalai

setup/pub/magento/setup/component-grid.js

@@ -117,7 +117,12 @@ angular.module('component-grid', ['ngStorage'])
                 if ($localStorage.titles['update'].indexOf(component.moduleName) < 0 ) {
                     $localStorage.titles['update'] = 'Update ' + component.moduleName;
                 }
-                $localStorage.moduleName = component.moduleName;
+                if (component.moduleName) {
+                    $localStorage.moduleName = component.moduleName;
+                } else {
+                    $localStorage.moduleName = component.name;
+                }
+
                 $scope.nextState();
             };
 
@@ -131,7 +136,11 @@ angular.module('component-grid', ['ngStorage'])
                     $localStorage.titles['uninstall'] = 'Uninstall ' + component.moduleName;
                 }
                 $localStorage.componentType = component.type;
-                $localStorage.moduleName = component.moduleName;
+                if (component.moduleName) {
+                    $localStorage.moduleName = component.moduleName;
+                } else {
+                    $localStorage.moduleName = component.name;
+                }
                 $state.go('root.readiness-check-uninstall');
             };
 

setup/pub/magento/setup/readiness-check.js

@@ -334,4 +334,27 @@ angular.module('readiness-check', [])
                 $scope.progress();
             }
         });
+
+        $scope.wordingOfReadinessCheckAction = function() {
+            var $actionString = 'We\'re making sure your server environment is ready for ';
+            if ($localStorage.moduleName) {
+                $actionString += $localStorage.moduleName;
+            } else {
+                if($state.current.type === 'install' || $state.current.type === 'upgrade') {
+                    $actionString += 'Magento';
+                    if ($state.current.type === 'upgrade' && $localStorage.packages.length > 1 ) {
+                        $actionString += ' and Selected Components';
+                    }
+                } else {
+                    $actionString += $localStorage.titles[$state.current.type];
+                }
+            }
+            $actionString += " to be " + $state.current.type;
+            if ($scope.endsWith($state.current.type, 'e')) {
+                $actionString += 'd';
+            } else {
+                $actionString +='ed';
+            }
+            return $actionString;
+        }
     }]);

setup/view/magento/setup/readiness-check/progress.phtml

@@ -30,9 +30,7 @@
             <span></span><span></span><span></span><span></span>
             <span></span><span></span><span></span><span></span>
         </span>
-        <span class="message-text">We're making sure your server environment is ready for
-        {{moduleName ? moduleName : ($state.current.type === 'install'? 'Magento' : titles[$state.current.type])}}
-            to be {{$state.current.type}}{{endsWith($state.current.type, 'e') ? 'd' : 'ed'}}.</span>
+        <span class="message-text">{{wordingOfReadinessCheckAction()}}.</span>
     </div>
 
 </div>