diff --git a/common/src/main/resources/static/layer/3.1/layer.js b/common/src/main/resources/static/layer/3.1/layer.js index 3147e5d4..995396ab 100644 --- a/common/src/main/resources/static/layer/3.1/layer.js +++ b/common/src/main/resources/static/layer/3.1/layer.js @@ -10,6 +10,34 @@ ;!function(window, undefined){ "use strict"; +var messages; +var lang = window.lang || "zh_CN"; +if (lang == 'en'){ + messages = { + btnOk: 'Ok', + btnCancel: 'Cancle', + title: 'Information', + promptTipA: 'Enter ', + promptTipB: 'character at most.', + noPicture: 'No picture', + photoError: 'Current image address error.
Next slide?', + photoNextPage: 'The next', + photoClose: 'Close' + }; +}else{ + messages = { + btnOk: '确定', + btnCancel: '取消', + title: '信息', + promptTipA: '最多输入', + promptTipB: '个字符', + noPicture: '没有图片', + photoError: '当前图片地址异常
是否继续查看下一张？', + photoNextPage: '下一张', + photoClose: '不看了' + }; +} + var isLayui = window.layui && layui.define, $, win, ready = { getPath: function(){ var js = document.scripts, script = js[js.length - 1], jsPath = script.src; @@ -18,7 +46,7 @@ var isLayui = window.layui && layui.define, $, win, ready = { }(), config: {}, end: {}, minIndex: 0, minLeft: [], - btn: ['确定', '取消'], + btn: [messages.btnOk, messages.btnCancel], //五种原始层模式 type: ['dialog', 'page', 'iframe', 'loading', 'tips'] @@ -184,7 +212,7 @@ Class.pt.config = { shade: 0.3, fixed: true, move: doms[1], - title: '信息', + title: messages.title, offset: 'auto', area: 'auto', closeBtn: 1, @@ -994,7 +1022,7 @@ layer.prompt = function(options, yes){ return layer.open($.extend({ type: 1 - ,btn: ['确定','取消'] + ,btn: [messages.btnOk,messages.btnCancel] ,content: content ,skin: 'layui-layer-prompt' + skin('prompt') ,maxWidth: win.width() @@ -1009,7 +1037,7 @@ layer.prompt = function(options, yes){ if(value === ''){ prompt.focus(); } else if(value.length > (options.maxlength||500)) { - layer.tips('最多输入'+ (options.maxlength || 500) +'个字数', prompt, {tips: 1}); + layer.tips(messages.promptTipA + (options.maxlength || 500) + messages.promptTipB, prompt, {tips: 1}); } else { yes && yes(value, index, prompt); } @@ -1116,7 +1144,7 @@ layer.photos = function(options, loop, key){ if(!loop) return; } else if (data.length === 0){ - return layer.msg('没有图片'); + return layer.msg(message.noPicture); } //上一张 @@ -1261,9 +1289,9 @@ layer.photos = function(options, loop, key){ }, options)); }, function(){ layer.close(dict.loadi); - layer.msg('当前图片地址异常
是否继续查看下一张？', { + layer.msg(messages.photoError, { time: 30000, - btn: ['下一张', '不看了'], + btn: [messages.photoNextPage, messages.photoClose], yes: function(){ data.length > 1 && dict.imgnext(true,true); } diff --git a/modules/core/src/main/resources/i18n/core/i18n_en.properties b/modules/core/src/main/resources/i18n/core/i18n_en.properties index 4817e3f3..5ec18247 100644 --- a/modules/core/src/main/resources/i18n/core/i18n_en.properties +++ b/modules/core/src/main/resources/i18n/core/i18n_en.properties @@ -1,4 +1,5 @@ +# 登录登出相关 sys.login.notLongIn=No login or login timeout.Please login again, thank you! sys.login.success=Login successful! sys.login.getInfo=Get info successful! @@ -6,6 +7,36 @@ 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. +sys.login.accountDisabled=This Account has disabled. +sys.login.accountFreezed=This Account has freezed. +sys.login.accountAudited=This Account has audited. +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 +sys.user.passwordModifyNotRepeat=The new password cannot be the same as the previous {0}. +sys.user.passwordModifySecurityLevel=Password change failed because you set the password to weak password! +sys.user.initPasswordModifyTip=Your password is the init password, please change the password! +sys.user.passwordModifyTip=Your password {0} day has not been modified , please change the password! +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 @@ -16,12 +47,15 @@ sys.error.500.title=Internal system error sys.error.500.message=The page you visited error! sys.error.returnButton=Previous page -# #### 学习、举例 #### # - -#没有参数=No parameters -#有\ {0}\ 个参数= There are {0} parameters - -# #### 测试视图写法 #### # - -# ${text('没有参数')} -# ${text('有\ {0}\ 个参数', 3)} +# 文件上传相关 +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}) +sys.file.uploadValidVideo=Can only upload video ({0}) +sys.file.uploadValidFile=Can only upload document ({0}) +sys.file.uploadValidAll=Format incorrect ({0}) +sys.file.uploadValidSize=Size cannot exceed {0} +sys.file.uploadValidContent=File content format not allowed! +sys.file.uploadSuccessSeconds=Seconds upload success , time {0} +sys.file.uploadSuccess=Upload success {0} +sys.file.downloadFileNotExist=File lost or non-existent! diff --git a/modules/core/src/main/resources/i18n/core/i18n_zh_CN.properties b/modules/core/src/main/resources/i18n/core/i18n_zh_CN.properties index 8395444b..632d69d0 100644 --- a/modules/core/src/main/resources/i18n/core/i18n_zh_CN.properties +++ b/modules/core/src/main/resources/i18n/core/i18n_zh_CN.properties @@ -1,4 +1,5 @@ +# 登录登出相关 sys.login.notLongIn=未登录或登录超时。请重新登录，谢谢！ sys.login.success=登录成功！ sys.login.getInfo=获取信息成功！ @@ -6,6 +7,36 @@ sys.login.failure=账号或密码错误，请重试。 sys.login.error=对不起，系统遇见了点问题，请稍后再试！ sys.logout.success=退出成功！ +# 账号登录相关 +sys.login.typeUnknown=未知的登录类型。 +sys.login.accountIsBlank=登录账号不能为空。 +sys.login.validCodeError=登录验证码错误，请重试。 +sys.login.accountDisabled=该帐号已停用。 +sys.login.accountFreezed=该帐号已冻结。 +sys.login.accountAudited=该帐号待审核。 +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=修改密码成功 +sys.user.passwordModifyNotRepeat=新密码不能与前 {0} 次，设置的密码相同 +sys.user.passwordModifySecurityLevel=密码修改失败，因为你设置的密码为弱密码！ +sys.user.initPasswordModifyTip=您的密码还是初始密码，请修改密码！ +sys.user.passwordModifyTip=您的密码已经 {0} 天未修改了，请修改密码！ +sys.user.passwordError=登录密码错误，请重新输入 +sys.user.pwdQuestionModifySuccess=密保问题修改成功 +sys.user.pwdQuestionAnswerError=密保问题与答案不正确 + +# 错误页面相关 sys.error.400.title=请求参数错误 sys.error.400.message=请求参数错误，服务器无法解析。 sys.error.403.title=操作权限不足 @@ -15,3 +46,16 @@ sys.error.404.message=您访问的页面不存在！ sys.error.500.title=系统内部错误 sys.error.500.message=您访问的页面出错啦！ sys.error.returnButton=返回上一页 + +# 文件上传相关 +sys.file.uploadFileIsEmpty=没有需要上传的文件！ +sys.file.uploadValidNotBlank=文件校验码和文件名不能为空！ +sys.file.uploadValidImage=只能上传图片（{0}） +sys.file.uploadValidVideo=只能上传视频（{0}） +sys.file.uploadValidFile=只能上传文档（{0}） +sys.file.uploadValidAll=格式不正确（{0}） +sys.file.uploadValidSize=大小不能超过{0} +sys.file.uploadValidContent=文件内容格式不允许！ +sys.file.uploadSuccessSeconds=秒传成功,用时{0} +sys.file.uploadSuccess=上传成功,用时{0} +sys.file.downloadFileNotExist=文件已丢失或不存在！ diff --git a/modules/core/src/main/resources/views/modules/sys/sysLogin.html b/modules/core/src/main/resources/views/modules/sys/sysLogin.html index b4b6afe1..15a1398f 100644 --- a/modules/core/src/main/resources/views/modules/sys/sysLogin.html +++ b/modules/core/src/main/resources/views/modules/sys/sysLogin.html @@ -32,7 +32,7 @@ <% } %> - <% } -->*/%> + <% } -->*/%>
<#form:validcode name="validCode" isRequired="true" isRemote="true" isLazy="false"/>
@@ -55,6 +55,23 @@ <% if(@ObjectUtils.toBoolean(@Global.getConfig('user.registerUser'))){ %> 注册账号<% } %> 忘记密码 + <% + var langTypeList = @DictUtils.getDictList('sys_lang_type'); + if (langTypeList.~size > 1){ + %> +
+ + ${@DictUtils.getDictLabel('sys_lang_type', lang(), 'zh_CN')} + + +
+ <% } %> diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html index b0020d9a..6e4122b4 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html @@ -55,7 +55,7 @@ var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{ // for(var i=0; i