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/AccessControl | |
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/AccessControl')
-rw-r--r-- | src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue | 6 | ||||
-rw-r--r-- | src/views/AccessControl/LocalUserManagement/ModalSettings.vue | 28 |
2 files changed, 19 insertions, 15 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> |