update disclaimer

vote4hk · Nov 23, 2019 · 05ec42e · 05ec42e
1 parent 2cb3637
commit 05ec42e
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 5 deletions.
diff --git a/web/src/components/organisms/GlobalDisclaimer.js b/web/src/components/organisms/GlobalDisclaimer.js
@@ -14,8 +14,8 @@ export default function GlobalDisclaimer() {
   useEffect(() => {
     async function fetchData() {
       try {
-        const instructionRead = await localforage.getItem('instructionRead')
-        await setOpen(!instructionRead)
+        // const instructionRead = await localforage.getItem('instructionRead')
+        await setOpen(process.env.REACT_APP_POST_ELECTION !== 'true')
       } catch (e) {
         await setOpen(true)
       }

diff --git a/web/src/components/templates/Disclaimer.js b/web/src/components/templates/Disclaimer.js
@@ -16,11 +16,22 @@ const DisclaimerContainer = styled.div`
     }
   }
 `
-
 export const Disclaimer = props => {
   const { t } = useTranslation()
   return (
     <DisclaimerContainer>
+      <Typography variant="body2" gutterBottom>
+        {/* 本網站與任何2019年區議會選舉候選人或其助選成員無關，刊載資料目的非為促使或阻礙任何候選人在選舉中當選。 */}
+        {t('voting_instructions')}
+        <ul>
+          <li>{t('voting_instructions_1')}</li>
+          <li>{t('voting_instructions_2')}</li>
+          <li>{t('voting_instructions_3')}</li>
+          <li>{t('voting_instructions_4')}</li>
+          <li>{t('voting_instructions_5')}</li>
+        </ul>
+      </Typography>
+
       <Typography variant="body2" gutterBottom>
         {/* 本網站與任何2019年區議會選舉候選人或其助選成員無關，刊載資料目的非為促使或阻礙任何候選人在選舉中當選。 */}
         {t('disclaimer.segment.text1')}

diff --git a/web/src/locales/en/translation.json b/web/src/locales/en/translation.json
@@ -183,5 +183,15 @@
   "constituency.tags.multi_candidates": "Multiple candidates",
   "constituency.tags.multi_estab": "Multiple Pro-Est. candidates",
   "constituency.tags.multi_demo": "Multiple Pan-dem. candidates",
-  "obtainedVotes": "Votes"
+  "turnout_chart.HK_turnout_rate": "HK Overall",
+  "turnout_chart.district_turnout_rate": "{{district}}",
+  "turnout_chart.turnout_rate_title": "Voter Turnout Rate for each dstrict",
+  "obtainedVotes": "Votes",
+  "turnont_chart.title": "Hourly Voter Turnout Rate",
+  "voting_instructions": "Voting instructions",
+  "voting_instructions_1": "Please bring along the original identity document (ID card / Special Administrative Region Passport / Exemption Registration Certificate / Application for Hong Kong Identity Card Receipt)",
+  "voting_instructions_2": "Voting time is from 07:30 am to 10:30 pm",
+  "voting_instructions_3": "Do not use mobile phones or any other equipment in the station for electronic communication, photo taking, filming, video recording or recording",
+  "voting_instructions_4": "A valid ticket must be selected by the seal provided by the polling station.",
+  "voting_instructions_5": "If there is an error in the stamping of the ballot paper or the ballot paper is accidentally damaged, the ballot paper can be handed over to the polling station director for another ballot paper."
 }
diff --git a/web/src/locales/zh/translation.json b/web/src/locales/zh/translation.json
@@ -185,5 +185,15 @@
   "constituency.tags.multi_candidates": "多人混戰",
   "constituency.tags.multi_estab": "建制撞區",
   "constituency.tags.multi_demo": "民主撞區",
-  "obtainedVotes": "得票"
+  "turnout_chart.HK_turnout_rate": "全港",
+  "turnout_chart.district_turnout_rate": "{{district}}",
+  "turnout_chart.turnout_rate_title": "各區實時投票率",
+  "obtainedVotes": "得票",
+  "turnont_chart.title": "每小時投票率",
+  "voting_instructions": "投票須知",
+  "voting_instructions_1": "請帶備身份證明文件正本（身份證／特別行政區護照／豁免登記證明書／申請香港身份證收據）",
+  "voting_instructions_2": "投票時間為 07:30 am 至下午 10:30 pm",
+  "voting_instructions_3": "不得在票站內使用手提電話或任何其他器材進行電子通訊、拍照、拍攝影片、錄影或錄音",
+  "voting_instructions_4": "有效票必需使用投票站提供的印章投選一名候選人，如在選票蓋印時出錯或選票意外受損，可把選票交到投票站主任，換取另一張選票",
+  "voting_instructions_5": "蓋印盡量後吹乾，以免對摺時轉印到其他地方導致廢票"
 }