Merge branch 'CR026' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI into CR026

src/pages/Organization/DetailPage/OrganizationCard.js

@@ -791,7 +791,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                     </DialogContent>
                     <DialogActions>
                         <Button variant="contained" onClick={() => setConfirmBrPopUp(false)} sx={GREY_CONTAINED_BUTTON_SX}>
-                            <Typography variant="h5">{intl.formatMessage({ id: "close" })}</Typography>
+                            <Typography variant="h5">{intl.formatMessage({ id: "cancel" })}</Typography>
                         </Button>
                         <Button variant="contained" onClick={() => confirmNewBr()} sx={PRIMARY_CONTAINED_BUTTON_SX}>
                             <Typography variant="h5">{intl.formatMessage({ id: "confirmNewBr" })}</Typography>

src/translations/en.json

@@ -292,7 +292,7 @@
   "uploadFile": "Upload business registration certificate",
   "pleaseUploadIdDoc": "Please upload a digital file of your valid identity document to verify your identity.",
   "pleaseUploadIdDocSubTitle": "Such as: Hong Kong ID card; passport; Mainland China ID card; professional practice certificate, etc.",
-  "acceptRegisterUploadFileFormats": "Accept file formats: PDF, JPG, JPEG, PNG, and BMP. Support maximum 5 files.",
+  "acceptRegisterUploadFileFormats": "Accept file formats: pdf, jpg, jpeg, png and bmp. Support maximum 5 files.",
   "uploadIdDoc": "Upload identity document",
   "fileName": "File name",
   "forOrgUser": "For Organisation / Company Users",
@@ -609,12 +609,12 @@
   "expiryDate": "Expiry Date",
   "brStatusValid": "Valid",
   "brStatusInvalid": "Invalid",
-  "submitBrCertificate": "Submit Business Registration Certificate (BR)",
-  "goToSubmitBr": "Go to submit BR",
+  "submitBrCertificate": "Submit Business Registration (BR) Certificate",
+  "goToSubmitBr": "Submit BR Certificate",
   "brPopupTitleExpiring": "Reminder",
   "brPopupTitleExpired": "Action Required",
   "brPopupTitlePendingVerify": "Notice",
-  "selectCertificateFile": "Select Certificate File",
+  "selectCertificateFile": "Select BR Certificate File",
   "newBrExpiryDate": "New BR Expiry Date",
   "newBr": "New BR",
   "newBrInformation": "New BR Information",

src/translations/zh-CN.json

@@ -335,7 +335,7 @@
   "uploadFile": "上传商业登记证",
   "pleaseUploadIdDoc": "请上传你的 有效身份证明文件 的数码档案，以验证你的身份。",
   "pleaseUploadIdDocSubTitle": "如: 香港身份证; 护照; 中国内地身份证; 专业执业证书等",
-  "acceptRegisterUploadFileFormats": "接受档案格式：PDF、JPG、JPEG、PNG 及 BMP。最多可上传 5 个档案。",
+  "acceptRegisterUploadFileFormats": "接受档案格式：pdf, jpg, jpeg, png and bmp。最多可上传 5 个档案。",
   "uploadIdDoc": "上传身份证明文件",
   "fileName": "档案名称",
   "forOrgUser": "机构/公司用户",
@@ -605,12 +605,12 @@
   "expiryDate": "屆滿日期",
   "brStatusValid": "有效",
   "brStatusInvalid": "无效",
-  "submitBrCertificate": "提交商业登记证 (BR)",
-  "goToSubmitBr": "去提交证书",
+  "submitBrCertificate": "提交商业登记证",
+  "goToSubmitBr": "提交商业登记证",
   "brPopupTitleExpiring": "温馨提示",
   "brPopupTitleExpired": "系统提示",
   "brPopupTitlePendingVerify": "系统提示",
-  "selectCertificateFile": "选择证书档案",
+  "selectCertificateFile": "选择商业登记证档案",
   "newBrExpiryDate": "新商业登记证届满日期",
   "newBr": "新商业登记证",
   "newBrInformation": "新商业登记证资料",

src/translations/zh-HK.json

@@ -329,7 +329,7 @@
   "pleaseUploadDoc": "請上傳你的 有效商業登記證 的數碼檔案，以驗證你的身份。",
   "pleaseUploadIdDoc": "請上傳你的 有效身份證明文件 的數碼檔案，以驗證你的身份。",
   "pleaseUploadIdDocSubTitle": "如: 香港身份證; 護照; 中國內地身份證; 專業執業証書等",
-  "acceptRegisterUploadFileFormats": "接受檔案格式：PDF、JPG、JPEG、PNG 及 BMP。最多可上載 5 個檔案。",
+  "acceptRegisterUploadFileFormats": "接受檔案格式：pdf, jpg, jpeg, png and bmp。最多可上載 5 個檔案。",
   "uploadIdDoc": "上傳身份證明文件",
   "uploadFile": "上傳商業登記證",
   "fileName": "檔案名稱",
@@ -606,12 +606,12 @@
   "expiryDate": "屆滿日期",
   "brStatusValid": "有效",
   "brStatusInvalid": "無效",
-  "submitBrCertificate": "提交商業登記證 (BR)",
-  "goToSubmitBr": "去提交證書",
+  "submitBrCertificate": "提交商業登記證",
+  "goToSubmitBr": "提交商業登記證",
   "brPopupTitleExpiring": "溫馨提示",
   "brPopupTitleExpired": "系統提示",
   "brPopupTitlePendingVerify": "系統提示",
-  "selectCertificateFile": "選擇證書檔案",
+  "selectCertificateFile": "選擇商業登記證檔案",
   "newBrExpiryDate": "新商業登記證屆滿日期",
   "newBr": "新商業登記證",
   "newBrInformation": "新商業登記證資料",