Merge branch 'blcMergeFromBohai' of http://114.115.138.98:8900/fukai/swifteditor…

Merge branch 'blcMergeFromBohai' of http://114.115.138.98:8900/fukai/swifteditor into blcMergeFromBohai

src/components/Header/index.js

@@ -8,7 +8,7 @@ import { Link } from 'react-router'
 
 import * as menu from '../../store/modules/menu/menu_action'
 
-import logo from './logo.png'
+// import logo from './logo.png'
 
 const SubMenu = Menu.SubMenu;
 const MenuItemGroup = Menu.ItemGroup;

src/components/Sidebar/index.js

@@ -9,8 +9,8 @@ import { logout } from '../../store/modules/user/user_action';
 
 // import * as Util from '../../util';
 
-import logo from './logo.jpg'
-import touxiang from './touxiang.jpg'
+// import logo from './logo.jpg'
+// import touxiang from './touxiang.jpg'
 
 const SubMenu = Menu.SubMenu
 
@@ -94,9 +94,14 @@ class Sidebar extends React.Component {
 
         return (
             <aside className={styles["ant-layout-sider"]}>
-                <div className={styles["ant-layout-logo"]}><img src={logo} /><span className={styles["nav-text"]}>xxxx后台</span></div>
+                <div className={styles["ant-layout-logo"]}>
+                    {/* <img src={logo} /> */}
+                    <span className={styles["nav-text"]}>xxxx后台</span>
+                </div>
                 <div className={styles["ant-layout-portrait"]} style={{ marginBottom: '10px' }}>
-                    <div className={styles["nav-portrait"]}><img src={touxiang} /></div>
+                    <div className={styles["nav-portrait"]}>
+                        {/* <img src={touxiang} /> */}
+                    </div>
                     <div className={styles["nav-portrait-name"]}>admin</div>
                 </div>
                 <Menu mode="inline" theme="dark" onClick={this.onClick.bind(this) }>

src/swift/MessageValidater.js

@@ -16,7 +16,7 @@ function mt700({Tags}){
         count+=itemValue[1].replace(/[\r\n]{1,2}/g,'').length
     });
     if(count > 63400)
-        return `45A,46A,47A,49G,49H总长度不得超过63400个字符`
+        return `45A,46A,47A,49G,49H The total length shall not exceed 63400 characters`
 }
 
 function mt707({Tags}){
@@ -29,7 +29,7 @@ function mt707({Tags}){
         count+=itemValue[1].replace(/[\r\n]{1,2}/g,'').length
     });
     if(count > 63400)
-        return `45B,46B,47B,49M,49N总长度不得超过63400个字符`
+        return `45B,46B,47B,49M,49N The total length shall not exceed 63400 characters`
 }
 
 const FUNC_SET={mt700,mt707}
\ No newline at end of file

src/swift/TagValidater.js

@@ -82,7 +82,7 @@ export function TagV(tag,status,value,tno,mty,seqlist,countMap={})
                 if(!val && (tag=='T11R' || tag=='T11S') && (key=='s3' || key=='s4') )
                 {
                     if(obj.s3||obj.s4)
-                        errmsg[key]="Session Number 、ISN必须同时填写"
+                        errmsg[key]="Session Number 、ISN Must be filled in at the same time"
                     
                 }
                 continue
@@ -321,7 +321,7 @@ function TestAdr(adr,reg,line,length)
     }
     let linemsg = ''
     if(arr.length > line)
-        linemsg = `最多${line}行`
+        linemsg = `Up to ${line} lines`
     let msg = []
     if(a1.length)
     {