Alex Cheung 1 year ago
parent
commit
4a53128b0b
2 changed files with 4 additions and 2 deletions
  1. +3
    -1
      src/pages/dashboard/Public/index.js
  2. +1
    -1
      src/translations/zh-HK.json

+ 3
- 1
src/pages/dashboard/Public/index.js View File

@@ -36,6 +36,8 @@ const DashboardDefault = () => {
backgroundPosition: 'right'
}

const { locale } = intl;

const getWelcomeMsg=()=>{
var current = new Date()
var curHr = current.getHours()
@@ -56,7 +58,7 @@ const DashboardDefault = () => {
<Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
{/* <Typography variant="h5">我的公共啟事</Typography> */}
<Typography color='#FFF' variant="h5" sx={{ ml: 10, display: { xs: 'none', sm: 'none', md: 'block' } }}>
{isORGLoggedIn() ? userData.fullenName : userData.fullchName}, {getWelcomeMsg()}
{isORGLoggedIn() ? userData.fullenName: (locale === 'en' ?userData.fullenName: userData.fullchName)}, {getWelcomeMsg()}
</Typography>
</Stack>
</div>


+ 1
- 1
src/translations/zh-HK.json View File

@@ -97,7 +97,7 @@
"setting": "設定",
"companyOrUserRecord": "公司/機構用戶記錄",
"welcomeMsg_am": "早安! 請選擇所需服務。",
"welcomeMsga_pm": "午安! 請選擇所需服務。",
"welcomeMsg_pm": "午安! 請選擇所需服務。",
"welcomeMsg_night": "晚安! 請選擇所需服務。",

"login": "登入",


Loading…
Cancel
Save