Update language json structure

Restructure language file to use consistent pattern
across pages following loose guidelines.

- Create buckets for common global labels
- Create common component objects–appHeader, appNavigation,
  appPageTitle
- Page specific labels should be nested in an object with a
  key prefixed with 'page' followed by the page title
- Any 'major' child components should be nested inside page
  specific objects
- Avoid any complex linked locale messages
- Alphabetize object keys, alphabetize nested properties at
  end of object block

Signed-off-by: Yoshie Muranaka <yoshiemuranaka@gmail.com>
Change-Id: Ie4222b3ce24dec7af31b55b5a77425ca2f492789

4 files changed, 31 insertions, 39 deletions

diff --git a/src/views/Overview/Overview.vue b/src/views/Overview/Overview.vue
index 17d66849..5d2ede53 100644
--- a/src/views/Overview/Overview.vue
+++ b/src/views/Overview/Overview.vue
@@ -6,13 +6,11 @@
     </div>
     <b-row>
       <b-col>
-        <page-section
-          :section-title="$t('overview.sectionTitle.serverInformation')"
-        >
+        <page-section :section-title="$t('pageOverview.bmcInformation')">
           <b-row>
             <b-col>
               <dl>
-                <dt>Firmware version</dt>
+                <dt>{{ $t('pageOverview.firmwareVersion') }}</dt>
                 <dd>{{ bmcActiveVersion }}</dd>
               </dl>
             </b-col>
@@ -21,7 +19,7 @@
         <b-row>
           <b-col>
             <page-section
-              :section-title="$t('overview.sectionTitle.networkInformation')"
+              :section-title="$t('pageOverview.networkInformation')"
             >
               <overview-network />
             </page-section>
@@ -29,61 +27,55 @@
         </b-row>
       </b-col>
       <b-col>
-        <page-section section-title="Server information">
+        <page-section :section-title="$t('pageOverview.serverInformation')">
           <b-row>
             <b-col sm="6">
               <dl>
-                <dt>{{ $t('overview.model') }}</dt>
+                <dt>{{ $t('pageOverview.model') }}</dt>
                 <dd>{{ serverModel }}</dd>
               </dl>
             </b-col>
             <b-col sm="6">
               <dl>
-                <dt>{{ $t('overview.manufacturer') }}</dt>
+                <dt>{{ $t('pageOverview.manufacturer') }}</dt>
                 <dd>{{ serverManufacturer }}</dd>
               </dl>
             </b-col>
             <b-col sm="6">
               <dl>
-                <dt>{{ $t('overview.serialNumber') }}</dt>
+                <dt>{{ $t('pageOverview.serialNumber') }}</dt>
                 <dd>{{ serverSerialNumber }}</dd>
               </dl>
             </b-col>
             <b-col sm="6">
               <dl>
-                <dt>{{ $t('overview.firmwareVersion') }}</dt>
+                <dt>{{ $t('pageOverview.firmwareVersion') }}</dt>
                 <dd>{{ hostActiveVersion }}</dd>
               </dl>
             </b-col>
           </b-row>
         </page-section>
-        <page-section
-          :section-title="$t('overview.sectionTitle.powerConsumption')"
-        >
+        <page-section :section-title="$t('pageOverview.powerConsumption')">
           <b-row>
             <b-col sm="6">
               <dl>
-                <dt>{{ $t('overview.powerConsumption') }}</dt>
-                <dd v-if="!powerConsumption">
-                  {{ $t('global.state.notAvailable') }}
-                </dd>
-                <dd v-else>{{ powerConsumption }} W</dd>
+                <dt>{{ $t('pageOverview.powerConsumption') }}</dt>
+                <dd v-if="powerConsumption">{{ powerConsumption }} W</dd>
+                <dd v-else>{{ $t('global.status.notAvailable') }}</dd>
               </dl>
             </b-col>
             <b-col sm="6">
               <dl>
-                <dt>{{ $t('overview.powerCap') }}</dt>
+                <dt>{{ $t('pageOverview.powerCap') }}</dt>
                 <dd v-if="powerCapData">{{ powerCapData }} W</dd>
-                <dd v-else>{{ $t('global.state.notEnabled') }}</dd>
+                <dd v-else>{{ $t('global.status.disabled') }}</dd>
               </dl>
             </b-col>
           </b-row>
         </page-section>
       </b-col>
     </b-row>
-    <page-section
-      :section-title="$t('overview.sectionTitle.highPriorityEvents')"
-    >
+    <page-section :section-title="$t('pageOverview.highPriorityEvents')">
       <overview-events />
     </page-section>
   </b-container>
diff --git a/src/views/Overview/OverviewEvents.vue b/src/views/Overview/OverviewEvents.vue
index b85142b8..2004aa53 100644
--- a/src/views/Overview/OverviewEvents.vue
+++ b/src/views/Overview/OverviewEvents.vue
@@ -1,12 +1,12 @@
 <template>
   <div>
     <div v-if="eventLogData.length == 0">
-      {{ $t('overview.events.noHighEventsMsg') }}
+      {{ $t('pageOverview.events.noHighEventsMsg') }}
     </div>
     <div v-else>
       <!-- TODO: link to event log -->
       <b-button variant="link" href="#">
-        {{ $t('overview.events.viewAllButton') }}
+        {{ $t('pageOverview.events.viewAllButton') }}
       </b-button>
       <b-table
         head-variant="dark"
@@ -34,19 +34,19 @@ export default {
       fields: [
         {
           key: 'logId',
-          label: this.$t('overview.events.id')
+          label: this.$t('pageOverview.events.id')
         },
         {
           key: 'eventID',
-          label: this.$t('overview.events.refCode')
+          label: this.$t('pageOverview.events.refCode')
         },
         {
           key: 'timestamp',
-          label: this.$t('overview.events.date')
+          label: this.$t('pageOverview.events.date')
         },
         {
           key: 'description',
-          label: this.$t('overview.events.description')
+          label: this.$t('pageOverview.events.description')
         }
       ]
     };
diff --git a/src/views/Overview/OverviewNetwork.vue b/src/views/Overview/OverviewNetwork.vue
index 69a727de..ea338b39 100644
--- a/src/views/Overview/OverviewNetwork.vue
+++ b/src/views/Overview/OverviewNetwork.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div v-if="ethernetData.length === 0">
-      {{ $t('global.state.notAvailable') }}
+      {{ $t('global.status.notAvailable') }}
     </div>
     <div
       v-for="ethernetInterface in ethernetData"
@@ -14,19 +14,19 @@
       <b-row>
         <b-col md="12" lg="4">
           <dl>
-            <dt>{{ $t('overview.network.hostname') }}</dt>
+            <dt>{{ $t('pageOverview.network.hostname') }}</dt>
             <dd>{{ ethernetInterface.HostName }}</dd>
           </dl>
         </b-col>
         <b-col md="12" lg="4">
           <dl>
-            <dt>{{ $t('overview.network.macAddress') }}</dt>
+            <dt>{{ $t('pageOverview.network.macAddress') }}</dt>
             <dd>{{ ethernetInterface.MACAddress }}</dd>
           </dl>
         </b-col>
         <b-col md="12" lg="4">
           <dl>
-            <dt>{{ $t('overview.network.ipAddress') }}</dt>
+            <dt>{{ $t('pageOverview.network.ipAddress') }}</dt>
             <dd
               v-for="(ip, $index) in ethernetInterface.IPv4Addresses"
               :key="$index"
diff --git a/src/views/Overview/OverviewQuickLinks.vue b/src/views/Overview/OverviewQuickLinks.vue
index 036576da..0dc7adff 100644
--- a/src/views/Overview/OverviewQuickLinks.vue
+++ b/src/views/Overview/OverviewQuickLinks.vue
@@ -2,22 +2,22 @@
   <div class="quicklinks">
     <div>
       <dl>
-        <dt>{{ $t('overview.quicklinks.bmcTime') }}</dt>
+        <dt>{{ $t('pageOverview.quicklinks.bmcTime') }}</dt>
         <dd>{{ bmcTime | date('MMM, DD YYYY HH:MM:SS A ZZ') }}</dd>
       </dl>
     </div>
     <div>
       <!-- TODO: add toggle LED on/off funtionality -->
       <dl>
-        <dt>{{ $t('overview.quicklinks.serverLed') }}</dt>
+        <dt>{{ $t('pageOverview.quicklinks.serverLed') }}</dt>
         <dd>
           <b-form-checkbox
             v-model="serverLedChecked"
             name="check-button"
             switch
           >
-            <span v-if="!serverLedChecked">{{ $t('global.on') }}</span>
-            <span v-else>{{ $t('global.off') }}</span>
+            <span v-if="serverLedChecked">{{ $t('global.status.on') }}</span>
+            <span v-else>{{ $t('global.status.off') }}</span>
           </b-form-checkbox>
         </dd>
       </dl>
@@ -29,7 +29,7 @@
         variant="secondary"
         class="d-flex justify-content-between align-items-center"
       >
-        <span>{{ $t('overview.quicklinks.editNetworkSettings') }}</span>
+        <span>{{ $t('pageOverview.quicklinks.editNetworkSettings') }}</span>
         <icon-arrow-right />
       </b-button>
     </div>
@@ -40,7 +40,7 @@
         variant="secondary"
         class="d-flex justify-content-between align-items-center"
       >
-        <span>{{ $t('overview.quicklinks.solConsole') }}</span>
+        <span>{{ $t('pageOverview.quicklinks.solConsole') }}</span>
         <icon-arrow-right />
       </b-button>
     </div>