diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index 891ac800e4..d566bf61da 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -36,13 +36,15 @@ export default { delete_success: 'Delete success', no_auth_tips: 'Missing menu permissions, please contact the administrator' }, - date: { - permanent: 'Permanent', - one_year: 'One year', - six_months: 'Six months', - three_months: 'Three months', - of_range_1_59: 'Minutes out of range [1-59]', - of_range_1_23: 'Hours out of range [1-23]' + commons: { + date: { + permanent: 'Permanent', + one_year: 'One year', + six_months: 'Six months', + three_months: 'Three months', + of_range_1_59: 'Minutes out of range [1-59]', + of_range_1_23: 'Hours out of range [1-23]' + } }, system: { click_to_show: 'Click to show', diff --git a/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue b/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue index 1af9fef037..a369b88eb4 100644 --- a/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue +++ b/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue @@ -13,11 +13,11 @@ const options = [ { value: 'hour', label: t('system.and_0_seconds_de') } ] const pvpOptions = [ - { value: '0', label: t('date.permanent') }, - { value: '1', label: t('date.one_year') }, - { value: '2', label: t('date.six_months') }, - { value: '3', label: t('date.three_months') }, - { value: '4', label: t('date.one_month') } + { value: '0', label: t('commons.date.permanent') }, + { value: '1', label: t('commons.date.one_year') }, + { value: '2', label: t('commons.date.six_months') }, + { value: '3', label: t('commons.date.three_months') }, + { value: '4', label: t('commons.date.one_month') } ] const state = reactive({ @@ -69,14 +69,14 @@ const submitForm = async (formEl: FormInstance | undefined) => { state.form.dsExecuteTime === 'minute' && (Number(state.form.dsIntervalTime) < 1 || Number(state.form.dsIntervalTime) > 59) ) { - ElMessage.error(t('date.of_range_1_59')) + ElMessage.error(t('commons.date.of_range_1_59')) return } if ( state.form.dsExecuteTime === 'hour' && (Number(state.form.dsIntervalTime) < 1 || Number(state.form.dsIntervalTime) > 23) ) { - ElMessage.error(t('date.of_range_1_23')) + ElMessage.error(t('commons.date.of_range_1_23')) return } const param = buildSettingList() diff --git a/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue b/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue index 8f3bf3fdd9..caae130231 100644 --- a/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue +++ b/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue @@ -24,11 +24,11 @@ const editor = ref() const infoTemplate = ref() const showDefaultLogin = ref(false) const pvpOptions = [ - { value: '0', label: t('date.permanent') }, - { value: '1', label: t('date.one_year') }, - { value: '2', label: t('date.six_months') }, - { value: '3', label: t('date.three_months') }, - { value: '4', label: t('date.one_month') } + { value: '0', label: t('commons.date.permanent') }, + { value: '1', label: t('commons.date.one_year') }, + { value: '2', label: t('commons.date.six_months') }, + { value: '3', label: t('commons.date.three_months') }, + { value: '4', label: t('commons.date.one_month') } ] const tooltips = [ { @@ -89,7 +89,7 @@ const search = cb => { item.pkey === 'basic.dip' || item.pkey === 'basic.pwdStrategy' ) { - item.pval = item.pval === 'true' ? t('.chart.open') : t('system.not_enabled') + item.pval = item.pval === 'true' ? t('chart.open') : t('system.not_enabled') } else if (item.pkey === 'basic.platformOid') { selectedOid.value = item.pval await loadOrgOptions()