diff --git a/modules/core/src/main/resources/i18n/core/common/i18n_en.properties b/modules/core/src/main/resources/i18n/core/common/i18n_en.properties index dc4fcbee..2e3c89ed 100644 --- a/modules/core/src/main/resources/i18n/core/common/i18n_en.properties +++ b/modules/core/src/main/resources/i18n/core/common/i18n_en.properties @@ -1,5 +1,6 @@ -# 登录登出相关 +# =========== 登录登出相关 =========== + sys.login.notLongIn=No login or login timeout.Please login again, thank you! sys.login.success=Login successful! sys.login.getInfo=Get info successful! @@ -7,7 +8,8 @@ sys.login.failure=Account or password error, please try again. sys.login.error=Sorry, system error. Please try again later. sys.logout.success=Logout successful! -# 账号登录相关 +# =========== 账号登录相关 =========== + sys.login.typeUnknown=Unknown login type. sys.login.accountIsBlank=Login account cannot be empty. sys.login.validCodeError=Login verification code error. @@ -18,13 +20,15 @@ sys.login.accountInvalid=This Account has invalid. sys.login.multiAddrMessage=The account has been logged in elsewhere. Please login again. sys.login.failedNumLock=Login failed, try too many times, the account has been locked, please {0} in minutes after retry. -# 用户管理相关 +# =========== 用户管理相关 =========== + sys.user.loginCodeExists=Login account already exists. sys.user.userCodeNotExists=UserCode does not exist. sys.user.userNameNotBlank=UserName does not empty. sys.user.infoSaveSuccess=User info save success. -# 用户密码安全策略 +# =========== 用户密码安全策略 =========== + sys.user.oldPasswordError=Old password error, please retype. sys.user.confirmPasswrodError=The new password is different from the confirm password. please retype. sys.user.passwordModifySuccess=Change password success @@ -36,7 +40,8 @@ sys.user.passwordError=Password error, please retype. sys.user.pwdQuestionModifySuccess=The security problem modified success. sys.user.pwdQuestionAnswerError=The questions and answers are incorrect. -# 错误页面相关 +# =========== 错误页面相关 =========== + sys.error.400.title=Request parameter error sys.error.400.message=Request parameter error, server cannot parse. sys.error.403.title=Insufficient permissions @@ -53,7 +58,8 @@ sys.error.500.message=The page you visited error! sys.error.500.message.p1=Sorry, there is a problem on the page you visited, please contact the administrator in time! sys.error.returnButton=Previous page -# 文件上传相关 +# =========== 文件上传相关 =========== + sys.file.uploadFileIsEmpty=No files to upload! sys.file.uploadValidNotBlank=File md5 and file name cannot be empty! sys.file.uploadValidImage=Can only upload images ({0}) diff --git a/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties b/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties index 07c1c33a..956506e3 100644 --- a/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties +++ b/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties @@ -1,5 +1,6 @@ -# 登录登出相关 +# =========== 登录登出相关 =========== + sys.login.notLongIn=未登录或登录超时。请重新登录,谢谢! sys.login.success=登录成功! sys.login.getInfo=获取信息成功! @@ -7,7 +8,8 @@ sys.login.failure=账号或密码错误,请重试。 sys.login.error=对不起,系统遇见了点问题,请稍后再试! sys.logout.success=退出成功! -# 账号登录相关 +# =========== 账号登录相关 =========== + sys.login.typeUnknown=未知的登录类型。 sys.login.accountIsBlank=登录账号不能为空。 sys.login.validCodeError=登录验证码错误,请重试。 @@ -18,13 +20,15 @@ sys.login.accountInvalid=该帐号无效。 sys.login.multiAddrMessage=账号已在其它地方登录,请重新登录。 sys.login.failedNumLock=登录失败,尝试次数过多,账号已锁定,请 {0} 分钟后重试. -# 用户管理相关 +# =========== 用户管理相关 =========== + sys.user.loginCodeExists=登录账号已存在 sys.user.userCodeNotExists=用户编码不存在 sys.user.userNameNotBlank=用户昵称不能为空 sys.user.infoSaveSuccess=用户信息保存成功 -# 用户密码安全策略 +# =========== 用户密码安全策略 =========== + sys.user.oldPasswordError=旧密码错误,请重新输入 sys.user.confirmPasswrodError=新密码与确认新密码不同,请重新输入 sys.user.passwordModifySuccess=修改密码成功 @@ -36,7 +40,8 @@ sys.user.passwordError=登录密码错误,请重新输入 sys.user.pwdQuestionModifySuccess=密保问题修改成功 sys.user.pwdQuestionAnswerError=密保问题与答案不正确 -# 错误页面相关 +# =========== 错误页面相关 =========== + sys.error.400.title=请求参数错误 sys.error.400.message=请求参数错误,服务器无法解析。 sys.error.403.title=操作权限不足 @@ -55,7 +60,8 @@ sys.error.500.message=您访问的页面出错啦! sys.error.500.message.p1=对不起,你访问的页面出现了一点问题,请及时联系管理员解决! sys.error.returnButton=返回上一页 -# 文件上传相关 +# =========== 文件上传相关 =========== + sys.file.uploadFileIsEmpty=没有需要上传的文件! sys.file.uploadValidNotBlank=文件校验码和文件名不能为空! sys.file.uploadValidImage=只能上传图片({0}) diff --git a/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties b/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties new file mode 100644 index 00000000..05f7ea83 --- /dev/null +++ b/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties @@ -0,0 +1,47 @@ + +# =========== 视图通用 =========== + +保\ 存=Save +关\ 闭=Close +确定=Ok +清除=Clear +关闭=Close + +# =========== imageclip =========== + +图片裁剪=Image clip +选择图片=Select image +放大=Zoom out +缩小=Zoom in +向左移动=Left move +向右移动=Right move +向上移动=Up move +向下移动=Down move +逆时针旋转=Counterclockwise rotation +顺时针旋转=Clockwise rotation +水平反转=Horizontal inversion +左右反转=Left and right reverse + +# =========== treeselect =========== + +选项选择=Option select +显示搜索=Show search +隐藏搜索=Hide search +关键字=Keyword +搜索=Search +展开=Expand +折叠=Collapse +不能选择根节点=Cannot select root node +不能选择父节点=Cannot select parent node +请重新选择=Please reselect + +# =========== treeselect =========== + +文件=File +文档=Document +图片=Image +音频或视频=Audio or video +请上传=Please upload +开始上传=Start upload +或将照片拖到这里,最多可选\ {0}\ 张=Drag the photo here, at most \ {0} \ sheet +或将照片拖到这里,最多可选\ {0}\ 个=Drag the photo here, at most \ {0} diff --git a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties index 0595d0f3..f694b0d4 100644 --- a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties +++ b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties @@ -31,8 +31,35 @@ 个人中心=Personal center 修改密码=Change password 退出登录=Log out -系统切换:=System switching: +系统切换=System switching 在线=Online 注销=Logout +# =========== userInfo =========== + +修改密保=Security question +个人信息=User info + +修改头像=Change Avatar + +用户昵称=Nickname +电子邮箱=Email +手机号码=Mobile +办公电话=Phone +个性签名=Signature +上次登录=Last Login +时间=Time +首次登录=First Login + +旧密码=Old password +新密码=New password +确认新密码=Confirm new password + +您还未设置过密保问题,您可以根据登录密码设置新的密保问题及答案。=You have not set up the security problem, you can set up the new security problem and answer according to the login password. +旧的密保问题及答案=Old secret questions and answers +旧保密问题=Old secret questions +旧保密问题答案=Old secret answers +新的密保问题及答案=New secret questions and answers +新保密问题=New secret questions +新保密问题答案=New secret answers diff --git a/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenuUser.html b/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenuUser.html index 5679e8fd..343adab3 100644 --- a/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenuUser.html +++ b/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenuUser.html @@ -19,7 +19,7 @@ <% if(user.superAdmin){ %>
  • - + <% var menuSysCode = @UserUtils.getLoginInfo().getParam('sysCode', 'default'); %> <% for(var dict in @DictUtils.getDictList('sys_menu_sys_code')){ %>