Merge pull request #11 from NolanKingdon/MYG-9749-HeaderFix

MYG-9749-HeaderFix

Author: beefo

generators/app/templates/src/.dev/navbar/NavFactory.js

@@ -40,7 +40,7 @@ class NavFactory {
      * @param {object} props subheader object in the props list 
      */
     subHeader(props){
-        let subHead = new SubHeader(props);
+        let subHead = new SubHeader(props, this.language);
         return subHead.returnHTML();
     }
 }
@@ -84,12 +84,13 @@ class OpenSubMenu {
 }
 
 class SubHeader {
-    constructor(props){
+    constructor(props, language){
+        let title = props.labelText[language] ? props.labelText[language] : props.labelText["en"];
         this.html = `
         <li class="mainMenuOption">
             <a class="mainMenuLink" title="The Product Guide provides an introduction to the application and its features." href="#${props.name}">
                 <span class="icon geotabIcons_${props.name}"></span>
-                <div class="ellipsis">${props.labelText}</div>
+                <div class="ellipsis">${title}</div>
             </a>
         </li>`.trim();
     }

generators/app/templates/src/.dev/navbar/props.js

@@ -6,7 +6,9 @@ const props = [
     <% if (path == 'GettingStartedLink/') { %>
     {
        name: 'help', //Used in css and js reference
-       labelText: 'Getting Started &amp; Help', // Displayed to user
+       labelText: {
+           en: 'Getting Started &amp; Help'
+        }, // Displayed to user
        hasSubmenu: true, // Used to build the nav tree
        submenuItems: [
             {
@@ -19,7 +21,9 @@ const props = [
     <% if (path == 'ActivityLink/') { %>
      {
          name: 'activity',
-         labelText: 'Activity',
+         labelText: {
+             en: 'Activity'
+            },
          hasSubmenu: true,
          submenuItems: [
                 {
@@ -32,7 +36,9 @@ const props = [
     <% if (path == 'EngineMaintenanceLink/') { %>
     {
         name: 'engine',
-        labelText: 'Engine &amp; Maintenance',
+        labelText: {
+            en:'Engine &amp; Maintenance'
+        },
         hasSubmenu: true,
         submenuItems: [
                 {
@@ -45,7 +51,9 @@ const props = [
     <% if (path == 'ZoneAndMessagesLink/') { %>
      {
          name: 'zone',
-         labelText: 'Zones &amp; Messages',
+         labelText: {
+             en: 'Zones &amp; Messages'
+            },
          hasSubmenu: true,
          submenuItems: [
                 {
@@ -58,7 +66,9 @@ const props = [
     <% if (path == 'RuleAndGroupsLink/') { %>
      {
         name: 'rule',
-        labelText: 'Rules &amp; Groups',
+        labelText: {
+            en: 'Rules &amp; Groups'
+        },
         hasSubmenu: true,
         submenuItems: [
             {
@@ -71,7 +81,9 @@ const props = [
     <% if (path == 'AdministrationLink/') { %>
      {
         name: 'administration',
-        labelText: 'Administration',
+        labelText: {
+            en: 'Administration'
+        },
         hasSubmenu: true,
         submenuItems: [
                 {