diff --git a/src/pages/dashboard/Public/index.js b/src/pages/dashboard/Public/index.js index 00f3deb..e3de4e4 100644 --- a/src/pages/dashboard/Public/index.js +++ b/src/pages/dashboard/Public/index.js @@ -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 = () => { {/* 我的公共啟事 */} - {isORGLoggedIn() ? userData.fullenName : userData.fullchName}, {getWelcomeMsg()} + {isORGLoggedIn() ? userData.fullenName: (locale === 'en' ?userData.fullenName: userData.fullchName)}, {getWelcomeMsg()} diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index 6b2d6dd..8c12694 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -97,7 +97,7 @@ "setting": "設定", "companyOrUserRecord": "公司/機構用戶記錄", "welcomeMsg_am": "早安! 請選擇所需服務。", - "welcomeMsga_pm": "午安! 請選擇所需服務。", + "welcomeMsg_pm": "午安! 請選擇所需服務。", "welcomeMsg_night": "晚安! 請選擇所需服務。", "login": "登入",