Skip to content

Commit

Permalink
fix(个人信息): 汉化问题
Browse files Browse the repository at this point in the history
--bug=1008018 --user=郭雨琦【个人信息】个人信息-第三方平台,汉化问题
  • Loading branch information
xiaomeinvG authored and liuruibin committed Nov 20, 2021
1 parent 774ad9f commit 3d1b86e
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<el-button-group v-if="isShowChangeButton">

<el-tooltip v-if="leftButtonEnable" class="item" effect="dark" :content="leftTip" placement="left">
<el-button plain style="width: 44px;height: 32px;padding: 5px 8px;" :class="{active: leftActive}" @click="changeTab('left')">{{leftContent}}</el-button>
<el-button plain style="height: 32px;padding: 5px 8px;" :class="{active: leftActive}" @click="changeTab('left')">{{leftContent}}</el-button>
</el-tooltip>

<el-tooltip v-if="middleButtonEnable" class="item" effect="dark" :content="middleTip" placement="top">
<el-button plain style="width: 44px;height: 32px;padding: 1px;" :class="{active: middleActive}" @click="changeTab('middle')">{{middleContent}}</el-button>
<el-button plain style="height: 32px;padding: 1px;" :class="{active: middleActive}" @click="changeTab('middle')">{{middleContent}}</el-button>
</el-tooltip>

<el-tooltip v-if="rightButtonEnable" class="item" effect="dark" :content="rightTip" placement="right">
<el-button plain style="width: 44px;height: 32px;padding: 1px;" :class="{active: rightActive}" @click="changeTab('right')">
<el-button plain style="height: 32px;padding: 1px;" :class="{active: rightActive}" @click="changeTab('right')">
{{rightContent}}
</el-button>
</el-tooltip>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<el-form label-position="right" label-width="110px" size="small">
<el-form-item :label="'Jira 信息'">
<ms-instructions-icon size="10" :content="'该信息为通过Jira提交缺陷的用户认证信息,若未填写,则使用工作空间中配置的默认信息'"/>
<el-form-item :label="'Jira '+ $t('commons.information')">
<ms-instructions-icon size="10" :content="$t('organization.message.integration.jira_prompt_information')"/>
</el-form-item>
<el-form-item :label="'Jira ' + $t('organization.integration.account')" prop="account">
<el-input v-model="data.jiraAccount" :placeholder="$t('organization.integration.input_api_account')"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<template>
<el-form label-position="right" label-width="100px" size="small">
<el-form-item :label="'Tapd 昵称'">
<el-form label-position="right" label-width="115px" size="small">
<el-form-item :label="'Tapd '+ $t('commons.nick_name')">
<ms-instructions-icon size="10" effect="light">
<template>
<img class="jira-image" src="../../../../assets/tapd-user.png"/>
</template>
</ms-instructions-icon>
</el-form-item>
<el-form-item :label="'Tapd 昵称'" prop="account">
<el-form-item :label="'Tapd '+ $t('commons.nick_name')" prop="account">
<el-input v-model="data.tapdUserName" :placeholder="$t('organization.integration.input_api_account')"/>
</el-form-item>
<!-- <el-form-item >-->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<template>
<el-form label-position="right" label-width="110px" size="small">
<el-form-item :label="'禅道信息'">
<ms-instructions-icon size="10" :content="'该信息为通过禅道提交缺陷的的用户名、密码,若未填写,则使用工作空间中配置的默认信息'"/>
<el-form label-position="right" label-width="135px" size="small">
<el-form-item :label="$t('organization.integration.zentao_info')">
<ms-instructions-icon size="10" :content="$t('organization.integration.zentao_prompt_information')"/>
</el-form-item>
<el-form-item :label="'禅道' + $t('organization.integration.account')" prop="account">
<el-form-item :label="$t('organization.integration.zentao_account')" prop="account">
<el-input v-model="data.zentaoUserName" :placeholder="$t('organization.integration.input_api_account')"/>
</el-form-item>
<el-form-item :label="'禅道' + $t('organization.integration.password')" prop="password">
<el-form-item :label="$t('organization.integration.zentao_password')" prop="password">
<el-input v-model="data.zentaoPassword" auto-complete="new-password"
:placeholder="$t('organization.integration.input_api_password')" show-password/>
</el-form-item>
Expand Down
20 changes: 18 additions & 2 deletions frontend/src/i18n/en-US.js
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,13 @@ export default {
system_workspace: "Workspace",
system_project: "Project",
user_unit: "",
workspace_unit: ""
workspace_unit: "",
dash_board:'Dash board',
all_project:'All Project',
to_be_completed:'To be completed',
pending_upgrade:'Pending upgrade',
information:'Information',
nick_name:'Nick name'
},
license: {
title: 'Authorization management',
Expand All @@ -356,15 +362,20 @@ export default {
upcoming: 'My Upcoming',
focus: 'My Focus',
creation: 'My Creation',
creation_case:'My Creation Case',
creation_issue:'My Creation Issue',
creation_case_tip: 'No use case has been created yet, create it now',
creation_issue_tip:'No defects have been created yet, create them now',
table_name:{
track_case:'Track Case',
track_plan:'Track Plan',
track_review:'Track Review',
track_issue:'Track issue',
track_issue:'Track Issue',
api_definition:'Api Definition',
api_automation:'Api Automation',
api_case:'Api Case',
performance:'Performance',
scenario_case:'Scenario Case'
}
},
display: {
Expand Down Expand Up @@ -518,6 +529,10 @@ export default {
zentao_request: 'Zentao request',
input_zentao_request: 'Please enter zentao request type',
input_zentao_url: 'Please enter Zentao address, for example: http://xx.xx.xx.xx/zentao/',
zentao_info:'Zentao Information',
zentao_account:'Zentao Account',
zentao_password:'Zentao Password',
zentao_prompt_information:'This information is the username and password of the user who submitted the defect through ZenTao. If not filled in, the default information configured in the workspace will be used',
use_tip: 'Usage guidelines:',
use_tip_tapd: 'Basic Auth account information is queried in "Company Management-Security and Integration-Open Platform"',
use_tip_jira: 'Jira software server authentication information is account password, Jira software cloud authentication information is account + token (account settings-security-create API token)',
Expand All @@ -543,6 +558,7 @@ export default {
input_azure_url: 'Please enter Azure Devops Url',
input_azure_id: 'Please enter Azure Organization ID',
use_tip_azure: 'Azure Devops URL+PersonalAccessTokens(User Settings-Personal Access Tokens-New Token)',
jira_prompt_information:'This information is the user authentication information for submitting defects through Jira. If it is not filled in, the default information configured in the workspace will be used'
}
},
project: {
Expand Down
18 changes: 17 additions & 1 deletion frontend/src/i18n/zh-CN.js
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,13 @@ export default {
system_workspace: "工作空间",
system_project: "项目",
user_unit: "人",
workspace_unit: "个"
workspace_unit: "个",
dash_board:'仪表盘',
all_project:'全部项目',
to_be_completed:'待完成',
pending_upgrade:'待更新',
information:'信息',
nick_name:'昵称'
},
license: {
title: '授权管理',
Expand All @@ -357,6 +363,10 @@ export default {
upcoming: '我的待办',
focus: '我的关注',
creation: '我创建的',
creation_case:'我创建的用例',
creation_issue:'我创建的缺陷',
creation_case_tip:'暂时还没有创建用例,马上创建',
creation_issue_tip:'暂时还没有创建缺陷,马上创建',
table_name:{
track_case:'功能用例',
track_plan:'测试计划',
Expand All @@ -366,6 +376,7 @@ export default {
api_automation:'接口自动化',
api_case:'接口用例',
performance:'性能测试',
scenario_case:'场景用例'
}
},
display: {
Expand Down Expand Up @@ -521,6 +532,10 @@ export default {
zentao_request: '请求方式',
input_zentao_request: '请输入Zentao请求方式',
input_zentao_url: '请输入Zentao地址,例:http://xx.xx.xx.xx/zentao/',
zentao_info:'禅道信息',
zentao_account:'禅道账户',
zentao_password:'禅道密码',
zentao_prompt_information:'该信息为通过禅道提交缺陷的的用户名、密码,若未填写,则使用工作空间中配置的默认信息',
use_tip: '使用指引:',
use_tip_tapd: 'Tapd Basic Auth 账号信息在"公司管理-安全与集成-开放平台"中查询',
use_tip_jira: 'Jira software server 认证信息为 账号密码,Jira software cloud 认证信息为 账号+令牌(账户设置-安全-创建API令牌)',
Expand All @@ -547,6 +562,7 @@ export default {
input_azure_url: '请输入 Azure Devops 地址',
input_azure_organization_id: '请输入 Azure 组织ID',
use_tip_azure: 'Azure Devops 地址+令牌(账户设置-个人访问令牌-创建令牌)',
jira_prompt_information:'该信息为通过Jira提交缺陷的用户认证信息,若未填写,则使用工作空间中配置的默认信息'
}
},
project: {
Expand Down
18 changes: 17 additions & 1 deletion frontend/src/i18n/zh-TW.js
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,13 @@ export default {
system_workspace: "工作空間",
system_project: "項目",
user_unit: "人",
workspace_unit: "個"
workspace_unit: "個",
dash_board:'儀錶盤',
all_project:'全部項目',
to_be_completed:'待完成',
pending_upgrade:'待更新',
information:'信息',
nick_name:'暱稱'
},
license: {
title: '授權管理',
Expand All @@ -357,6 +363,10 @@ export default {
upcoming: '我的待辦',
focus: '我的關注',
creation: '我創建的',
creation_case:'我創建的用例',
creation_issue:'我創建的缺陷',
creation_case_tip: '暫時還沒有創建用例,马上創建',
creation_issue_tip:'暫時還沒有創建缺陷,马上創建',
table_name:{
track_case:'功能用例',
track_plan:'測試計劃',
Expand All @@ -366,6 +376,7 @@ export default {
api_automation:'接口自動化',
api_case:'接口用例',
performance:'性能測試',
scenario_case:'場景用例'
}
},
display: {
Expand Down Expand Up @@ -521,6 +532,10 @@ export default {
zentao_request: '請求方式',
input_zentao_request: '請輸入Zentao請求方式',
input_zentao_url: '請輸入Zentao地址,例:http://xx.xx.xx.xx/zentao/',
zentao_info:'禪道信息',
zentao_account:'禪道賬號',
zentao_password:'禪道密碼',
zentao_prompt_information:'該信息為通過禪道提交缺陷的的用戶名、密碼,若未填寫,則使用工作空間中配置的默認信息',
use_tip: '使用指引:',
use_tip_tapd: 'Tapd Basic Auth 賬號信息在"公司管理-安全與集成-開放平臺"中查詢',
use_tip_jira: 'Jira software server 認證信息為 賬號密碼,Jira software cloud 認證信息為 賬號+令牌(賬戶設置-安全-創建API令牌)',
Expand All @@ -547,6 +562,7 @@ export default {
input_azure_url: '請輸入 Azure Devops 地址',
input_azure_organization_id: '請輸入 Azure 組織ID',
use_tip_azure: 'Azure Devops 地址+令牌(賬戶設置-個人訪問令牌-創建令牌)',
jira_prompt_information:'該信息為通過Jira提交缺陷的用戶認證信息,若未填寫,則使用工作空間中配置的默認信息'
}
},
project: {
Expand Down

0 comments on commit 3d1b86e

Please sign in to comment.