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 995396ab..1d02952e 100644
--- a/common/src/main/resources/static/layer/3.1/layer.js
+++ b/common/src/main/resources/static/layer/3.1/layer.js
@@ -10,10 +10,20 @@
;!function(window, undefined){
"use strict";
-var messages;
-var lang = window.lang || "zh_CN";
-if (lang == 'en'){
- messages = {
+var i18n = {
+ btnOk: '确定',
+ btnCancel: '取消',
+ title: '信息',
+ promptTipA: '最多输入',
+ promptTipB: '个字符',
+ noPicture: '没有图片',
+ photoError: '当前图片地址异常
是否继续查看下一张？',
+ photoNextPage: '下一张',
+ photoClose: '不看了'
+};
+
+if (window.lang == 'en'){
+ i18n = {
btnOk: 'Ok',
btnCancel: 'Cancle',
title: 'Information',
@@ -24,18 +34,6 @@ if (lang == 'en'){
photoNextPage: 'The next',
photoClose: 'Close'
};
-}else{
- messages = {
- btnOk: '确定',
- btnCancel: '取消',
- title: '信息',
- promptTipA: '最多输入',
- promptTipB: '个字符',
- noPicture: '没有图片',
- photoError: '当前图片地址异常
是否继续查看下一张？',
- photoNextPage: '下一张',
- photoClose: '不看了'
- };
}
var isLayui = window.layui && layui.define, $, win, ready = {
@@ -46,7 +44,7 @@ var isLayui = window.layui && layui.define, $, win, ready = {
}(),
config: {}, end: {}, minIndex: 0, minLeft: [],
- btn: [messages.btnOk, messages.btnCancel],
+ btn: [i18n.btnOk, i18n.btnCancel],
//五种原始层模式
type: ['dialog', 'page', 'iframe', 'loading', 'tips']
@@ -212,7 +210,7 @@ Class.pt.config = {
shade: 0.3,
fixed: true,
move: doms[1],
- title: messages.title,
+ title: i18n.title,
offset: 'auto',
area: 'auto',
closeBtn: 1,
@@ -1022,7 +1020,7 @@ layer.prompt = function(options, yes){
return layer.open($.extend({
type: 1
- ,btn: [messages.btnOk,messages.btnCancel]
+ ,btn: [i18n.btnOk,i18n.btnCancel]
,content: content
,skin: 'layui-layer-prompt' + skin('prompt')
,maxWidth: win.width()
@@ -1037,7 +1035,7 @@ layer.prompt = function(options, yes){
if(value === ''){
prompt.focus();
} else if(value.length > (options.maxlength||500)) {
- layer.tips(messages.promptTipA + (options.maxlength || 500) + messages.promptTipB, prompt, {tips: 1});
+ layer.tips(i18n.promptTipA + (options.maxlength || 500) + i18n.promptTipB, prompt, {tips: 1});
} else {
yes && yes(value, index, prompt);
}
@@ -1289,9 +1287,9 @@ layer.photos = function(options, loop, key){
}, options));
}, function(){
layer.close(dict.loadi);
- layer.msg(messages.photoError, {
+ layer.msg(i18n.photoError, {
time: 30000,
- btn: [messages.photoNextPage, messages.photoClose],
+ btn: [i18n.photoNextPage, i18n.photoClose],
yes: function(){
data.length > 1 && dict.imgnext(true,true);
}
diff --git 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
index 52f72269..d967f264 100644
Binary files a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx and b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx differ
diff --git a/modules/core/src/main/resources/i18n/core/i18n_en.properties b/modules/core/src/main/resources/i18n/core/common/i18n_en.properties
similarity index 82%
rename from modules/core/src/main/resources/i18n/core/i18n_en.properties
rename to modules/core/src/main/resources/i18n/core/common/i18n_en.properties
index 5ec18247..dc4fcbee 100644
--- a/modules/core/src/main/resources/i18n/core/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
# 文件上传相关
diff --git a/modules/core/src/main/resources/i18n/core/i18n_zh_CN.properties b/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties
similarity index 82%
rename from modules/core/src/main/resources/i18n/core/i18n_zh_CN.properties
rename to modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties
index 632d69d0..07c1c33a 100644
--- a/modules/core/src/main/resources/i18n/core/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=返回上一页
# 文件上传相关
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
new file mode 100644
index 00000000..0595d0f3
--- /dev/null
+++ 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
+
diff --git a/modules/core/src/main/resources/views/error/400.html b/modules/core/src/main/resources/views/error/400.html
index cc690d3d..fad968b2 100644
--- 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 {
<% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %>
- 版权所有 © ${@DateUtils.getYear()} ${productName} - Powered By
JeeSite.
+ © ${@DateUtils.getYear()} ${productName} - Powered By
JeeSite.
403
${message}
-
很抱歉，您没有权限访问此页面，若有疑问请联系管理员。
+
${text('sys.error.403.message.p1')}
<% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %>
- 版权所有 © ${@DateUtils.getYear()} ${productName} - Powered By
JeeSite.
+ © ${@DateUtils.getYear()} ${productName} - Powered By
JeeSite.
404
${message}
-
可能是如下原因引起的这个错误：
+
${text('sys.error.404.message.p1')}
- - 地址输入错误，链接已经失效过期.
+ - ${text('sys.error.404.message.p2')}
-
- 您访问的地址为：${
+ ${text('sys.error.404.message.p3')}${
@EncodeUtils.encodeHtml(
@request.getAttribute('javax.servlet.forward.request_uri')
)
}
- - 若有疑问请联系管理员.
+ - ${text('sys.error.404.message.p4')}
- ......
<% } %>
diff --git a/modules/core/src/main/resources/views/error/500.html b/modules/core/src/main/resources/views/error/500.html
index 9c09ca15..281c060f 100644
--- 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 {
500
${message}
-
对不起，你访问的页面出现了一点问题，请及时联系管理员解决！
+
${text('sys.error.500.message.p1')}
<% var productName = @Global.getConfig('productName'), productVersion = @Global.getConfig('productVersion'); %>
- 版权所有 © ${@DateUtils.getYear()} ${productName} - Powered By
JeeSite.
+ © ${@DateUtils.getYear()} ${productName} - Powered By
JeeSite.
<#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"/>
@@ -33,7 +33,7 @@
- <#form:input path="dictLabel" maxlength="100" class="form-control required "/>
+ <#form:input path="dictLabelOrig" maxlength="100" class="form-control required "/>
diff --git a/modules/core/src/main/resources/views/modules/sys/dictDataList.html b/modules/core/src/main/resources/views/modules/sys/dictDataList.html
index aca64732..a1a0a496 100644
--- 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 @@
@@ -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 '
'+(val||row.id)+'';
}},
{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){
}
diff --git a/modules/core/src/main/resources/views/modules/sys/sysDesktop.html b/modules/core/src/main/resources/views/modules/sys/sysDesktop.html
index cc4a4156..127effdc 100644
--- 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 @@
<% } %>
+
+
\ No newline at end of file
diff --git a/modules/core/src/main/resources/views/modules/sys/sysIndex/leftMenu.html b/modules/core/src/main/resources/views/modules/sys/sysIndex/leftMenu.html
index 29141868..26d915f2 100644
--- 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 @@
.replaceFirst('/ctxPath', ctxPath)})