diff --git a/src/pages/User/ManagePage_OrgPublic/index.js b/src/pages/User/ManagePage_OrgPublic/index.js
index 5e505af..91c647e 100644
--- a/src/pages/User/ManagePage_OrgPublic/index.js
+++ b/src/pages/User/ManagePage_OrgPublic/index.js
@@ -81,14 +81,16 @@ const ManageOrgUserPage = () => {
if (params.row.locked) {
return (
<>
- {getStatusTag({ color: "#525150", text: "鎖定" })}
-
+ {getStatusTag({ color: "#525150", text: intl.formatMessage({id: 'locked'}) })}
+
>
)
} else if (!params.row.verifiedBy) {
- return getStatusTag({ color: "#fca503", text: "待批核" })
- } else if (params.row.status == "active") {
- return getStatusTag({ color: "#73AD21", text: "生效中" })
+ return getStatusTag({ color: "#fca503", text: intl.formatMessage({id: 'pendingFor'}) })
+ } else if (params.row.status === "active") {
+ return getStatusTag({ color: "#73AD21", text: intl.formatMessage({id: 'active'}) })
}
return getStatusTag({ text: params.row.status })
}
@@ -117,21 +119,21 @@ const ManageOrgUserPage = () => {
{
id: 'username',
field: 'username',
- headerName: getHeader('登錄名稱'),
+ headerName: getHeader(intl.formatMessage({id: 'loginName'})),
flex: 1,
},
{
id: 'contactPerson',
field: 'contactPerson',
- headerName: getHeader('用戶名稱'),
+ headerName: getHeader(intl.formatMessage({id: 'userName'})),
flex: 1,
},
{
id: 'contactTel',
field: 'contactTel',
- headerName: getHeader('聯絡電話'),
+ headerName: getHeader(intl.formatMessage({id: 'userContactNumber'})),
flex: 1,
valueGetter: (params) => {
let contactTel = JSON.parse(params.value)
@@ -141,13 +143,13 @@ const ManageOrgUserPage = () => {
{
id: 'emailBus',
field: 'emailBus',
- headerName: getHeader('電郵'),
+ headerName: getHeader(intl.formatMessage({id: 'userContactEmail'})),
flex: 1,
},
{
id: 'lastLogin',
field: 'lastLogin',
- headerName: getHeader('最後登入日期'),
+ headerName: getHeader(intl.formatMessage({id: 'lastLoginDate'})),
flex: 1,
valueGetter: (params) => {
return DateUtils.datetimeStr(params.value);
@@ -156,7 +158,7 @@ const ManageOrgUserPage = () => {
{
id: 'lastApply',
field: 'lastApply',
- headerName: getHeader('最後提交申請日期'),
+ headerName: getHeader(intl.formatMessage({id: 'lastSubmissionDate'})),
flex: 1,
valueGetter: () => {
return "--";
@@ -176,7 +178,7 @@ const ManageOrgUserPage = () => {
id: 'primaryUser',
field: 'primaryUser',
type: 'bool',
- headerName: getHeader('Primary'),
+ headerName: getHeader(intl.formatMessage({id: 'primary'})),
flex: 1,
renderCell: (params) => {
console.log(params);
diff --git a/src/translations/en.json b/src/translations/en.json
index e5ce08f..fad2705 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -325,6 +325,14 @@
"sendDateFrom": "Send date (from)",
"sendDateTo": "Send date (to)",
"files": "File(s)",
+ "loginName": "Login Name",
+ "lastLoginDate": "Last login date",
+ "lastSubmissionDate": "Last submission date",
+ "locked": "Locked",
+ "unlock": "Unlock",
+ "pendingFor": "Pending approval",
+ "active": "Active",
+ "primary": "Primary",
"Dashboard": "Dashboard",
"event": "Event"
diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json
index 2dfdec0..4c9baaf 100644
--- a/src/translations/zh-CN.json
+++ b/src/translations/zh-CN.json
@@ -324,6 +324,14 @@
"sendDateFrom": "发送日期(从)",
"sendDateTo": "发送日期(到)",
"files": "档案",
+ "loginName": "登录名称",
+ "lastLoginDate": "最后登入日期",
+ "lastSubmissionDate": "最后提交申请日期",
+ "locked": "锁定",
+ "unlock": "解锁",
+ "pendingFor": "待批核",
+ "active": "生效中",
+ "primary": "源自",
"Dashboard": "仪表板",
"event": "活动"
diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json
index 42bb7d4..345bf59 100644
--- a/src/translations/zh-HK.json
+++ b/src/translations/zh-HK.json
@@ -324,6 +324,14 @@
"sendDateFrom": "發送日期(從)",
"sendDateTo": "發送日期(到)",
"files": "檔案",
+ "loginName": "登錄名稱",
+ "lastLoginDate": "最後登入日期",
+ "lastSubmissionDate": "最後提交申請日期",
+ "locked": "鎖定",
+ "unlock": "解鎖",
+ "pendingFor": "待批核",
+ "active": "生效中",
+ "primary": "源自",
"Dashboard": "儀表板",
"event": "活動"