From d183914effe82387b912a5a9706c4568470aa1eb Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Mon, 11 May 2020 18:08:00 +0800 Subject: [PATCH] i18n --- .../components/common/head/HeaderUser.vue | 15 +++++++-------- frontend/src/i18n/en-US.js | 6 ++++++ frontend/src/i18n/zh-CN.js | 6 ++++++ 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/frontend/src/business/components/common/head/HeaderUser.vue b/frontend/src/business/components/common/head/HeaderUser.vue index 59e63f8500..850de54763 100644 --- a/frontend/src/business/components/common/head/HeaderUser.vue +++ b/frontend/src/business/components/common/head/HeaderUser.vue @@ -33,8 +33,8 @@ @@ -62,16 +62,16 @@ data() { return { organizationList: [ - {index: '7-1', name: '无组织'}, + {index: '7-1', name: this.$t('organization.none')}, ], workspaceList: [ - {index: '2-1', name: '无工作空间'}, + {index: '2-1', name: this.$t('workspace.none')}, ], currentUserInfo: {}, currentUserId: getCurrentUser().id, workspaceIds: [], - currentOrganizationName: '选择组织', - currentWorkspaceName: '选择工作空间' + currentOrganizationName: this.$t('organization.select'), + currentWorkspaceName: this.$t('workspace.select') } }, computed: { @@ -113,7 +113,7 @@ this.$get("/workspace/list/orgworkspace/", response => { let data = response.data; if (data.length === 0) { - this.workspaceList = [{index: '1-1', name: '无工作区间'}] + this.workspaceList = [{index: '1-1', name: this.$t('workspace.none')}] } else { this.workspaceList = data; let workspace = data.filter(r => r.id === this.currentUser.lastWorkspaceId); @@ -122,7 +122,6 @@ localStorage.setItem(WORKSPACE_ID, workspace[0].id); } } - // this.workspaceIds = response.data.map(r = r.id); }) } }, diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index 81307a209b..b01c83d1fe 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -51,6 +51,8 @@ export default { 'delete': 'Delete', 'not_filled': 'Not filled', 'search_by_name': 'Search by name', + 'personal_information': 'Personal Information', + 'exit_system': 'Exit System', }, workspace: { 'create': 'Create Workspace', @@ -62,6 +64,8 @@ export default { 'organization_name': 'Organization Name', 'please_choose_organization': 'Please Choose Organization', 'please_select_a_workspace_first': 'Please select a workspace first!', + 'none': 'None Workspace', + 'select': 'Select Workspace', }, organization: { 'create': 'Create', @@ -71,6 +75,8 @@ export default { 'select_organization': 'Please select organization', 'search_by_name': 'Search by name', 'special_characters_are_not_supported': 'Special characters are not supported', + 'none': 'None Organization', + 'select': 'Select Organization', }, project: { 'recent': 'Recent Projects', diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index 72d8a0fe6c..3e5a11189b 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -53,6 +53,8 @@ export default { 'not_filled': '未填写', 'please_select': '请选择', 'search_by_name': '根据名称搜索', + 'personal_information': '个人信息', + 'exit_system': '退出系统', }, workspace: { 'create': '创建工作空间', @@ -64,6 +66,8 @@ export default { 'organization_name': '所属组织', 'please_choose_organization': '请选择组织', 'please_select_a_workspace_first': '请先选择工作空间!', + 'none': '无工作空间', + 'select': '选择工作区间', }, organization: { 'create': '创建组织', @@ -73,6 +77,8 @@ export default { 'select_organization': '请选择组织', 'search_by_name': '根据名称搜索', 'special_characters_are_not_supported': '不支持特殊字符', + 'none': '无组织', + 'select': '选择组织', }, project: { 'recent': '最近的项目',