增加英文语言包

o2web/source/o2_core/o2.js

@@ -86,8 +86,9 @@ if (!window.Promise){
         "path": "../o2_core/o2"
     };
 
-    _lp = _lp.toLowerCase();
-    var supportedLanguages = ["zh-cn", "en"];
+    this.o2.languageName = _lp;
+    _lp = _lp.toLocaleLowerCase();
+    var supportedLanguages = ["zh-CN", "en"];
     if (supportedLanguages.indexOf(_lp)==-1) _lp = "zh-cn";
     this.o2.language = _lp;
     this.o2.splitStr = /\s*(?:,|;)\s*/;
@@ -1490,6 +1491,8 @@ if (!window.Promise){
 
                 res.setHeader("Content-Type", "application/json; charset=utf-8");
                 res.setHeader("Accept", "text/html,application/json,*/*");
+                res.setHeader("Accept-Language", o2.languageName);
+
                 if (window.layout) {
                     if (layout["debugger"]){
                         res.setHeader("x-debugger", "true");

o2web/source/x_component_Profile/lp/en.js

@@ -38,7 +38,7 @@ MWF.xApplication.Profile.LP = {
     "ipAddressIncorrectNotice" : "IP address format is incorrect:",
     "language": "Language",
     "lps": {
-        "zh-cn": "简体中文",
+        "zh-CN": "简体中文",
         "en": "English(US)"
     },
 

o2web/source/x_component_Profile/lp/zh-cn.js

@@ -38,8 +38,8 @@ MWF.xApplication.Profile.LP = {
     "ipAddressIncorrectNotice" : "IP地址格式不正确：",
     "language": "语言设置",
     "lps": {
-        "zh-cn": "简体中文",
-        "en": "English(US)"
+        "zh-CN": "简体中文",
+        "en": "English"
     },
 
     "passwordRule" : "密码规则",

o2web/source/x_component_process_ProcessManager/$Main/startMenu.json

@@ -33,7 +33,7 @@
 //    "sub": []
 //  },
   {
-    "title": "数据配置",
+    "title": MWF.xApplication.process.ProcessManager.LP.dataConfig,
     "id": "1.1",
     "action": "dataConfig",
     "icon": "process_data.png",
@@ -41,7 +41,7 @@
     "sub": []
   },
   {
-    "title": "脚本配置",
+    "title": MWF.xApplication.process.ProcessManager.LP.scriptConfig,
     "id": "1.1",
     "action": "scriptConfig",
     "icon": "process_script.png",
@@ -49,7 +49,7 @@
     "sub": []
   },
   {
-    "title": "资源文件",
+    "title": MWF.xApplication.process.ProcessManager.LP.fileConfig,
     "id": "1.1",
     "action": "fileConfig",
     "icon": "process_file.png",
@@ -65,7 +65,7 @@
 //    "sub": []
 //  },
   {
-    "title": "应用属性",
+    "title": MWF.xApplication.process.ProcessManager.LP.applicationConfig,
     "id": "1.1",
     "action": "applicationProperty",
     "icon": "process_property.png",

o2web/source/x_component_process_ProcessManager/lp/en.js

@@ -17,6 +17,13 @@ MWF.xApplication.process.ProcessManager.LP = {
     "copyConfirm_cancel": "Cancel",
     "copynew": "New",
 
+    "formConfig": "Form",
+    "processConfig": "Process",
+    "dataConfig": "Data",
+    "scriptConfig": "Script",
+    "fileConfig": "Resource",
+    "applicationConfig": "Attributes",
+
     "findDesigner": "FindCode",
 
     "ok": "OK",

o2web/source/x_component_process_ProcessManager/lp/zh-cn.js

@@ -18,11 +18,11 @@ MWF.xApplication.process.ProcessManager.LP = {
     "copynew": "新",
 
     "formConfig": "表单配置",
-    // "formConfig": "",
-    // "formConfig": "",
-    // "formConfig": "",
-    // "formConfig": "",
-    // "formConfig": "",
+    "processConfig": "流程配置",
+    "dataConfig": "数据配置",
+    "scriptConfig": "脚本配置",
+    "fileConfig": "资源文件",
+    "applicationConfig": "应用属性",
 
     "findDesigner": "查找设计",
 

o2web/source/x_desktop/js/base_loader.js

@@ -104,7 +104,16 @@ o2.addReady(function () {
 
         layout.sessionPromise = new Promise(function(resolve, reject){
             o2.Actions.get("x_organization_assemble_authentication").getAuthentication(function (json) {
-                if (resolve) resolve(json.data);
+                if (json.data.language !== o2.languageName){
+                    o2.language = json.data.language.toLowerCase();
+                    o2.languageName = json.data.language;
+                    var lp = o2.session.path + "/lp/" + o2.language + ".js";
+                    o2.load(lp, {"reload": true}, function(){
+                        if (resolve) resolve(json.data);
+                    });
+                }else{
+                    if (resolve) resolve(json.data);
+                }
             }.bind(this), function (xhr, text, error) {
                 if (reject) reject({"xhr": xhr, "text": text, "error": error});
             }.bind(this));