From 4ff3bef0ada5b46fba9b48bf2332d67aa0ce04a4 Mon Sep 17 00:00:00 2001 From: Jason Chuang Date: Thu, 8 Jan 2026 17:23:01 +0800 Subject: [PATCH] update --- src/layout/MainLayout/Header/index.js | 53 +++++++++++++++++-- src/pages/authentication/AuthWrapper.js | 15 +++--- .../PrivacyPolicyPage/PrivacyPolicy_cn.js | 4 +- .../PrivacyPolicyPage/PrivacyPolicy_en.js | 4 +- .../PrivacyPolicyPage/PrivacyPolicy_zh.js | 6 +-- src/translations/en.json | 2 +- src/translations/zh-CN.json | 4 +- src/translations/zh-HK.json | 4 +- 8 files changed, 66 insertions(+), 26 deletions(-) diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js index 010550c..b367edb 100644 --- a/src/layout/MainLayout/Header/index.js +++ b/src/layout/MainLayout/Header/index.js @@ -67,6 +67,33 @@ import { FormattedMessage } from "react-intl"; const drawerWidth = 300; +const ABOUT_SWITCH_DATE = new Date(2026, 0, 27); // 2026-01-28 + +const startOfDay = (d) => new Date(d.getFullYear(), d.getMonth(), d.getDate()); + +// 規則：<= 2026-01-28 用舊 aboutUs；> 2026-01-28 先轉外部 +const isAfterAboutSwitchDate = () => { + const today = startOfDay(new Date()); + const switchDay = startOfDay(ABOUT_SWITCH_DATE); + return today.getTime() > switchDay.getTime(); // strictly AFTER +}; + +const getAboutExternalUrlByLocale = () => { + const locale = (localStorage.getItem("locale") || "").toLowerCase(); + + if (locale === "zh-hk") { + // TChinese + return "https://www.gld.gov.hk/en/our-services/printing/advertising-gov-gazette/"; + } + if (locale === "zh-cn") { + // Simplified Chinese (你未貼，我用 zh-cn 版) + return "https://www.gld.gov.hk/zh-cn/our-services/printing/advertising-gov-gazette/"; + } + // English (en-us) / fallback + return "https://www.gld.gov.hk/zh-hk/our-services/printing/advertising-gov-gazette/"; +}; + + // const navItems = ['Home', 'About', 'Contact']; // ==============================|| MAIN LAYOUT - HEADER ||============================== // @@ -584,12 +611,28 @@ function Header(props) { const logoutContent = (
  • - - - - - + {!isAfterAboutSwitchDate() ? ( + // On or before 28/1/2026 + + + + + + ) : ( + // After 28/1/2026 + + + + + + )}
    • + {/*
  • diff --git a/src/pages/authentication/AuthWrapper.js b/src/pages/authentication/AuthWrapper.js index 4b14220..935f911 100644 --- a/src/pages/authentication/AuthWrapper.js +++ b/src/pages/authentication/AuthWrapper.js @@ -99,13 +99,14 @@ const AuthWrapper = ({ children }) => {
    - : ""} - -
    - + : + +
    + + } {

    - (注：请以个人资料私隐专员指定的 - 表格 - 提出查阅资料申请。) + (注：请以个人资料私隐专员指定的表格提出查阅资料申请。)

    ` diff --git a/src/pages/extra-pages/PrivacyPolicyPage/PrivacyPolicy_en.js b/src/pages/extra-pages/PrivacyPolicyPage/PrivacyPolicy_en.js index 8020d8b..9e5b4f7 100644 --- a/src/pages/extra-pages/PrivacyPolicyPage/PrivacyPolicy_en.js +++ b/src/pages/extra-pages/PrivacyPolicyPage/PrivacyPolicy_en.js @@ -119,14 +119,14 @@ const Page = () => {

    Access to Personal Data

    - Requests for access to or correction of personal data held by us should be addressed to: + Requests for access to or correction of personal data held by us should be addressed to -

    Data Protection Officer
    Government Logistics Department
    10/F, North Point Government Offices
    - 333 Java Road, North Point
    + 333 Java Road North Point
    Hong Kong
    diff --git a/src/pages/extra-pages/PrivacyPolicyPage/PrivacyPolicy_zh.js b/src/pages/extra-pages/PrivacyPolicyPage/PrivacyPolicy_zh.js index c891896..202a132 100644 --- a/src/pages/extra-pages/PrivacyPolicyPage/PrivacyPolicy_zh.js +++ b/src/pages/extra-pages/PrivacyPolicyPage/PrivacyPolicy_zh.js @@ -66,7 +66,7 @@ const AboutUs = () => {

    私隱政策

    - 保障個人資料私隱是政府物流服務署每位成員所關注的事宜。我們尊重個人資料私隱，並承諾全面執行及遵從保障資料原則及《個人資料（私隱）條例》的所有相關條文。政府物流服務署建立及實施系統監控，以確保遵從以下六項保障資料原則： + 保障個人資料私隱是政府物流服務署每位成員所關注的事宜。我們尊重個人資料私隱，並承諾全面執行及遵從保障資料原則及《個人資料（私隱）條例》的所有相關條文。政府物流服務署建立及實施系統監控，以確保遵從以下六項保障資料原則 -

      @@ -103,9 +103,7 @@ const AboutUs = () => {

      - (註：請以個人資料私隱專員指定的 - 表格 - 提出查閱資料要求。) + (註：請以個人資料私隱專員指定的表格提出查閱資料要求。)

    ` diff --git a/src/translations/en.json b/src/translations/en.json index 54b42e8..9922871 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -43,7 +43,7 @@ "applyTickStr":"I acknowledge and confirm that the information provided above is correct. I have also read and understood the above “Points to note”.", "applyTickUnderStr0":"Points to note:", "applyTickUnderStr1":"

    The applicant must ensure that the public notice submitted for publication in the Gazette is accurate and is the final version. The publication of a public notice in the Gazette is normally for the compliance of the provisions of Hong Kong Laws or Court Orders. The Director of Government Logistics reserves the right to reject public notices which are considered not suitable for publication.

    ", - "applyTickUnderStr2":"

    For further details, please refer to the “Notes on Publishing Public Notices in the Gazette through PNSPS”.

    ", + "applyTickUnderStr2":"

    For further details, please refer to the “Notes on Publication of Public Notices in the Gazette”.

    ", "applyTickUnderStr3":"

    The personal data provided by the applicant in this form would be used for application of public notice publication and for assumption of liability. The personal data provided in this form may be disclosed to other bureaux / departments. The applicant has a right of access and correction with respect to personal data. Requests for access to or correction of personal data should be addressed to the Personal Data Privacy Officer, Government Logistics Department, 10/F, North Point Government Offices, 333 Java Road, North Point, Hong Kong.

    ", "submitted": "Submitted", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index 47294ec..5265cf4 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -43,8 +43,8 @@ "applyTickStr":"我确认上述提供的资料正确无误，和已阅读并明白上述「注意事项」。", "applyTickUnderStr0":"注意事项：", "applyTickUnderStr1":"

    申请人必须确保递交的稿件内容正确，并且是最终的版本。在宪报上刊登公共启事一般是为符合香港法例或法院命令的规定。政府物流服务署署长有权拒收不适宜刊登的公共启事。

    ", - "applyTickUnderStr2":"

    有关申请刊登详情，请参阅「透过系统于宪报刊登公共启事须知」。

    ", - "applyTickUnderStr3":"

    申请人在本申请表格内所提供的个人资料会供申请刊登公共启事及为承担法律责任用途。政府物流服务署可能会向其他政策局/ 部门披露你在此表格内填报的个人资料。申请人有权查阅及改正个人资料。如要查阅或改正个人资料，请向本署个人资料私隐主任提出，地址为香港北角渣华道333号北角政府合署十楼。

    " , + "applyTickUnderStr2":"

    有关申请刊登详情，请参阅「于宪报刊登公共启事须知」。

    ", + "applyTickUnderStr3":"

    申请人在本申请表格内所提供的个人资料会供申请刊登公共启事及为承担法律责任用途。政府物流服务署可能会向其他政策局/ 部门披露你在此表格内填报的个人资料。申请人有权查阅及改正个人资料。如要查阅或改正个人资料，请向政府物流服务署个人资料私隐主任提出，地址为香港北角渣华道333号北角政府合署十楼。

    " , "submitted": "提交成功", "confirmingDealine": "确认校对截止日期", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index dd04add..e90bfbe 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -43,8 +43,8 @@ "applyTickStr":"我確認上述提供的資料正確無誤，和已閱讀並明白上述“注意事項”。", "applyTickUnderStr0":"注意事項：", "applyTickUnderStr1":"

    申請人必須確保遞交的稿件內容正確，並且是最終的版本。在憲報上刊登公共啟事一般是為符合香港法例或法院命令的規定。政府物流服務署署長有權拒收不適宜刊登的公共啟事。

    ", - "applyTickUnderStr2":"

    有關申請刊登詳情，請參閱「透過系統於憲報刊登公共啟事須知」。

    ", - "applyTickUnderStr3":"

    申請人在本申請表格內所提供的個人資料會供申請刊登公共啟事及為承擔法律責任用途。政府物流服務署可能會向其他政策局 / 部門披露你在此表格內填報的個人資料。申請人有權查閱及改正個人資料。如要查閱或改正個人資料，請向本署個人資料私隱主任提出，地址為香港北角渣華道333號北角政府合署十樓。

    ", + "applyTickUnderStr2":"

    有關申請刊登詳情，請參閱「於憲報刊登公共啟事須知」。

    ", + "applyTickUnderStr3":"

    申請人在本申請表格內所提供的個人資料會供申請刊登公共啟事及為承擔法律責任用途。政府物流服務署可能會向其他政策局 / 部門披露你在此表格內填報的個人資料。申請人有權查閱及改正個人資料。如要查閱或改正個人資料，請向政府物流服務署個人資料私隱主任提出，地址為香港北角渣華道333號北角政府合署十樓。

    ", "submitted": "提交成功", "confirmingDealine": "確認校對截止日期",