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

2 files changed, 10 insertions, 14 deletions

diff --git a/src/store/modules/AccessControl/LocalUserMangementStore.js b/src/store/modules/AccessControl/LocalUserMangementStore.js
index 7ad3ff50..ab314fb8 100644
--- a/src/store/modules/AccessControl/LocalUserMangementStore.js
+++ b/src/store/modules/AccessControl/LocalUserMangementStore.js
@@ -154,7 +154,7 @@ const LocalUserManagementStore = {
 
             if (successCount) {
               const message = i18n.tc(
-                'localUserManagement.toastMessages.successDeleteUsers',
+                'pageLocalUserManagement.toast.successDeleteUsers',
                 successCount
               );
               toastMessages.push({ type: 'success', message });
@@ -162,7 +162,7 @@ const LocalUserManagementStore = {
 
             if (errorCount) {
               const message = i18n.tc(
-                'localUserManagement.toastMessages.errorDeleteUsers',
+                'pageLocalUserManagement.toast.errorDeleteUsers',
                 errorCount
               );
               toastMessages.push({ type: 'error', message });
@@ -197,7 +197,7 @@ const LocalUserManagementStore = {
 
             if (successCount) {
               const message = i18n.tc(
-                'localUserManagement.toastMessages.successEnableUsers',
+                'pageLocalUserManagement.toast.successEnableUsers',
                 successCount
               );
               toastMessages.push({ type: 'success', message });
@@ -205,7 +205,7 @@ const LocalUserManagementStore = {
 
             if (errorCount) {
               const message = i18n.tc(
-                'localUserManagement.toastMessages.errorEnableUsers',
+                'pageLocalUserManagement.toast.errorEnableUsers',
                 errorCount
               );
               toastMessages.push({ type: 'error', message });
@@ -240,7 +240,7 @@ const LocalUserManagementStore = {
 
             if (successCount) {
               const message = i18n.tc(
-                'localUserManagement.toastMessages.successDisableUsers',
+                'pageLocalUserManagement.toast.successDisableUsers',
                 successCount
               );
               toastMessages.push({ type: 'success', message });
@@ -248,7 +248,7 @@ const LocalUserManagementStore = {
 
             if (errorCount) {
               const message = i18n.tc(
-                'localUserManagement.toastMessages.errorDisableUsers',
+                'pageLocalUserManagement.toast.errorDisableUsers',
                 errorCount
               );
               toastMessages.push({ type: 'error', message });
@@ -274,13 +274,11 @@ const LocalUserManagementStore = {
         .patch('/redfish/v1/AccountService', data)
         //GET new settings to update view
         .then(() => dispatch('getAccountSettings'))
-        .then(() =>
-          i18n.t('localUserManagement.toastMessages.successSaveSettings')
-        )
+        .then(() => i18n.t('pageLocalUserManagement.toast.successSaveSettings'))
         .catch(error => {
           console.log(error);
           const message = i18n.t(
-            'localUserManagement.toastMessages.errorSaveSettings'
+            'pageLocalUserManagement.toast.errorSaveSettings'
           );
           throw new Error(message);
         });
diff --git a/src/store/modules/Control/ControlStore.js b/src/store/modules/Control/ControlStore.js
index f6415771..9b2e4592 100644
--- a/src/store/modules/Control/ControlStore.js
+++ b/src/store/modules/Control/ControlStore.js
@@ -8,12 +8,10 @@ const ControlStore = {
       const data = { ResetType: 'GracefulRestart' };
       return await api
         .post('/redfish/v1/Managers/bmc/Actions/Manager.Reset', data)
-        .then(() => i18n.t('pageRebootBmc.toastMessages.successRebootStart'))
+        .then(() => i18n.t('pageRebootBmc.toast.successRebootStart'))
         .catch(error => {
           console.log(error);
-          throw new Error(
-            i18n.t('pageRebootBmc.toastMessages.errorRebootStart')
-          );
+          throw new Error(i18n.t('pageRebootBmc.toast.errorRebootStart'));
         });
     }
   }