Merge remote-tracking branch 'origin/dev' into dev

frontend/src/i18n/en-US.js

@@ -33,6 +33,13 @@ export default {
     'status': 'Enable/Disable',
     'show_all': 'Show All',
     'report': 'Report',
+    'user': 'User',
+    'system': 'System',
+    'personal_setting': 'Personal Setting',
+    'test_resource_pool': 'Resource Pool',
+    'system_setting': 'Settings',
+    'functional': 'Functional',
+    'performance': 'Performance',
   },
   workspace: {
     'create': 'Create Workspace',
@@ -71,6 +78,7 @@ export default {
     'search_by_name': 'Search by name',
     'modify_personal_info': 'Modify Personal Information',
     'input_name': 'Please enter a user name',
+    'input_email': 'Please enter a email',
     'special_characters_are_not_supported': 'Special characters are not supported',
     'mobile_number_format_is_incorrect': 'Mobile number format is incorrect',
     'email_format_is_incorrect': 'Email format is incorrect',

frontend/src/i18n/zh-CN.js

@@ -33,6 +33,13 @@ export default {
     'status': '启用/禁用',
     'show_all': '显示全部',
     'report': '报告',
+    'user': '用户',
+    'system': '系统',
+    'personal_setting': '个人设置',
+    'test_resource_pool': '测试资源池',
+    'system_setting': '系统设置',
+    'functional': '功能测试',
+    'performance': '性能测试',
   },
   workspace: {
     'create': '创建工作空间',

frontend/src/performance/components/HeaderTopMenus.vue

@@ -8,13 +8,15 @@
            @select="handleSelect"
            router>
     <el-menu-item index="1" v-permission="['test_manager','test_user','test_viewer']">
-      功能测试
+      {{$t('commons.functional')}}
     </el-menu-item>
     <el-menu-item index="/loadtest" onselectstart="return false"
                   v-permission="['test_manager','test_user','test_viewer']">
-      性能测试
+      {{$t('commons.performance')}}
+    </el-menu-item>
+    <el-menu-item index="/setting/personsetting" onselectstart="return false">
+      {{$t('commons.system_setting')}}
     </el-menu-item>
-    <el-menu-item index="/setting/personsetting" onselectstart="return false">系统设置</el-menu-item>
   </el-menu>
 </template>
 

frontend/src/performance/components/settings/SettingMenu.vue

@@ -3,37 +3,39 @@
     <el-submenu index="1" v-permission="['admin']">
       <template slot="title">
         <font-awesome-icon class="icon account" :icon="['far', 'address-card']" size="lg"/>
-        <span>系统</span>
+        <span>{{$t('commons.system')}}</span>
       </template>
-      <el-menu-item index="/setting/user">用户</el-menu-item>
+      <el-menu-item index="/setting/user">{{$t('commons.user')}}</el-menu-item>
-      <el-menu-item index="/setting/organization">组织</el-menu-item>
+      <el-menu-item index="/setting/organization">{{$t('commons.organization')}}</el-menu-item>
-      <el-menu-item index="/setting/systemworkspace">工作空间</el-menu-item>
+      <el-menu-item index="/setting/systemworkspace">{{$t('commons.workspace')}}</el-menu-item>
-      <el-menu-item index="/setting/testresourcepool">测试资源池</el-menu-item>
+      <el-menu-item index="/setting/testresourcepool">{{$t('commons.test_resource_pool')}}</el-menu-item>
     </el-submenu>
 
     <el-submenu index="2" v-permission="['org_admin']" v-if="isCurrentOrganizationAdmin">
       <template slot="title">
         <font-awesome-icon class="icon organization" :icon="['far', 'building']" size="lg"/>
-        <span>组织</span>
+        <span>{{$t('commons.organization')}}</span>
       </template>
-      <el-menu-item index="/setting/organizationmember" v-permission="['org_admin']">成员</el-menu-item>
+      <el-menu-item index="/setting/organizationmember" v-permission="['org_admin']">{{$t('commons.member')}}
-      <el-menu-item index="/setting/organizationworkspace" v-permission="['org_admin']">工作空间</el-menu-item>
+      </el-menu-item>
+      <el-menu-item index="/setting/organizationworkspace" v-permission="['org_admin']">{{$t('commons.workspace')}}
+      </el-menu-item>
     </el-submenu>
 
     <el-submenu index="3" v-permission="['test_manager','test_user','test_viewer']" v-if="isCurrentWorkspaceUser">
       <template slot="title">
         <font-awesome-icon class="icon workspace" :icon="['far', 'list-alt']" size="lg"/>
-        <span>工作空间</span>
+        <span>{{$t('commons.workspace')}}</span>
       </template>
-      <el-menu-item index="/setting/member">成员</el-menu-item>
+      <el-menu-item index="/setting/member">{{$t('commons.member')}}</el-menu-item>
     </el-submenu>
 
     <el-submenu index="4">
       <template slot="title">
         <font-awesome-icon class="icon" :icon="['far', 'user']" size="lg"/>
-        <span>个人</span>
+        <span>{{$t('commons.personal_info')}}</span>
       </template>
-      <el-menu-item index="/setting/personsetting">个人设置</el-menu-item>
+      <el-menu-item index="/setting/personsetting">{{$t('commons.personal_setting')}}</el-menu-item>
     </el-submenu>
 
   </el-menu>

frontend/src/performance/components/settings/workspace/WorkspaceMember.vue

@@ -3,7 +3,7 @@
     <el-card>
       <div slot="header">
         <el-row type="flex" justify="space-between" align="middle" v-permission="['test_manager']">
-          <span class="title">成员
+          <span class="title">{{$t('commons.member')}}
             <ms-create-box :tips="btnTips" :exec="create"/>
           </span>
           <span class="search">