chore: update login copy

opengovsg · May 31, 2022 · f70355d · f70355d
1 parent 77bc25b
commit f70355d
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 28 deletions.
diff --git a/public/locales/edu/en/translation.json b/public/locales/edu/en/translation.json
@@ -4,9 +4,6 @@
     "shortUrlPrefix": "for.edu.sg/",
     "appTitle": "for.edu.sg",
     "officerType": "education officers",
-    "referralEmailDomain": "gov.sg",
-    "referralOfficerPhrase": "Public officers",
-    "referralLink": "go.gov.sg",
     "appCatchphrase": {
       "styled": "Trusted short links from <strong><i>education institutions</i></strong>",
       "noStyle": "Trusted short links from education institutions"
@@ -18,9 +15,6 @@
     "appSignInPrompt": "Are you an education officer?",
     "copyright": "Open Government Products",
     "copyrightTag": "Government Technology Agency of Singapore",
-    "placeholders": {
-      "email": "jane@science.edu.sg"
-    },
     "links": {
       "contribute": "https://go.gov.sg/go-opensource",
       "directory": "/directory",
@@ -59,5 +53,23 @@
       "7": "MOE",
       "8": "MHA"
     }
+  },
+  "login": {
+    "whitelistPhrase": "Only available for use by $t(general.officerType) with an email from <strong>$t(general.emailDomain)</strong>.",
+    "referrals": {
+      "1": {
+        "officerPhrase": "Public officers",
+        "emailDomain": "gov.sg",
+        "link": "go.gov.sg"
+      },
+      "2": {
+        "officerPhrase": "selected healthcare professionals",
+        "emailDomain": "",
+        "link": "for.sg"
+      }
+    },
+    "placeholders": {
+      "email": "jane@science.edu.sg"
+    }
   }
 }
diff --git a/public/locales/gov/en/translation.json b/public/locales/gov/en/translation.json
@@ -4,9 +4,6 @@
     "shortUrlPrefix": "go.gov.sg/",
     "appTitle": "Go.gov.sg",
     "officerType": "public officers",
-    "referralEmailDomain": "edu.sg",
-    "referralOfficerPhrase": "Staff from selected schools",
-    "referralLink": "for.edu.sg",
     "appCatchphrase": {
       "styled": "Trusted short links from <strong><i>public officers</i></strong>",
       "noStyle": "Trusted short links from public officers"
@@ -18,9 +15,6 @@
     "appSignInPrompt": "Are you a public officer?",
     "copyright": "Open Government Products",
     "copyrightTag": "Government Technology Agency of Singapore",
-    "placeholders": {
-      "email": "jane@data.gov.sg"
-    },
     "links": {
       "contribute": "https://go.gov.sg/go-opensource",
       "directory": "/directory",
@@ -59,5 +53,23 @@
       "7": "MOE",
       "8": "MHA"
     }
+  },
+  "login": {
+    "whitelistPhrase": "Only available for use by $t(general.officerType) with an email from <strong>$t(general.emailDomain)</strong>.",
+    "referrals": {
+      "1": {
+        "officerPhrase": "Staff from selected schools",
+        "emailDomain": "edu.sg",
+        "link": "for.edu.sg"
+      },
+      "2": {
+        "officerPhrase": "selected healthcare professionals",
+        "emailDomain": "",
+        "link": "for.sg"
+      }
+    },
+    "placeholders": {
+      "email": "jane@data.gov.sg"
+    }
   }
 }
diff --git a/public/locales/health/en/translation.json b/public/locales/health/en/translation.json
@@ -4,9 +4,6 @@
     "shortUrlPrefix": "for.edu.sg/",
     "appTitle": "for.edu.sg",
     "officerType": "healthcare professionals",
-    "referralEmailDomain": "gov.sg",
-    "referralOfficerPhrase": "Public officers",
-    "referralLink": "go.gov.sg",
     "appCatchphrase": {
       "styled": "Trusted short links from <strong><i>education institutions</i></strong>",
       "noStyle": "Trusted short links from education institutions"
@@ -18,9 +15,6 @@
     "appSignInPrompt": "Are you an education officer?",
     "copyright": "Open Government Products",
     "copyrightTag": "Government Technology Agency of Singapore",
-    "placeholders": {
-      "email": "jane@science.edu.sg"
-    },
     "links": {
       "contribute": "https://go.gov.sg/go-opensource",
       "directory": "/directory",
@@ -59,5 +53,23 @@
       "7": "MOE",
       "8": "MHA"
     }
+  },
+  "login": {
+    "whitelistPhrase": "Only available for use by healthcare institutions listed <strong><a href='https://guide.for.sg'  target='_blank' rel='noreferrer' style='color: #6D4559'>here</a></strong>.",
+    "referrals": {
+      "1": {
+        "officerPhrase": "Staff from selected schools",
+        "emailDomain": "edu.sg",
+        "link": "for.edu.sg"
+      },
+      "2": {
+        "officerPhrase": "public officers",
+        "emailDomain": "gov.sg",
+        "link": "go.gov.sg"
+      }
+    },
+    "placeholders": {
+      "email": "jane@moh.gov.sg"
+    }
   }
 }
diff --git a/src/client/login/index.tsx b/src/client/login/index.tsx
@@ -178,7 +178,7 @@ const LoginPage: FunctionComponent<LoginPageProps> = ({
             GAPageView('OTP LOGIN PAGE')
             GAEvent('login page', 'otp', 'successful')
           },
-          placeholder: `e.g. ${i18next.t('general.placeholders.email')}`,
+          placeholder: `e.g. ${i18next.t('login.placeholders.email')}`,
           buttonMessage: 'Sign in',
           textError: emailError,
           textErrorMessage: () =>
@@ -235,23 +235,36 @@ const LoginPage: FunctionComponent<LoginPageProps> = ({
                         alt="GoGovSG logo"
                       />
                     </Link>
-                    <Typography className={classes.loginHeader} variant="body1">
-                      Only available for use by{' '}
-                      {i18next.t('general.officerType')} with an email from{' '}
-                      <strong>{i18next.t('general.emailDomain')}</strong>.
+                    <Typography
+                      className={classes.loginHeader}
+                      variant="body1"
+                      dangerouslySetInnerHTML={{
+                        __html: i18next.t('login.whitelistPhrase'),
+                      }}
+                    >
+                      {/* <text ></text> NOTE: dangerouslySetInnerHTML is used as copy includes <a href></a> tag */}
                     </Typography>
                     <Typography
                       className={classes.loginReferral}
                       variant="body1"
                     >
-                      {i18next.t('general.referralOfficerPhrase')} can use their{' '}
-                      {i18next.t('general.referralEmailDomain')} emails at{' '}
+                      {i18next.t('login.referrals.1.officerPhrase')} can use
+                      their {i18next.t('login.referrals.1.emailDomain')} emails
+                      at{' '}
+                      <Link
+                        href={`https://${i18next.t('login.referrals.1.link')}`}
+                      >
+                        {i18next.t('login.referrals.1.link')}
+                      </Link>
+                      , and {i18next.t('login.referrals.2.officerPhrase')} can
+                      use their {i18next.t('login.referrals.2.emailDomain')}{' '}
+                      emails at{' '}
                       <Link
-                        href={`https://${i18next.t('general.referralLink')}`}
+                        href={`https://${i18next.t('login.referrals.2.link')}`}
                       >
-                        {i18next.t('general.referralLink')}
+                        {i18next.t('login.referrals.2.link')}
                       </Link>{' '}
-                      to shorten links instead.
+                      to shorten links.
                     </Typography>
                   </span>
                   <span className={classes.textInputGroup}>