From 9d496f4415446b62ce719e0d45aa10674bf6e9f6 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Fri, 20 Jul 2018 14:09:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=B9=E6=A1=86=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=9A=84=E7=A1=AE=E5=AE=9A=E5=92=8C=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/messages/message_en.properties  | 10 ++++----
 .../jquery-jbox/2.3/jquery.jBox-2.3.src.js    | 23 ++++++++++++++-----
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 60bb7dfc4..155e3a9d8 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -574,12 +574,12 @@ file=File
 select_file=Please Select Upload File
 sample_file=Sample File
 sample_sign=Sample Sign
-click_detail=\u8BF7\u70B9\u51FB\u201C\u67E5\u770B\u8BE6\u7EC6\u4FE1\u606F\u201D\u6309\u94AE,\u5C06\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F\u53D1\u9001\u7ED9\u7CFB\u7EDF Management\u5458,\u8C22\u8C22\!
-return_lastpage=\u8FD4\u56DE\u4E0A\u4E00\u9875
-show_detail=\u67E5\u770B\u8BE6\u7EC6\u4FE1\u606F
+click_detail=Please click the "view details" button to send the detailed error message to the system Management clerk. Thank you!
+return_lastpage=Return to the last page
+show_detail=View details
 hidden_detail=\u9690\u85CF\u4FE1\u606F\u4FE1\u606F
-notfound_page=\u9875\u9762\u4E0D\u5B58\u5728
-no_permission=\u6743\u9650\u4E0D\u8DB3
+notfound_page=Page does not exist
+no_permission=Lack of authority
 param_error=\u53C2\u6570\u6709\u8BEF,\u670D\u52A1\u5668\u65E0\u6CD5\u89E3\u6790.
 request_service_failed=\u8BF7\u6C42\u670D\u52A1\u63A5\u53E3\u5931\u8D25
 request_error=Request Error
diff --git a/src/main/webapp/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js b/src/main/webapp/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js
index e7b3532dd..a7471ab8d 100644
--- a/src/main/webapp/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js
+++ b/src/main/webapp/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js
@@ -599,17 +599,28 @@
     };
   //国际化切换
     var type=navigator.appName;
-    if(type=="Netscape"){
+   /* if(type=="Netscape"){
     	var lang = navigator.language;//获取浏览器语言配置支持非IE
     }else{
     	var lang = navigator.userLanguage;//支持IE
-    }
-	var lang = lang.toLowerCase();
-	if(lang.indexOf("zh")!=-1) {
-		
+    }*/
+	var arrCookie = document.cookie.toLowerCase().split(";");
+	console.log(document.cookie);
+	for(i=0;i<arrCookie.length;i++){
+		var key=arrCookie[i].split("=")[0];
+		var value=arrCookie[i].split("=")[1];
+		if(key.indexOf("language") > -1){
+			var lang=value;
+		}
+	}
+	//国际化切换
+	if(lang=="" || lang.indexOf("en")!=-1) {
+		$.jBox.stateDefaults = { content: '', buttons: { 'ok': 'ok' }, buttonsFocus: 0, submit: function (v, h, f) { return true; } };
+		$.jBox.languageDefaults = { close: 'close', ok: 'ok', yes: 'yes', no: 'no', cancel: 'cancel' };
+	}else if(lang.indexOf("cn")!=-1) {
 		$.jBox.stateDefaults = { content: '', buttons: { '确定': 'ok' }, buttonsFocus: 0, submit: function (v, h, f) { return true; } };
 		$.jBox.languageDefaults = { close: "", ok: '确定', yes: '是', no: '否', cancel: '取消' };
-	}else{
+	}else if(lang.indexOf("ru")!=-1) {
 		$.jBox.stateDefaults = { content: '', buttons: { 'ok': 'ok' }, buttonsFocus: 0, submit: function (v, h, f) { return true; } };
 		$.jBox.languageDefaults = { close: 'close', ok: 'ok', yes: 'yes', no: 'no', cancel: 'cancel' };
 	}