From 1f2ec2a16adcdd9e0f6951a7198db7055749fc01 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Fri, 15 Mar 2024 16:34:09 +0800
Subject: [PATCH] comboData

---
 src/components/I18nProvider.js | 15 ++++++++++++++-
 src/translations/en.json       | 21 ---------------------
 src/translations/zh-CN.json    | 22 ----------------------
 src/translations/zh-HK.json    | 22 ----------------------
 src/utils/ApiPathConst.js      |  1 +
 5 files changed, 15 insertions(+), 66 deletions(-)

diff --git a/src/components/I18nProvider.js b/src/components/I18nProvider.js
index 413b7ee..cd09a53 100644
--- a/src/components/I18nProvider.js
+++ b/src/components/I18nProvider.js
@@ -4,7 +4,7 @@ import enMessages from '../translations/en.json';
 import cnMessages from '../translations/zh-CN.json';
 import hkMessages from '../translations/zh-HK.json';
 
-import { POST_TERMS_N_CONDITIONS  } from "utils/ApiPathConst";
+import { GET_COMBO, POST_TERMS_N_CONDITIONS  } from "utils/ApiPathConst";
 import * as HttpUtils from "utils/HttpUtils";
 
 const LocaleContext = createContext();
@@ -30,6 +30,19 @@ export const I18nProvider = ({ children }) => {
                 hkMessages["termsAndCon"]= responseData.zh;
             }
         });
+
+        HttpUtils.get({
+            url: GET_COMBO,
+            onSuccess: (responseData) => {
+                for(let i =0; i<responseData.length; i++){
+                    let item = responseData[i];
+                    enMessages[item.key]= item.en;
+                    cnMessages[item.key]= item.cn;
+                    hkMessages[item.key]= item.zh;
+                }
+                
+            }
+        });
     }
 
     useEffect(() => {
diff --git a/src/translations/en.json b/src/translations/en.json
index de9f4e6..e375196 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -283,27 +283,6 @@
   "pwGood": "Good",
   "pwStrong": "Strong",
 
-  "islandCombo": "Island District",
-  "kwaiTsingCombo": "Kwai Tsing District",
-  "northCombo": "North District",
-  "saiKungCombo": "Sai Kung District",
-  "shaTinCombo": "Sha Tin District",
-  "taiPoCombo": "Tai Po District",
-  "tsuenWanCombo": "Tsuen Wan District",
-  "tuenMunCombo": "Tuen Mun District",
-  "yuenLongCombo": "Yuen Long District",
-  "kowloonCityCombo": "Kowloon City District",
-  "kwunTongCombo": "Kwun Tong District",
-  "shamShuiPoCombo": "Sham Shui Po District",
-  "wongTaiSinCombo": "Wong Tai Sin District",
-  "yauTsimMongCombo": "Yau Tsim Mong District",
-  "centralAndWesternCombo": "Central and Western District",
-  "easternCombo": "Eastern District",
-  "southernCombo": "Southern District",
-  "wanChaiCombo": "Wan Chai District",
-  "lantauIslandCombo": "Lantau Island",
-  "lammaIslandCombo": "Lamma Island District",
-  "pengChauCombo": "Peng Chau District",
 
   "applyPublicNotice": "Apply for Public Notice",
   "attention": "attention",
diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json
index a7374cb..2cc6206 100644
--- a/src/translations/zh-CN.json
+++ b/src/translations/zh-CN.json
@@ -277,28 +277,6 @@
   "pwGood": "良好",
   "pwStrong": "强",
 
-  "islandCombo": "离岛区",
-  "kwaiTsingCombo": "葵青区",
-  "northCombo": "北区",
-  "saiKungCombo": "西贡区",
-  "shaTinCombo": "沙田区",
-  "taiPoCombo": "大埔区",
-  "tsuenWanCombo": "荃湾区",
-  "tuenMunCombo": "屯门区",
-  "yuenLongCombo": "元朗区",
-  "kowloonCityCombo": "九龙城区",
-  "kwunTongCombo": "观塘区",
-  "shamShuiPoCombo": "深水埗区",
-  "wongTaiSinCombo": "黄大仙区",
-  "yauTsimMongCombo": "油尖旺区",
-  "centralAndWesternCombo": "中西区",
-  "easternCombo": "东区",
-  "southernCombo": "南区",
-  "wanChaiCombo": "湾仔区",
-  "lantauIslandCombo": "大屿山区",
-  "lammaIslandCombo": "南丫岛区",
-  "pengChauCombo": "坪洲区",
-
   "applyPublicNotice": "申请公共启事",
   "attention": "注意",
   "to": "到",
diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json
index 39941ef..be4aa26 100644
--- a/src/translations/zh-HK.json
+++ b/src/translations/zh-HK.json
@@ -280,28 +280,6 @@
   "pwGood": "良好",
   "pwStrong": "強",
 
-  "islandCombo": "離島區",
-  "kwaiTsingCombo": "葵青區",
-  "northCombo": "北區",
-  "saiKungCombo": "西貢區",
-  "shaTinCombo": "沙田區",
-  "taiPoCombo": "大埔區",
-  "tsuenWanCombo": "荃灣區",
-  "tuenMunCombo": "屯門區",
-  "yuenLongCombo": "元朗區",
-  "kowloonCityCombo": "九龍城區",
-  "kwunTongCombo": "觀塘區",
-  "shamShuiPoCombo": "深水埗區",
-  "wongTaiSinCombo": "黃大仙區",
-  "yauTsimMongCombo": "油尖旺區",
-  "centralAndWesternCombo": "中西區",
-  "easternCombo": "東區",
-  "southernCombo": "南區",
-  "wanChaiCombo": "灣仔區",
-  "lantauIslandCombo": "大嶼山區",
-  "lammaIslandCombo": "南丫島區",
-  "pengChauCombo": "坪洲區",
-
   "applyPublicNotice": "申請公共啟事",
   "attention": "注意",
   "to": "到",
diff --git a/src/utils/ApiPathConst.js b/src/utils/ApiPathConst.js
index 32c1b47..60c19b7 100644
--- a/src/utils/ApiPathConst.js
+++ b/src/utils/ApiPathConst.js
@@ -79,6 +79,7 @@ export const POST_LOGIN = '/login';
 export const POST_CAPTCHA = apiPath+'/captcha';
 export const POST_TERMS_N_CONDITIONS = apiPath+'/termsAndConditions';
 export const POST_VERIFY_CAPTCHA = apiPath+'/verifyCaptcha';
+export const GET_COMBO = apiPath+'/combo-data';
 
 //register
 export const POST_PUBLIC_USER_REGISTER = apiPath+'/user/register';