diff --git a/backend/src/main/java/io/metersphere/controller/UserController.java b/backend/src/main/java/io/metersphere/controller/UserController.java index 688b6b59d0..080986a8a2 100644 --- a/backend/src/main/java/io/metersphere/controller/UserController.java +++ b/backend/src/main/java/io/metersphere/controller/UserController.java @@ -17,6 +17,7 @@ import io.metersphere.controller.request.organization.AddOrgMemberRequest; import io.metersphere.controller.request.organization.QueryOrgMemberRequest; import io.metersphere.dto.UserDTO; import io.metersphere.dto.UserRoleDTO; +import io.metersphere.i18n.Translator; import io.metersphere.service.OrganizationService; import io.metersphere.service.UserService; import io.metersphere.service.WorkspaceService; @@ -206,7 +207,7 @@ public class UserController { workspaceService.checkWorkspaceOwner(workspaceId); String currentUserId = SessionUtils.getUser().getId(); if (StringUtils.equals(userId, currentUserId)) { - MSException.throwException("Insufficient permissions!"); + MSException.throwException(Translator.get("cannot_remove_current")); } userService.deleteMember(workspaceId, userId); } @@ -230,7 +231,7 @@ public class UserController { organizationService.checkOrgOwner(organizationId); String currentUserId = SessionUtils.getUser().getId(); if (StringUtils.equals(userId, currentUserId)) { - MSException.throwException("Insufficient permissions!"); + MSException.throwException(Translator.get("cannot_remove_current")); } userService.delOrganizationMember(organizationId, userId); } diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index c021488f57..d75c4edc54 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -15,6 +15,15 @@ user_id_already_exists=User ID already exists password_modification_failed=The old password is wrong. Please re-enter it cannot_delete_current_user=Cannot delete the user currently logged in user_already_exists=The user already exists in the current member list +cannot_remove_current=Unable to remove the currently logged in user +password_is_incorrect=Incorrect password +user_not_exist=user does not exist: +user_has_been_disabled=the user has been disabled. +excessive_attempts=Excessive attempts +user_locked=the user has been locked. +user_expires=user expires. +not_authorized=not authorized. +login_fail=Login fail #load test edit_load_test_not_found=Cannot edit test, test not found= run_load_test_not_found=Cannot run test, test not found= @@ -97,11 +106,3 @@ test_case_report_template_repeat=The workspace has the same name template plan_name_already_exists=Test plan name already exists test_case_already_exists_excel=There are duplicate test cases in the import file api_test_name_already_exists=Test name already exists -password_is_incorrect=Incorrect password -user_not_exist=user does not exist: -user_has_been_disabled=the user has been disabled. -excessive_attempts=Excessive attempts -user_locked=the user has been locked. -user_expires=user expires. -not_authorized=not authorized. -login_fail=Login fail \ No newline at end of file diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 5c82e94f38..6a1170d165 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -15,7 +15,15 @@ password_modification_failed=旧密码输入错误,请重新输入 cannot_delete_current_user=无法删除当前登录用户 connection_failed=连接失败 user_already_exists=该用户已存在于当前成员列表中 - +cannot_remove_current=无法移除当前登录用户 +login_fail=登陆失败 +password_is_incorrect=密码不正确 +user_not_exist=用户不存在: +user_has_been_disabled=用户已被禁用 +excessive_attempts=操作频繁 +user_locked=用户被锁定 +user_expires=用户过期 +not_authorized=未经授权 #load test edit_load_test_not_found=无法编辑测试,未找到测试: run_load_test_not_found=无法运行测试,未找到测试: @@ -98,14 +106,7 @@ test_case_report_template_repeat=同一工作空间下不能存在同名模版 plan_name_already_exists=测试计划名称已存在 test_case_already_exists_excel=导入文件中存在重复用例 api_test_name_already_exists=测试名称已经存在 -login_fail=登陆失败 -password_is_incorrect=密码不正确 -user_not_exist=用户不存在: -user_has_been_disabled=用户已被禁用 -excessive_attempts=操作频繁 -user_locked=用户被锁定 -user_expires=用户过期 -not_authorized=未经授权 + diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 57cbfb51e2..2f00099283 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -15,6 +15,15 @@ user_id_already_exists=用戶id已存在 password_modification_failed=舊密碼輸入錯誤,請重新輸入 cannot_delete_current_user=無法刪除當前登錄用戶 user_already_exists=該用戶已存在於當前成員列表中 +cannot_remove_current=無法移除當前登錄用戶 +password_is_incorrect=密碼不正確 +user_not_exist=用戶不存在: +user_has_been_disabled=用戶已被禁用 +excessive_attempts=操作頻繁 +user_locked=用戶被鎖定 +user_expires=用戶過期 +not_authorized=未經授權。 +login_fail=登入失敗 #load test edit_load_test_not_found=無法編輯測試,未找到測試: run_load_test_not_found=無法運行測試,未找到測試: @@ -97,11 +106,4 @@ test_case_report_template_repeat=同壹工作空間下不能存在同名模版 plan_name_already_exists=測試計劃名稱已存在 test_case_already_exists_excel=導入文件中存在重復用例 api_test_name_already_exists=測試名稱已經存在 -password_is_incorrect=密碼不正確 -user_not_exist=用戶不存在: -user_has_been_disabled.=用戶已被禁用 -excessive_attempts=操作頻繁 -user_locked=用戶被鎖定 -user_expires=用戶過期 -not_authorized=未經授權。 -login_fail=登入失敗 +