国际化一些视图文件。

2018-04-16 22:43:09 +08:00
parent e8bfce2bce
commit d9193835ef
19 changed files with 119 additions and 69 deletions
--- a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx
--- a/modules/core/src/main/resources/i18n/core/common/i18n_en.properties
+++ b/modules/core/src/main/resources/i18n/core/common/i18n_en.properties
@@ -40,11 +40,17 @@ 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
-sys.error.403.message=Your permissions are not sufficient!
+sys.error.403.message=Insufficient permissions!
+sys.error.403.message.p1=I am sorry that you do not permissions. Please contact the administrator.
 sys.error.404.title=Page doesn't exist
-sys.error.404.message=The page you visited does not exist!
+sys.error.404.message=Visited page does not exist!
+sys.error.404.message.p1=This error may be caused by:
+sys.error.404.message.p2=Address input error, link has expired.
+sys.error.404.message.p3=The address you visit is:
+sys.error.404.message.p4=Please contact the administrator.
 sys.error.500.title=Internal system error
 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

 # 文件上传相关
--- 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
@@ -41,10 +41,18 @@ sys.error.400.title=请求参数错误
 sys.error.400.message=请求参数错误，服务器无法解析。
 sys.error.403.title=操作权限不足
 sys.error.403.message=您的操作权限不足！
+sys.error.403.message.p1=很抱歉，您没有权限访问此页面，若有疑问请联系管理员。
 sys.error.404.title=页面不存在
 sys.error.404.message=您访问的页面不存在！
+sys.error.404.message.p1=可能是如下原因引起的这个错误：
+sys.error.404.message.p2=地址输入错误，链接已经失效过期.
+sys.error.404.message.p3=您访问的地址为：
+sys.error.404.message.p4=若有疑问请联系管理员.
+sys.error.404.message=您访问的页面不存在！
+sys.error.404.message=您访问的页面不存在！
 sys.error.500.title=系统内部错误
 sys.error.500.message=您访问的页面出错啦！
+sys.error.500.message.p1=对不起，你访问的页面出现了一点问题，请及时联系管理员解决！
 sys.error.returnButton=返回上一页

 # 文件上传相关
--- a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
+++ b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
@@ -0,0 +1,38 @@
+
+# =========== sysLogin =========== 
+
+登录=Login
+
+请填写登录账号.=Please enter login account.
+登录账号=Login account
+
+登录密码，鼠标按下显示密码=Click the mouse to display password.
+请填写登录密码.=Please enter login password.
+登录密码=Login password
+
+公共场所慎用,下次不需要再填写帐号=Use caution in public places.
+记住账号=Remember account
+公共场所慎用,下次不需要再填写帐号和密码=Use caution in public places.
+记住密码=Remember password
+
+登录验证成功，正在进入...=Login authentication successful, entering...
+正在验证登录，请稍后...=Verify login, please later...
+立即登录=Login
+
+注册账号=Registered account
+忘记密码=Forgot password
+
+# =========== sysIndex =========== 
+
+仪表盘=Dashboard
+全屏=Full screen
+切换主题=Switch the theme
+
+个人中心=Personal center
+修改密码=Change password
+退出登录=Log out
+系统切换：=System switching:
+
+在线=Online
+注销=Logout
+
--- a/modules/core/src/main/resources/views/error/400.html
+++ b/modules/core/src/main/resources/views/error/400.html
@@ -50,7 +50,7 @@ else {
 	</div>
 	<div class="copyright">
 		<% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %>
-		版权所有 &copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>.
+		&copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>.
 	</div>
 </div>
 <% } %>
--- a/modules/core/src/main/resources/views/error/403.html
+++ b/modules/core/src/main/resources/views/error/403.html
@@ -30,13 +30,13 @@ else {
 	<div class="headline text-yellow">403</div>
 	<div class="error-content">
 		<h3><i class="fa fa-warning text-yellow"></i> ${message}</h3>
-		<p>很抱歉，您没有权限访问此页面，若有疑问请联系管理员。</p>
+		<p>${text('sys.error.403.message.p1')}</p>
 		<button type="button" class="btn btn-warning btn-sm" onclick="history.go(-1);"><i
 			class="fa fa-reply-all"></i> ${text('sys.error.returnButton')}</button>
 	</div>
 	<div class="copyright">
 		<% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %>
-		版权所有 &copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>.
+		&copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>.
 	</div>
 </div>
 <% } %>
--- a/modules/core/src/main/resources/views/error/404.html
+++ b/modules/core/src/main/resources/views/error/404.html
@@ -21,16 +21,16 @@ else {
 	<div class="headline text-aqua mt20">404</div>
 	<div class="error-content">
 		<h3><i class="fa fa-warning text-aqua"></i> ${message}</h3>
-		<p>可能是如下原因引起的这个错误：</p>
+		<p>${text('sys.error.404.message.p1')}</p>
 		<ul>
-			<li>地址输入错误，链接已经失效过期.</li>
+			<li>${text('sys.error.404.message.p2')}</li>
 			<li style="word-break:break-all;word-wrap:break-word;">
-				您访问的地址为：${
+				${text('sys.error.404.message.p3')}${
 					@EncodeUtils.encodeHtml(
 						@request.getAttribute('javax.servlet.forward.request_uri')
 					)
 				}</li>
-			<li>若有疑问请联系管理员.</li>
+			<li>${text('sys.error.404.message.p4')}</li>
 			<li>......</li>
 		</ul>
 		<button type="button" class="btn btn-info btn-sm" onclick="history.go(-1);"><i
@@ -38,7 +38,7 @@ else {
 	</div>
 	<div class="copyright">
 		<% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %>
-		版权所有 &copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>.
+		&copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>.
 	</div>
 </div>
 <% } %>
--- a/modules/core/src/main/resources/views/error/500.html
+++ b/modules/core/src/main/resources/views/error/500.html
@@ -34,13 +34,13 @@ else {
 	<div class="headline text-red">500</div>
 	<div class="error-content">
 		<h3><i class="fa fa-warning text-red"></i> ${message}</h3>
-		<p>对不起，你访问的页面出现了一点问题，请及时联系管理员解决！</p>
+		<p>${text('sys.error.500.message.p1')}</p>
 		<button type="button" class="btn btn-danger btn-sm" onclick="history.go(-1);"><i
 			class="fa fa-reply-all"></i> ${text('sys.error.returnButton')}</button>
 	</div>
 	<div class="copyright">
 		<% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %>
-		版权所有 &copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>.
+		&copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>.
 	</div>
 </div>
 <% if (@ObjectUtils.toBoolean(@Global.getConfig('error.page.printErrorInfo', 'true'))){ %>
--- a/modules/core/src/main/resources/views/layouts/default.html
+++ b/modules/core/src/main/resources/views/layouts/default.html
@@ -9,7 +9,7 @@ var themeName = @Global.getConfig('web.view.themeName', 'default');
 %>
 <% print('<'+'!DOC'+'TYPE html'+'>'); %>
 <% print('<'+'html'+'><'+'head'+'>'); %>
-<% include('/include/head.html', {title: title!}){} %>
+<% include('/include/head.html', {title: text(title!)}){} %>
 <% include('/themes/'+themeName+'/include/header.html', {libs: libs!}){} %>
 </head><body class="hold-transition ${bodyClass!}">
 <% if (!@ListUtils.inString('layout', libs!)){ %>
--- a/modules/core/src/main/resources/views/modules/sys/dictDataForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/dictDataForm.html
@@ -18,8 +18,8 @@
 							<label class="control-label col-sm-4">上级字典：</label>
 							<div class="col-sm-8">
 								<#form:treeselect id="parent" title="上级字典"
-									path="parent.id" labelPath="parent.dictLabel" 
-									url="${ctx}/sys/dictData/treeData?excludeCode=${dictData.id}&dictType=${dictData.dictType}"
+									path="parent.id" labelPath="parent.dictLabelOrig" 
+									url="${ctx}/sys/dictData/treeData?excludeCode=${dictData.id}&dictType=${dictData.dictType}&isShowNameOrig=true"
 									class="" allowClear="true" canSelectRoot="true" canSelectParent="true"/>
 							</div>
 						</div>
@@ -33,7 +33,7 @@
 							<label class="control-label col-sm-4" title="">
 								<span class="required ">*</span> 字典标签：<i class="fa icon-question hide"></i></label>
 							<div class="col-sm-8">
-								<#form:input path="dictLabel" maxlength="100" class="form-control required "/>
+								<#form:input path="dictLabelOrig" maxlength="100" class="form-control required "/>
 							</div>
 						</div>
 					</div>
--- a/modules/core/src/main/resources/views/modules/sys/dictDataList.html
+++ b/modules/core/src/main/resources/views/modules/sys/dictDataList.html
@@ -21,7 +21,7 @@
 				<div class="form-group">
 					<label class="control-label">字典标签：</label>
 					<div class="control-inline">
-						<#form:input path="dictLabel" maxlength="100" class="form-control"/>
+						<#form:input path="dictLabelOrig" maxlength="100" class="form-control"/>
 					</div>
 				</div>
 				<div class="form-group">
@@ -63,7 +63,7 @@
 $('#dataGrid').dataGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
-		{header:'字典标签', name:'dictLabel', index:'a.dict_label', width:200, align:"left", frozen:true, formatter: function(val, obj, row, act){
+		{header:'字典标签', name:'dictLabelOrig', index:'a.dict_label', width:200, align:"left", frozen:true, formatter: function(val, obj, row, act){
 			return '<a href="${ctx}/sys/dictData/form?dictCode='+row.dictCode+'" class="btnList" data-title="编辑字典数据">'+(val||row.id)+'</a>';
 		}},
 		{header:'字典键值', name:'dictValue', index:'a.dict_value', width:200, align:"left"},
@@ -94,7 +94,7 @@ $('#dataGrid').dataGrid({
 	],
 	treeGrid: true,			// 启用树结构表格
 	defaultExpandLevel: 0,	// 默认展开的层次
-	expandNodeClearPostData: 'dictLabel,dictValue,dictType,', // 展开节点清理请求参数数据（一般设置查询条件的字段属性，否则在查询后，不能展开子节点数据）	// 加载成功后执行事件
+	expandNodeClearPostData: 'dictLabelOrig,dictValue,dictType,', // 展开节点清理请求参数数据（一般设置查询条件的字段属性，否则在查询后，不能展开子节点数据）	// 加载成功后执行事件
 	ajaxSuccess: function(data){
 		
 	}
--- a/modules/core/src/main/resources/views/modules/sys/sysDesktop.html
+++ b/modules/core/src/main/resources/views/modules/sys/sysDesktop.html
@@ -253,7 +253,7 @@
 <footer class="main-footer m0">
 	<% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %>
 	<div class="pull-right hidden-xs">当前版本： ${productVersion}</div>
-	版权所有 &copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>.
+	&copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>.
 </footer>
 <% } %>
 <script>
--- a/modules/core/src/main/resources/views/modules/sys/sysIndex.html
+++ b/modules/core/src/main/resources/views/modules/sys/sysIndex.html
@@ -23,10 +23,8 @@ var bodyClass = 'fixed noscroll2 sidebar-mini ' + sidebarCollapse;
 	<div id="tabpanel"></div>
 </div>
 <% } %>
-<script>
-var desktopUrl = '${ctx}${@Global.getConfig("sys.index.desktopUrl", "/desktop")}',
-modifyPasswordTip = '${modifyPasswordTip!}';
-</script>
+<div id="modifyPasswordTip" class="hide" data-message="${modifyPasswordTip!}"></div>
+<div id="desktopTabPage" class="hide" data-title="${text('仪表盘')}" data-url="${ctx}${@Global.getConfig('sys.index.desktopUrl', '/desktop')}"></div>
 <script src="${ctxStatic}/jquery-toastr/2.0/toastr.min.js?${_version}"></script>
 <script src="${ctxStatic}/jquery-plugins/jquery.slimscroll.js"></script>
 <script src="${ctxStatic}/modules/sys/sysIndex.js?${_version}"></script>
--- a/modules/core/src/main/resources/views/modules/sys/sysIndex/leftMenu.html
+++ b/modules/core/src/main/resources/views/modules/sys/sysIndex/leftMenu.html
@@ -1,13 +1,13 @@
 <section class="sidebar">
 	<div class="user-panel">
 		<div class="pull-left image">
-			<img data-href="${ctx}/sys/user/info" data-title="个人中心" class="addTabPage img-circle"
+			<img data-href="${ctx}/sys/user/info" data-title="${text('个人中心')}" class="addTabPage img-circle"
 				src="${@user.getAvatarUrl().replaceFirst('/ctxPath', ctxPath)}">
 		</div>
 		<div class="pull-left info">
 			<p>${user.userName}</p>
-			<a href="javascript:"><i class="fa fa-circle text-success"></i> 在线</a>
-			<a href="${ctx}/logout"><i class="fa fa-sign-out text-danger"></i> 注销</a>
+			<a href="javascript:"><i class="fa fa-circle text-success"></i> ${text('在线')}</a>
+			<a href="${ctx}/logout"><i class="fa fa-sign-out text-danger"></i> ${text('注销')}</a>
 		</div>
 	</div>
 	<%/*<!--%>
--- a/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenu.html
+++ b/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenu.html
@@ -13,8 +13,8 @@
 			<% if(__info_type == '0'){ %>
 			<li><a href="http://jeesite.com" target="_blank"><i class="fa fa-diamond"></i> 官方网站</a></li>
 			<% } %>
-			<li><a href="javascript:" id="fullScreen" title="全屏"><i class="fa fa-arrows-alt"></i></a></li>
-			<li><a href="javascript:" id="switchSkin" title="切换主题" style="margin-top:-1px;"><i class="fa fa-dashboard"></i></a></li>
+			<li><a href="javascript:" id="fullScreen" title="${text('全屏')}"><i class="fa fa-arrows-alt"></i></a></li>
+			<li><a href="javascript:" id="switchSkin" title="${text('切换主题')}" style="margin-top:-1px;"><i class="fa fa-dashboard"></i></a></li>
 			<% include('/modules/sys/sysIndex/topMenuLang.html'){} %>
 			<% include('/modules/sys/sysIndex/topMenuOnline.html'){} %>
 			<% include('/modules/sys/sysIndex/topMenuMsg.html'){} %>
--- a/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenuLang.html
+++ b/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenuLang.html
@@ -3,7 +3,7 @@ var langTypeList = @DictUtils.getDictList('sys_lang_type');
 if (langTypeList.~size > 1){
 %>
 <li class="dropdown user-menu mr5">
-	<a href="javascript:" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" title="语言切换">
+	<a href="javascript:" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">
 		<i class="fa icon-globe"></i>
 	</a>
 	<ul class="dropdown-menu">
--- a/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenuUser.html
+++ b/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenuUser.html
@@ -6,20 +6,20 @@
 	<ul class="dropdown-menu">
 		<li class="mt5">
 			<a id="userInfo" href="javascript:" data-href="${ctx}/sys/user/info" class="addTabPage">
-			<i class="fa fa-user"></i> 个人中心</a>
+			<i class="fa fa-user"></i> ${text('个人中心')}</a>
 		</li>
 		<li>
 			<a id="modifyPassword" href="javascript:" data-href="${ctx}/sys/user/info?op=pwd" class="addTabPage">
-			<i class="fa fa-key"></i> 修改密码</a>
+			<i class="fa fa-key"></i> ${text('修改密码')}</a>
 		</li>
 		<li class="divider"></li>
 		<li>
 			<a href="${ctx}/logout">
-			<i class="fa fa-sign-out"></i> 退出登录</a>
+			<i class="fa fa-sign-out"></i> ${text('退出登录')}</a>
 		</li>
 		<% if(user.superAdmin){ %>
 			<li class="divider"></li>
-			<li class="dropdown-header mb5">系统切换：</li>
+			<li class="dropdown-header mb5">${text('系统切换：')}</li>
 			<% var menuSysCode = @UserUtils.getLoginInfo().getParam('sysCode', 'default'); %>
 			<% for(var dict in @DictUtils.getDictList('sys_menu_sys_code')){ %>
 				<li>
--- a/modules/core/src/main/resources/views/modules/sys/sysLogin.html
+++ b/modules/core/src/main/resources/views/modules/sys/sysLogin.html
@@ -11,18 +11,18 @@
 	<div class="login-box-body">
 		<#form:form id="loginForm" model="${user!}" action="${ctx}/login" method="post">
 			<div class="form-group has-feedback">
-				<span class="glyphicon glyphicon-user form-control-feedback" title="登录账号"></span>
+				<span class="glyphicon glyphicon-user form-control-feedback" title="${text('登录账号')}"></span>
 				<#form:input type="text" name="username" class="form-control required"
-					data-msg-required="请填写登录账号." placeholder="登录账号"
+					data-msg-required="${text('请填写登录账号.')}" placeholder="${text('登录账号')}"
 					value="${cookie('rememberUserCode')}"/>
 			</div>
 			<div class="form-group has-feedback">
 				<span class="glyphicon glyphicon-lock form-control-feedback"
-					title="登录密码，鼠标按下显示密码"
+					title="${text('登录密码，鼠标按下显示密码')}"
 					onmousedown="$('#password').attr('type','text')"
 					onmouseup="$('#password').attr('type','password')"></span>
 				<#form:input type="password" name="password" class="form-control required"
-					data-msg-required="请填写登录密码." placeholder="登录密码" autocomplete="off"/>
+					data-msg-required="${text('请填写登录密码.')}" placeholder="${text('登录密码')}" autocomplete="off"/>
 			</div>
 			<%/*<!-- if(@ObjectUtils.toBoolean(@Global.getConfig('user.useCorpModel'))){ %>
 			<div class="form-group has-feedback">
@@ -38,29 +38,31 @@
 			</div>
 			<div class="form-group">
 				<div class="mt5 icheck">
-					<label title="公共场所慎用,下次不需要再填写帐号"><input type="checkbox"
+					<label title="${text('公共场所慎用,下次不需要再填写帐号')}"><input type="checkbox"
 						name="rememberUserCode"${isNotBlank(cookie('rememberUserCode'))?' checked':''}
-						class="form-control" data-style="square-blue"> 记住账号</label> &nbsp; 
-					<label title="公共场所慎用,下次不需要再填写帐号和密码"><input type="checkbox"
+						class="form-control" data-style="square-blue"> ${text('记住账号')}</label> &nbsp; 
+					<label title="${text('公共场所慎用,下次不需要再填写帐号和密码')}"><input type="checkbox"
 						name="rememberMe"${isNotBlank(cookie('rememberMe'))?' checked':''}
-						class="form-control" data-style="square-blue"> 记住密码</label>
+						class="form-control" data-style="square-blue"> ${text('记住密码')}</label>
 				</div>
 			</div>
 			<div class="form-group">
-				<button type="submit" class="btn btn-primary btn-block btn-flat">立即登录</button>
+				<button type="submit" class="btn btn-primary btn-block btn-flat"
+					id="btnSubmit" data-loading="${text('登录验证成功，正在进入...')}"
+					data-login-valid="${text('正在验证登录，请稍后...')}">${text('立即登录')}</button>
 			</div>
 		</#form:form>
 		<div class="row">
 			<div class="col-xs-12">
 				<% if(@ObjectUtils.toBoolean(@Global.getConfig('user.registerUser'))){ %>
-				<a href="${ctxPath}/account/registerUser" class="pull-right">注册账号</a><% } %>
-				<a href="${ctxPath}/account/forgetPwd" class="pull-left">忘记密码</a>
+				<a href="${ctxPath}/account/registerUser" class="pull-right">${text('注册账号')}</a><% } %>
+				<a href="${ctxPath}/account/forgetPwd" class="pull-left">${text('忘记密码')}</a>
 				<%
 				var langTypeList = @DictUtils.getDictList('sys_lang_type');
 				if (langTypeList.~size > 1){
 				%>
 				<div class="dropdown pull-right">
-					<a href="javascript:" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" title="语言切换">
+					<a href="javascript:" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">
 						<i class="fa icon-globe"></i> ${@DictUtils.getDictLabel('sys_lang_type', lang(), 'zh_CN')}
 					</a>
 					<ul class="dropdown-menu">
@@ -76,7 +78,7 @@
 		</div>
 	</div>
 	<div class="login-copyright">
-		版权所有 &copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>.
+		&copy; ${@DateUtils.getYear()} ${productName} - Powered By <a href="http://jeesite.com">JeeSite</a>.
 	</div>
 </div>
 <% } %>