diff options
author | Yoshie Muranaka <yoshiemuranaka@gmail.com> | 2020-02-25 02:42:40 +0300 |
---|---|---|
committer | Yoshie Muranaka <yoshiemuranaka@gmail.com> | 2020-02-26 23:39:55 +0300 |
commit | 547b5fc35b0f658f88414f8628f668af89f62734 (patch) | |
tree | 2bd051f3a16b05cd41995085e898651d76c18013 /src/views | |
parent | 1b1c1005905c0d5a0145377718ad773fe08d0863 (diff) | |
download | webui-vue-547b5fc35b0f658f88414f8628f668af89f62734.tar.xz |
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
Diffstat (limited to 'src/views')
-rw-r--r-- | src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue | 6 | ||||
-rw-r--r-- | src/views/AccessControl/LocalUserManagement/ModalSettings.vue | 28 | ||||
-rw-r--r-- | src/views/Control/RebootBmc/RebootBmc.vue | 2 | ||||
-rw-r--r-- | src/views/Login/Login.vue | 22 | ||||
-rw-r--r-- | src/views/Overview/Overview.vue | 38 | ||||
-rw-r--r-- | src/views/Overview/OverviewEvents.vue | 12 | ||||
-rw-r--r-- | src/views/Overview/OverviewNetwork.vue | 8 | ||||
-rw-r--r-- | src/views/Overview/OverviewQuickLinks.vue | 12 |
8 files changed, 62 insertions, 66 deletions
diff --git a/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue b/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue index ee2ec433..7b337a4f 100644 --- a/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue +++ b/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue @@ -139,15 +139,15 @@ export default { tableToolbarActions: [ { value: 'delete', - labelKey: 'localUserManagement.tableActions.delete' + labelKey: 'global.action.delete' }, { value: 'enable', - labelKey: 'localUserManagement.tableActions.enable' + labelKey: 'global.action.enable' }, { value: 'disable', - labelKey: 'localUserManagement.tableActions.disable' + labelKey: 'global.action.disable' } ] }; diff --git a/src/views/AccessControl/LocalUserManagement/ModalSettings.vue b/src/views/AccessControl/LocalUserManagement/ModalSettings.vue index 2e41b292..650cd560 100644 --- a/src/views/AccessControl/LocalUserManagement/ModalSettings.vue +++ b/src/views/AccessControl/LocalUserManagement/ModalSettings.vue @@ -2,8 +2,8 @@ <b-modal id="modal-settings" ref="modal" - :title="$t('localUserManagement.accountPolicySettings')" - :ok-title="$t('global.actions.save')" + :title="$t('pageLocalUserManagement.accountPolicySettings')" + :ok-title="$t('global.action.save')" @ok="onOk" @hidden="resetForm" > @@ -12,12 +12,14 @@ <b-row> <b-col> <b-form-group - :label="$t('localUserManagement.modals.maxFailedLoginAttempts')" + :label=" + $t('pageLocalUserManagement.modal.maxFailedLoginAttempts') + " label-for="lockout-threshold" > <b-form-text id="lockout-threshold-help-block"> {{ - $t('global.formField.valueMustBeBetween', { + $t('global.form.valueMustBeBetween', { min: 0, max: 65535 }) @@ -33,7 +35,7 @@ /> <b-form-invalid-feedback role="alert"> <template v-if="!$v.form.lockoutThreshold.required"> - {{ $t('global.formField.fieldRequired') }} + {{ $t('global.form.fieldRequired') }} </template> <template v-if=" @@ -42,7 +44,7 @@ " > {{ - $t('global.formField.valueMustBeBetween', { + $t('global.form.valueMustBeBetween', { min: 0, max: 65535 }) @@ -53,7 +55,7 @@ </b-col> <b-col> <b-form-group - :label="$t('localUserManagement.modals.userUnlockMethod')" + :label="$t('pageLocalUserManagement.modal.userUnlockMethod')" > <b-form-radio v-model="form.unlockMethod" @@ -62,7 +64,7 @@ :value="0" @input="$v.form.unlockMethod.$touch()" > - {{ $t('localUserManagement.modals.manual') }} + {{ $t('pageLocalUserManagement.modal.manual') }} </b-form-radio> <b-form-radio v-model="form.unlockMethod" @@ -70,11 +72,13 @@ :value="1" @input="$v.form.unlockMethod.$touch()" > - {{ $t('localUserManagement.modals.automaticAfterTimeout') }} + {{ $t('pageLocalUserManagement.modal.automaticAfterTimeout') }} </b-form-radio> <div class="mt-3 ml-4"> <b-form-text id="lockout-duration-help-block"> - {{ $t('localUserManagement.modals.timeoutDurationSeconds') }} + {{ + $t('pageLocalUserManagement.modal.timeoutDurationSeconds') + }} </b-form-text> <b-form-input v-model.number="form.lockoutDuration" @@ -86,10 +90,10 @@ /> <b-form-invalid-feedback role="alert"> <template v-if="!$v.form.lockoutDuration.required"> - {{ $t('global.formField.fieldRequired') }} + {{ $t('global.form.fieldRequired') }} </template> <template v-else-if="!$v.form.lockoutDuration.minvalue"> - {{ $t('global.formField.mustBeAtLeast', { value: 1 }) }} + {{ $t('global.form.mustBeAtLeast', { value: 1 }) }} </template> </b-form-invalid-feedback> </div> diff --git a/src/views/Control/RebootBmc/RebootBmc.vue b/src/views/Control/RebootBmc/RebootBmc.vue index e301f0df..5d6b42ce 100644 --- a/src/views/Control/RebootBmc/RebootBmc.vue +++ b/src/views/Control/RebootBmc/RebootBmc.vue @@ -28,7 +28,7 @@ export default { this.$bvModal .msgBoxConfirm(this.$t('pageRebootBmc.modal.confirmMessage'), { title: this.$t('pageRebootBmc.modal.confirmTitle'), - okTitle: this.$t('global.actions.confirm') + okTitle: this.$t('global.action.confirm') }) .then(confirmed => { if (confirmed) this.rebootBmc(); diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue index d4fde8cb..10ebb930 100644 --- a/src/views/Login/Login.vue +++ b/src/views/Login/Login.vue @@ -17,12 +17,12 @@ <b-form class="login-form" novalidate @submit.prevent="login"> <b-alert class="login-error" :show="authError" variant="danger"> <p id="login-error-alert"> - <strong>{{ $t('login.errorMsg.title') }}</strong> - <span>{{ $t('login.errorMsg.action') }}</span> + <strong>{{ $t('pageLogin.alert.title') }}</strong> + <span>{{ $t('pageLogin.alert.action') }}</span> </p> </b-alert> <div class="login-form__section"> - <label for="language">{{ $t('login.language.label') }}</label> + <label for="language">{{ $t('pageLogin.language') }}</label> <b-form-select id="language" v-model="$i18n.locale" @@ -30,7 +30,7 @@ ></b-form-select> </div> <div class="login-form__section"> - <label for="username">{{ $t('login.username.label') }}</label> + <label for="username">{{ $t('pageLogin.username') }}</label> <b-form-input id="username" v-model="userInfo.username" @@ -43,12 +43,12 @@ </b-form-input> <b-form-invalid-feedback role="alert"> <template v-if="!$v.userInfo.username.required"> - {{ $t('login.username.validator') }} + {{ $t('global.form.fieldRequired') }} </template> </b-form-invalid-feedback> </div> <div class="login-form__section"> - <label for="password">{{ $t('login.password.label') }}</label> + <label for="password">{{ $t('pageLogin.password') }}</label> <b-form-input id="password" v-model="userInfo.password" @@ -60,7 +60,7 @@ </b-form-input> <b-form-invalid-feedback role="alert"> <template v-if="!$v.userInfo.password.required"> - {{ $t('login.password.validator') }} + {{ $t('global.form.fieldRequired') }} </template> </b-form-invalid-feedback> </div> @@ -70,7 +70,7 @@ type="submit" variant="primary" :disabled="disableSubmitButton" - >{{ $t('login.logIn.label') }}</b-button + >{{ $t('pageLogin.logIn') }}</b-button > </b-form> </b-col> @@ -94,14 +94,14 @@ export default { }, disableSubmitButton: false, languages: [ - { value: null, text: this.$t('login.languages.select') }, + { value: null, text: this.$t('global.form.selectAnOption') }, { value: 'en', - text: this.$t('login.languages.english') + text: this.$t('pageLogin.form.english') }, { value: 'es', - text: this.$t('login.languages.spanish') + text: this.$t('pageLogin.form.spanish') } ] }; 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> |