diff --git a/cmdb-ui/src/locales/lang/en-US.js b/cmdb-ui/src/locales/lang/en-US.js index 93bb5ae..750f417 100644 --- a/cmdb-ui/src/locales/lang/en-US.js +++ b/cmdb-ui/src/locales/lang/en-US.js @@ -1,11 +1,11 @@ +/* eslint-disable */ import enUS from 'ant-design-vue/es/locale-provider/en_US' - export default { antLocale: enUS, menu: { preference: 'Preference', relationViews: 'RelationViews', - treeViews: 'Treeviews', + treeViews: 'TreeViews', batch: 'Batch', ciType: 'CiType', acl: 'ACL', @@ -32,13 +32,40 @@ export default { upload: 'Upload' }, tip: { - subscribed: 'Subscribedu', + subscribed: 'Subscribed', unsubscribed: 'Unsubscribed', unfold: 'Unfold', fold: 'Fold', detail: 'Detail', delete: 'Delete', edit: 'Edit', - operate: 'Operate' + operate: 'Operate', + clear: 'Clear', + modify: 'Modify', + pleaseSelect: 'please select' + }, + ci: { + selected: 'Selected', + batchOperate: 'Batch operate' + + }, + preference: { + subscribeModel: 'Subscribe Model', + resourceView: 'Resource View', + subFormTip: 'You can either define a tree view or subscribe to a resource view, which will be presented separately in sidebar' + }, + batch: { + modelType: 'Model Type', + pleaseSelectModelType: 'please select model type', + uploadResult: 'upload result', + dragFileHere: 'click or drag file to here!', + suportFileType: 'suport file type' + }, + ciType: { + add: 'Add', + editModel: 'edit model', + modelName: 'model name', + alias: 'alias', + uniqueFlag: 'unique flag' } } diff --git a/cmdb-ui/src/locales/lang/zh-CN.js b/cmdb-ui/src/locales/lang/zh-CN.js index 5ce5be2..cc382b6 100644 --- a/cmdb-ui/src/locales/lang/zh-CN.js +++ b/cmdb-ui/src/locales/lang/zh-CN.js @@ -1,3 +1,4 @@ +/* eslint-disable */ import zhCN from 'ant-design-vue/es/locale-provider/zh_CN' export default { antLocale: zhCN, @@ -38,6 +39,33 @@ export default { detail: '详情', delete: '删除', edit: '编辑', - operate: '操作' + operate: '操作', + clear: '清空', + modify: '修改', + pleaseSelect: '请选择' + }, + ci: { + selected: '已选择', + batchOperate: '批量操作' + + }, + preference: { + subscribeModel: '订阅模型', + resourceView: '资源视图', + subFormTip: '既可以定义树形视图, 也可以订阅资源视图, 资源视图会在SideBar单独呈现' + }, + batch: { + modelType: '模板类型', + pleaseSelectModelType: '请选择模板类型', + uploadResult: '上传结果', + dragFileHere: '点击或拖拽文件至此上传!', + suportFileType: '支持文件类型' + }, + ciType: { + add: '新增', + editModel: '编辑模型', + modelName: '模型名(英文)', + alias: '别名', + uniqueFlag: '唯一标识' } } diff --git a/cmdb-ui/src/views/cmdb/batch/index.vue b/cmdb-ui/src/views/cmdb/batch/index.vue index 58d6e8f..2f3278b 100644 --- a/cmdb-ui/src/views/cmdb/batch/index.vue +++ b/cmdb-ui/src/views/cmdb/batch/index.vue @@ -14,7 +14,7 @@
- +
diff --git a/cmdb-ui/src/views/cmdb/batch/modules/CiTypeChoice.vue b/cmdb-ui/src/views/cmdb/batch/modules/CiTypeChoice.vue index 14af6ae..7cc3775 100644 --- a/cmdb-ui/src/views/cmdb/batch/modules/CiTypeChoice.vue +++ b/cmdb-ui/src/views/cmdb/batch/modules/CiTypeChoice.vue @@ -3,9 +3,9 @@ - + diff --git a/cmdb-ui/src/views/cmdb/batch/modules/UploadFileForm.vue b/cmdb-ui/src/views/cmdb/batch/modules/UploadFileForm.vue index e140c6c..a972424 100644 --- a/cmdb-ui/src/views/cmdb/batch/modules/UploadFileForm.vue +++ b/cmdb-ui/src/views/cmdb/batch/modules/UploadFileForm.vue @@ -5,8 +5,8 @@

-

点击或拖拽文件至此上传!

-

支持文件类型:xls

+

{{ $t('batch.dragFileHere') }}

+

{{ $t('batch.suportFileType') }} : xls

or diff --git a/cmdb-ui/src/views/cmdb/ci/index.vue b/cmdb-ui/src/views/cmdb/ci/index.vue index 5577dc7..62ceca3 100644 --- a/cmdb-ui/src/views/cmdb/ci/index.vue +++ b/cmdb-ui/src/views/cmdb/ci/index.vue @@ -23,7 +23,7 @@ -  {{ $t('tip.download') }} +  下载 @@ -31,7 +31,7 @@ - 批量操作 + {{ $t('ci.batchOperate') }} diff --git a/cmdb-ui/src/views/cmdb/preference/index.vue b/cmdb-ui/src/views/cmdb/preference/index.vue index 6d00e23..9df29dd 100644 --- a/cmdb-ui/src/views/cmdb/preference/index.vue +++ b/cmdb-ui/src/views/cmdb/preference/index.vue @@ -31,15 +31,15 @@