Merge branch 'master' into New_Enhancement

src/pages/Proof/Create_FromApp/UploadFileTable.js

@@ -166,7 +166,7 @@ export default function UploadFileTable({ recordList, setRecordList, showPageCol
             flex: 1,
             hide: true,
             renderCell: () => {
-                return expectedCode == checkCode?{checkCode}:<div style={{ margin: 4, color:"red" }}>Warning, File Code not match.<br/>File Code: {checkCode}<br/>Expected Code: {expectedCode}</div>;
+                return (expectedCode == checkCode)?checkCode:<div style={{ margin: 4, color:"red" }}>Warning, File Code not match.<br/>File Code: {checkCode}<br/>Expected Code: {expectedCode}</div>;
             },
         },
         {

src/translations/en.json

@@ -148,9 +148,9 @@
   "userLoginName": "Username",
   "userPassword": "Password",
   
-  "loginErrorMessage1":"Account will be blocked",
-  "loginErrorMessage2":"Account login errors for Five Consecutive Times, please contact the system administrator",
-  "loginErrorMessage3":"Account has not been Verified",
+  "loginErrorMessage1":"Account is locked",
+  "loginErrorMessage2":"As your account has been locked due to five consecutive login errors, please retrieve your password by forgot password or please reach out to the system administrator for further assistance.",
+  "loginErrorMessage3":"Account has not been verified",
   "loginErrorMessage4":"System Connection Failed",
   "loginErrorMessage5":"Incorrect Username or Password",
   "loginErrorMessage6":"User account not found",

src/translations/zh-CN.json

@@ -175,8 +175,8 @@
   "userLoginName": "用户登入名称",
   "userPassword": "密码",
   
-  "loginErrorMessage1":"帐户将被封锁",
-  "loginErrorMessage2":"帐户连续五次登入错误,请与系统管理员联络",
+  "loginErrorMessage1":"帐户已被封锁",
+  "loginErrorMessage2":"由于您的帐户因连续五次登录错误而被锁定，请通过忘记密码来找回您的密码，或联系系统管理员寻求进一步帮助。",
   "loginErrorMessage3":"帐户尚未验证",
   "loginErrorMessage4":"系统连接失败",
   "loginErrorMessage5":"用户名或密码错误",

src/translations/zh-HK.json

@@ -175,8 +175,8 @@
   "userLoginName": "用戶登入名稱",
   "userPassword": "密碼",
   
-  "loginErrorMessage1":"帳戶將被封鎖",
-  "loginErrorMessage2":"帳戶連續五次登入錯誤,請與系統管理員聯絡",
+  "loginErrorMessage1":"帳戶已被封鎖",
+  "loginErrorMessage2":"由於您的帳號因連續五次登入錯誤而被鎖定，請透過忘記密碼找回密碼或聯絡系統管理員尋求進一步協助。",
   "loginErrorMessage3":"帳戶尚未驗證",
   "loginErrorMessage4":"系統連接失敗",
   "loginErrorMessage5":"用戶名或密碼錯誤",