From f5b973e15cfb330022fbafc1e23c186ca3a730e0 Mon Sep 17 00:00:00 2001
From: Jeremy Letto <jletto87@gmail.com>
Date: Wed, 2 Mar 2022 22:34:57 -0600
Subject: [PATCH] Webatrice: i18n login screen (#4584)

* i18n: login container and form

* i18n: activate, host, and register forms

* i18n: reset password forms

* i18n: login dialogs, ICU formatting

* i18n: login containers and components

Co-authored-by: Jeremy Letto <jeremy.letto@datasite.com>
---
 webclient/package-lock.json                   | 115 ++++++++++++++++++
 webclient/package.json                        |   4 +-
 webclient/src/common.i18n.json                |  23 +++-
 .../KnownHosts/KnownHosts.i18n.json           |   7 ++
 .../src/components/KnownHosts/KnownHosts.tsx  |  12 +-
 .../Initialize/Initialize.i18n.json           |   6 +
 .../src/containers/Initialize/Initialize.tsx  |  10 +-
 .../src/containers/Login/Login.i18n.json      |  20 ++-
 webclient/src/containers/Login/Login.tsx      |  25 ++--
 .../Unsupported/Unsupported.i18n.json         |   7 ++
 .../containers/Unsupported/Unsupported.tsx    |   9 +-
 .../AccountActivationDialog.i18n.json         |   7 ++
 .../AccountActivationDialog.tsx               |   9 +-
 .../KnownHostDialog/KnownHostDialog.i18n.json |   6 +
 .../KnownHostDialog/KnownHostDialog.tsx       |   8 +-
 .../RegistrationDialog.i18n.json              |   5 +
 .../RegistrationDialog/RegistrationDialog.tsx |   5 +-
 .../RequestPasswordResetDialog.i18n.json      |   5 +
 .../RequestPasswordResetDialog.tsx            |   5 +-
 .../ResetPasswordDialog.i18n.json             |   5 +
 .../ResetPasswordDialog.tsx                   |   5 +-
 .../AccountActivationForm.i18n.json           |  10 ++
 .../AccountActivationForm.tsx                 |  10 +-
 .../KnownHostForm/KnownHostForm.i18n.json     |   9 ++
 .../src/forms/KnownHostForm/KnownHostForm.tsx |  20 +--
 .../src/forms/LoginForm/LoginForm.i18n.json   |  11 ++
 webclient/src/forms/LoginForm/LoginForm.tsx   |  25 ++--
 .../forms/RegisterForm/RegisterForm.i18n.json |  10 ++
 .../src/forms/RegisterForm/RegisterForm.tsx   |  40 +++---
 .../RequestPasswordResetForm.i18n.json        |   8 ++
 .../RequestPasswordResetForm.tsx              |  20 +--
 .../ResetPasswordForm.i18n.json               |   8 ++
 .../ResetPasswordForm/ResetPasswordForm.tsx   |  48 +++++---
 webclient/src/i18n-default.json               |   2 +-
 webclient/src/i18n.ts                         |   4 +-
 35 files changed, 424 insertions(+), 99 deletions(-)
 create mode 100644 webclient/src/components/KnownHosts/KnownHosts.i18n.json
 create mode 100644 webclient/src/containers/Initialize/Initialize.i18n.json
 create mode 100644 webclient/src/containers/Unsupported/Unsupported.i18n.json
 create mode 100644 webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.i18n.json
 create mode 100644 webclient/src/dialogs/KnownHostDialog/KnownHostDialog.i18n.json
 create mode 100644 webclient/src/dialogs/RegistrationDialog/RegistrationDialog.i18n.json
 create mode 100644 webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.i18n.json
 create mode 100644 webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.i18n.json
 create mode 100644 webclient/src/forms/AccountActivationForm/AccountActivationForm.i18n.json
 create mode 100644 webclient/src/forms/KnownHostForm/KnownHostForm.i18n.json
 create mode 100644 webclient/src/forms/LoginForm/LoginForm.i18n.json
 create mode 100644 webclient/src/forms/RegisterForm/RegisterForm.i18n.json
 create mode 100644 webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.i18n.json
 create mode 100644 webclient/src/forms/ResetPasswordForm/ResetPasswordForm.i18n.json

diff --git a/webclient/package-lock.json b/webclient/package-lock.json
index 7d7cc621..e5e67a92 100644
--- a/webclient/package-lock.json
+++ b/webclient/package-lock.json
@@ -1248,6 +1248,95 @@
         }
       }
     },
+    "@formatjs/ecma402-abstract": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.3.tgz",
+      "integrity": "sha512-kP/Buv5vVFMAYLHNvvUzr0lwRTU0u2WTy44Tqwku1X3C3lJ5dKqDCYVqA8wL+Y19Bq+MwHgxqd5FZJRCIsLRyQ==",
+      "dev": true,
+      "requires": {
+        "@formatjs/intl-localematcher": "0.2.24",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+          "dev": true
+        }
+      }
+    },
+    "@formatjs/fast-memoize": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-1.2.1.tgz",
+      "integrity": "sha512-Rg0e76nomkz3vF9IPlKeV+Qynok0r7YZjL6syLz4/urSg0IbjPZCB/iYUMNsYA643gh4mgrX3T7KEIFIxJBQeg==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+          "dev": true
+        }
+      }
+    },
+    "@formatjs/icu-messageformat-parser": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.18.tgz",
+      "integrity": "sha512-vquIzsAJJmZ5jWVH8dEgUKcbG4yu3KqtyPet+q35SW5reLOvblkfeCXTRW2TpIwNXzdVqsJBwjbTiRiSU9JxwQ==",
+      "dev": true,
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.11.3",
+        "@formatjs/icu-skeleton-parser": "1.3.5",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+          "dev": true
+        }
+      }
+    },
+    "@formatjs/icu-skeleton-parser": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.5.tgz",
+      "integrity": "sha512-Nhyo2/6kG7ZfgeEfo02sxviOuBcvtzH6SYUharj3DLCDJH3A/4OxkKcmx/2PWGX4bc6iSieh+FA94CsKDxnZBQ==",
+      "dev": true,
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.11.3",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+          "dev": true
+        }
+      }
+    },
+    "@formatjs/intl-localematcher": {
+      "version": "0.2.24",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.24.tgz",
+      "integrity": "sha512-K/HRGo6EMnCbhpth/y3u4rW4aXkmQNqRe1L2G+Y5jNr3v0gYhvaucV8WixNju/INAMbPBlbsRBRo/nfjnoOnxQ==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+          "dev": true
+        }
+      }
+    },
     "@gar/promisify": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz",
@@ -8217,6 +8306,12 @@
         "@babel/runtime": "^7.14.6"
       }
     },
+    "i18next-icu": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/i18next-icu/-/i18next-icu-2.0.3.tgz",
+      "integrity": "sha512-sZ0VCWDnHysUYQL8j/0rVOxv6rLR+SBoaqQQ2UVNfLyJCuf/bAjYPkoUQgyuDkWFo1xZjeCf4G6GBNr7gD61bQ==",
+      "dev": true
+    },
     "iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -8370,6 +8465,26 @@
         "side-channel": "^1.0.4"
       }
     },
+    "intl-messageformat": {
+      "version": "9.11.4",
+      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.11.4.tgz",
+      "integrity": "sha512-77TSkNubIy/hsapz6LQpyR6OADcxhWdhSaboPb5flMaALCVkPvAIxr48AlPqaMl4r1anNcvR9rpLWVdwUY1IKg==",
+      "dev": true,
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.11.3",
+        "@formatjs/fast-memoize": "1.2.1",
+        "@formatjs/icu-messageformat-parser": "2.0.18",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+          "dev": true
+        }
+      }
+    },
     "invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
diff --git a/webclient/package.json b/webclient/package.json
index 8c077478..504de4b4 100644
--- a/webclient/package.json
+++ b/webclient/package.json
@@ -86,6 +86,8 @@
     "@typescript-eslint/parser": "^5.3.1",
     "eslint": "^7.32.0",
     "fs-extra": "^10.0.0",
-    "identity-obj-proxy": "^3.0.0"
+    "i18next-icu": "^2.0.3",
+    "identity-obj-proxy": "^3.0.0",
+    "intl-messageformat": "^9.11.4"
   }
 }
diff --git a/webclient/src/common.i18n.json b/webclient/src/common.i18n.json
index 019ea3cd..03225798 100644
--- a/webclient/src/common.i18n.json
+++ b/webclient/src/common.i18n.json
@@ -1,6 +1,27 @@
 {
   "Common": {
     "language": "Translate into English.",
-    "disconnect": "Disconnect"
+    "disconnect": "Disconnect",
+    "label": {
+      "confirmPassword": "Confirm Password",
+      "confirmSure": "Are you sure?",
+      "country": "Country",
+      "delete": "Delete",
+      "email": "Email",
+      "hostName": "Host Name",
+      "hostAddress": "Host Address",
+      "password": "Password",
+      "passwordAgain": "Password Again",
+      "port": "Port",
+      "realName": "Real Name",
+      "saveChanges": "Save Changes",
+      "token": "Token",
+      "username": "Username"
+    },
+    "validation": {
+      "minChars": "Minimum of {count} {count, plural, one {character} other {characters}} required",
+      "passwordsMustMatch": "Passwords don't match",
+      "required": "Required"
+    }
   } 
 }
diff --git a/webclient/src/components/KnownHosts/KnownHosts.i18n.json b/webclient/src/components/KnownHosts/KnownHosts.i18n.json
new file mode 100644
index 00000000..3de8fd88
--- /dev/null
+++ b/webclient/src/components/KnownHosts/KnownHosts.i18n.json
@@ -0,0 +1,7 @@
+{
+  "KnownHosts": {
+    "label": "Host",
+    "add": "Add new host",
+    "toast": "Host successfully {mode, select, created {created} deleted {deleted} other {edited}}."
+  }
+}
diff --git a/webclient/src/components/KnownHosts/KnownHosts.tsx b/webclient/src/components/KnownHosts/KnownHosts.tsx
index 4564900e..3596f6b9 100644
--- a/webclient/src/components/KnownHosts/KnownHosts.tsx
+++ b/webclient/src/components/KnownHosts/KnownHosts.tsx
@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 import { Select, MenuItem } from '@material-ui/core';
 import Button from '@material-ui/core/Button';
 import FormControl from '@material-ui/core/FormControl';
@@ -33,6 +34,7 @@ const KnownHosts = (props) => {
   const { input: { onChange }, meta, disabled } = props;
   const { touched, error, warning } = meta;
   const classes = useStyles();
+  const { t } = useTranslation();
 
   const [hostsState, setHostsState] = useState({
     hosts: [],
@@ -168,7 +170,7 @@ const KnownHosts = (props) => {
           </div>
         ) }
 
-        <InputLabel id='KnownHosts-select'>Host</InputLabel>
+        <InputLabel id='KnownHosts-select'>{ t('KnownHosts.label') }</InputLabel>
         <Select
           id='KnownHosts-select'
           labelId='KnownHosts-label'
@@ -181,7 +183,7 @@ const KnownHosts = (props) => {
           disabled={disabled}
         >
           <Button value={hostsState.selectedHost} onClick={openAddKnownHostDialog}>
-            <span>Add new host</span>
+            <span>{ t('KnownHosts.add') }</span>
             <AddIcon fontSize='small' color='primary' />
           </Button>
 
@@ -213,9 +215,9 @@ const KnownHosts = (props) => {
         onSubmit={handleDialogSubmit}
         handleClose={closeKnownHostDialog}
       />
-      <Toast open={showCreateToast} onClose={() => setShowCreateToast(false)}>Host successfully created.</Toast>
-      <Toast open={showDeleteToast} onClose={() => setShowDeleteToast(false)}>Host successfully deleted.</Toast>
-      <Toast open={showEditToast} onClose={() => setShowEditToast(false)}>Host successfully edited.</Toast>
+      <Toast open={showCreateToast} onClose={() => setShowCreateToast(false)}>{ t('KnownHosts.toast', { mode: 'created' }) }</Toast>
+      <Toast open={showDeleteToast} onClose={() => setShowDeleteToast(false)}>{ t('KnownHosts.toast', { mode: 'deleted' }) }</Toast>
+      <Toast open={showEditToast} onClose={() => setShowEditToast(false)}>{ t('KnownHosts.toast', { mode: 'edited' }) }</Toast>
     </div>
   )
 };
diff --git a/webclient/src/containers/Initialize/Initialize.i18n.json b/webclient/src/containers/Initialize/Initialize.i18n.json
new file mode 100644
index 00000000..77ca5e8c
--- /dev/null
+++ b/webclient/src/containers/Initialize/Initialize.i18n.json
@@ -0,0 +1,6 @@
+{
+  "InitializeContainer": {
+    "title": "DID YOU KNOW",
+    "subtitle": "<1>Cockatrice is run by volunteers</1><1>that love card games!</1>"
+  }
+}
diff --git a/webclient/src/containers/Initialize/Initialize.tsx b/webclient/src/containers/Initialize/Initialize.tsx
index 85d9d47e..a50f64e7 100644
--- a/webclient/src/containers/Initialize/Initialize.tsx
+++ b/webclient/src/containers/Initialize/Initialize.tsx
@@ -1,4 +1,5 @@
 import { useState } from 'react';
+import { useTranslation, Trans } from 'react-i18next';
 import { connect } from 'react-redux';
 import { Redirect, withRouter } from 'react-router-dom';
 import { makeStyles } from '@material-ui/core/styles';
@@ -24,6 +25,7 @@ const useStyles = makeStyles(theme => ({
 
 const Initialize = ({ initialized }: InitializeProps) => {
   const classes = useStyles();
+  const { t } = useTranslation();
 
   return initialized
     ? <Redirect from="*" to={RouteEnum.LOGIN} />
@@ -31,9 +33,11 @@ const Initialize = ({ initialized }: InitializeProps) => {
       <div className={'Initialize ' + classes.root}>
         <div className='Initialize-content'>
           <img src={Images.Logo} alt="logo" />
-          <Typography variant="subtitle1" className='subtitle'>DID YOU KNOW</Typography>
-          <Typography variant="subtitle2">Cockatrice is run by volunteers</Typography>
-          <Typography variant="subtitle2">that love card games!</Typography>
+          <Typography variant="subtitle1" className='subtitle'>{ t('InitializeContainer.title') }</Typography>
+          <Trans i18nKey="InitializeContainer.subtitle">
+            <Typography variant="subtitle2"></Typography>
+            <Typography variant="subtitle2"></Typography>
+          </Trans>
         </div>
 
         <div className="Initialize-graphics">
diff --git a/webclient/src/containers/Login/Login.i18n.json b/webclient/src/containers/Login/Login.i18n.json
index fecbd3f8..13d248bb 100644
--- a/webclient/src/containers/Login/Login.i18n.json
+++ b/webclient/src/containers/Login/Login.i18n.json
@@ -1,6 +1,22 @@
 {
   "LoginContainer": {
-    "title": "Login",
-    "subtitle": "A cross-platform virtual tabletop for multiplayer card games."
+    "header": {
+      "title": "Login",
+      "subtitle": "A cross-platform virtual tabletop for multiplayer card games."
+    },
+    "footer": {
+      "registerPrompt": "Not registered yet?",
+      "registerAction": "Create an account",
+      "credit": "Cockatrice is an open source project",
+      "version": "Version"
+    },
+    "content": {
+      "subtitle1": "Play multiplayer card games online.",
+      "subtitle2": "Cross-platform virtual tabletop for multiplayer card games. Forever free."
+    },
+    "toasts": {
+      "passwordResetSuccessToast": "Password Reset Successfully",
+      "accountActivationSuccess": "Account Activated Successfully"
+    }
   }
 }
diff --git a/webclient/src/containers/Login/Login.tsx b/webclient/src/containers/Login/Login.tsx
index 5dcea4c3..a4dcbb00 100644
--- a/webclient/src/containers/Login/Login.tsx
+++ b/webclient/src/containers/Login/Login.tsx
@@ -72,8 +72,11 @@ const Login = ({ state, description, connectOptions }: LoginProps) => {
   });
   const [userToResetPassword, setUserToResetPassword] = useState(null);
 
-  const passwordResetToast = useToast({ key: 'password-reset-success', children: 'Password Reset Successfully' })
-  const accountActivatedToast = useToast({ key: 'account-activation-success', children: 'Account Activated Successfully' })
+  const passwordResetToast = useToast({ key: 'password-reset-success', children: t('LoginContainer.toasts.passwordResetSuccess') });
+  const accountActivatedToast = useToast({
+    key: 'account-activation-success',
+    children: t('LoginContainer.toasts.accountActivationSuccess')
+  });
 
   useReduxEffect(() => {
     closeRequestPasswordResetDialog();
@@ -227,8 +230,8 @@ const Login = ({ state, description, connectOptions }: LoginProps) => {
               <img src={Images.Logo} alt="logo" />
               <span>COCKATRICE</span>
             </div>
-            <Typography variant="h1">{ t('LoginContainer.title') }</Typography>
-            <Typography variant="subtitle1">{ t('LoginContainer.subtitle') }</Typography>
+            <Typography variant="h1">{ t('LoginContainer.header.title') }</Typography>
+            <Typography variant="subtitle1">{ t('LoginContainer.header.subtitle') }</Typography>
             <div className="login-form">
               <LoginForm
                 onSubmit={handleLogin}
@@ -247,17 +250,17 @@ const Login = ({ state, description, connectOptions }: LoginProps) => {
 
             <div className="login-footer">
               <div className="login-footer__register">
-                <span>Not registered yet?</span>
-                <Button color="primary" onClick={openRegistrationDialog}>Create an account</Button>
+                <span>{ t('LoginContainer.footer.registerPrompt') }</span>
+                <Button color="primary" onClick={openRegistrationDialog}>{ t('LoginContainer.footer.registerAction') }</Button>
               </div>
               <Typography variant="subtitle2">
-                Cockatrice is an open source project. { new Date().getUTCFullYear() }
+                { t('LoginContainer.footer.credit') } - { new Date().getUTCFullYear() }
               </Typography>
 
               {
                 serverProps.REACT_APP_VERSION && (
                   <Typography variant="subtitle2">
-                    Version: { serverProps.REACT_APP_VERSION }
+                    { t('LoginContainer.footer.version') }: { serverProps.REACT_APP_VERSION }
                   </Typography>
                 )
               }
@@ -298,10 +301,8 @@ const Login = ({ state, description, connectOptions }: LoginProps) => {
                 </div>
               </div>
               { /*<img src={loginGraphic} className="login-content__description-image"/>*/}
-              <p className="login-content__description-subtitle1">Play multiplayer card games online.</p>
-              <p className="login-content__description-subtitle2">
-                Cross-platform virtual tabletop for multiplayer card games. Forever free.
-              </p>
+              <p className="login-content__description-subtitle1">{ t('LoginContainer.content.subtitle1') }</p>
+              <p className="login-content__description-subtitle2">{ t('LoginContainer.content.subtitle2') }</p>
             </div>
           </div>
         </Paper>
diff --git a/webclient/src/containers/Unsupported/Unsupported.i18n.json b/webclient/src/containers/Unsupported/Unsupported.i18n.json
new file mode 100644
index 00000000..225a13a6
--- /dev/null
+++ b/webclient/src/containers/Unsupported/Unsupported.i18n.json
@@ -0,0 +1,7 @@
+{
+  "UnsupportedContainer": {
+    "title": "Unsupported Browser",
+    "subtitle1": "Please update your browser and/or check your permissions.",
+    "subtitle2": "Note: Private browsing causes some browsers to disable certain permissions or features."
+  }
+}
diff --git a/webclient/src/containers/Unsupported/Unsupported.tsx b/webclient/src/containers/Unsupported/Unsupported.tsx
index 16c2e0ca..acb80c28 100644
--- a/webclient/src/containers/Unsupported/Unsupported.tsx
+++ b/webclient/src/containers/Unsupported/Unsupported.tsx
@@ -1,4 +1,5 @@
 import { connect } from 'react-redux';
+import { useTranslation } from 'react-i18next';
 import { withRouter } from 'react-router-dom';
 import Paper from '@material-ui/core/Paper';
 import Typography from '@material-ui/core/Typography';
@@ -6,15 +7,17 @@ import Typography from '@material-ui/core/Typography';
 import './Unsupported.css';
 
 const Unsupported = () => {
+  const { t } = useTranslation();
+
   return (
     <div className='Unsupported'>
       <Paper className='Unsupported-paper'>
         <div className='Unsupported-paper__header'>
-          <Typography variant="h1">Unsupported Browser</Typography>
-          <Typography variant="subtitle1">Please update your browser and/or check your permissions.</Typography>
+          <Typography variant="h1">{ t('UnsupportedContainer.title') }</Typography>
+          <Typography variant="subtitle1">{ t('UnsupportedContainer.subtitle1') }</Typography>
         </div>
 
-        <Typography variant="subtitle2">Note: Private browsing causes some browsers to disable certain permissions or features.</Typography>
+        <Typography variant="subtitle2">{ t('UnsupportedContainer.subtitle2') }</Typography>
       </Paper>
     </div>
   );
diff --git a/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.i18n.json b/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.i18n.json
new file mode 100644
index 00000000..9cfd876f
--- /dev/null
+++ b/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.i18n.json
@@ -0,0 +1,7 @@
+{
+  "AccountActivationDialog": {
+    "title": "Account Activation",
+    "subtitle1": "Your account has not been activated yet.",
+    "subtitle2": "You need to provide the activation token received in the activation email."
+  }
+}
diff --git a/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.tsx b/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.tsx
index 970a140f..87cde690 100644
--- a/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.tsx
+++ b/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.tsx
@@ -5,12 +5,15 @@ import DialogTitle from '@material-ui/core/DialogTitle';
 import IconButton from '@material-ui/core/IconButton';
 import CloseIcon from '@material-ui/icons/Close';
 import Typography from '@material-ui/core/Typography';
+import { useTranslation } from 'react-i18next';
 
 import { AccountActivationForm } from 'forms';
 
 import './AccountActivationDialog.css';
 
 const AccountActivationDialog = ({ classes, handleClose, isOpen, onSubmit }: any) => {
+  const { t } = useTranslation();
+
   const handleOnClose = () => {
     handleClose();
   }
@@ -18,7 +21,7 @@ const AccountActivationDialog = ({ classes, handleClose, isOpen, onSubmit }: any
   return (
     <Dialog onClose={handleOnClose} open={isOpen}>
       <DialogTitle disableTypography className="dialog-title">
-        <Typography variant="h6">Account Activation</Typography>
+        <Typography variant="h6">{ t('AccountActivationDialog.title') }</Typography>
 
         {handleOnClose ? (
           <IconButton onClick={handleOnClose}>
@@ -28,8 +31,8 @@ const AccountActivationDialog = ({ classes, handleClose, isOpen, onSubmit }: any
       </DialogTitle>
       <DialogContent>
         <div className="content">
-          <Typography variant='subtitle1'>Your account has not been activated yet.</Typography>
-          <Typography variant='subtitle1'>You need to provide the activation token received in the activation email.</Typography>
+          <Typography variant='subtitle1'>{ t('AccountActivationDialog.subtitle1') }</Typography>
+          <Typography variant='subtitle1'>{ t('AccountActivationDialog.subtitle2') }</Typography>
         </div>
 
         <AccountActivationForm onSubmit={onSubmit}></AccountActivationForm>
diff --git a/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.i18n.json b/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.i18n.json
new file mode 100644
index 00000000..4ae52105
--- /dev/null
+++ b/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.i18n.json
@@ -0,0 +1,6 @@
+{
+ "KnownHostDialog": {
+    "title": "{mode, select, edit {Edit} other {Add}} Known Host",
+    "subtitle": "Adding a new host allows you to connect to different servers. Enter the details below to your host list."
+  }
+}
diff --git a/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.tsx b/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.tsx
index 46d0d39e..3195e8c8 100644
--- a/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.tsx
+++ b/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.tsx
@@ -7,6 +7,7 @@ import { makeStyles } from '@material-ui/core/styles';
 import AddIcon from '@material-ui/icons/Add';
 import CloseIcon from '@material-ui/icons/Close';
 import Typography from '@material-ui/core/Typography';
+import { useTranslation } from 'react-i18next';
 
 import { KnownHostForm } from 'forms';
 
@@ -22,6 +23,9 @@ const useStyles = makeStyles(theme => ({
 
 const KnownHostDialog = ({ handleClose, onRemove, onSubmit, isOpen, host }: any) => {
   const classes = useStyles();
+  const { t } = useTranslation();
+
+  const mode = host ? 'edit' : 'add';
 
   const handleOnClose = () => {
     if (handleClose) {
@@ -33,7 +37,7 @@ const KnownHostDialog = ({ handleClose, onRemove, onSubmit, isOpen, host }: any)
     <Dialog className={'KnownHostDialog ' + classes.root} onClose={handleOnClose} open={isOpen}>
       <DialogTitle disableTypography className='dialog-title'>
         <div className='dialog-title__wrapper'>
-          <Typography variant='h2'>{ host ? 'Edit' : 'Add' } Known Host</Typography>
+          <Typography variant='h2'>{ t('KnownHostDialog.title', { mode }) }</Typography>
 
           {handleClose ? (
             <IconButton onClick={handleClose}>
@@ -44,7 +48,7 @@ const KnownHostDialog = ({ handleClose, onRemove, onSubmit, isOpen, host }: any)
       </DialogTitle>
       <DialogContent className='dialog-content'>
         <Typography className='dialog-content__subtitle' variant='subtitle1'>
-          Adding a new host allows you to connect to different servers. Enter the details below to your host list.
+          { t('KnownHostDialog.subtitle') }
         </Typography>
         <KnownHostForm onRemove={onRemove} onSubmit={onSubmit} host={host}></KnownHostForm>
       </DialogContent>
diff --git a/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.i18n.json b/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.i18n.json
new file mode 100644
index 00000000..bc0aa646
--- /dev/null
+++ b/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.i18n.json
@@ -0,0 +1,5 @@
+{
+  "RegistrationDialog": {
+    "title": "Create New Account"
+  }
+}
diff --git a/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.tsx b/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.tsx
index d8cf89f9..0106d925 100644
--- a/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.tsx
+++ b/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.tsx
@@ -5,12 +5,15 @@ import DialogTitle from '@material-ui/core/DialogTitle';
 import IconButton from '@material-ui/core/IconButton';
 import CloseIcon from '@material-ui/icons/Close';
 import Typography from '@material-ui/core/Typography';
+import { useTranslation } from 'react-i18next';
 
 import { RegisterForm } from 'forms';
 
 import './RegistrationDialog.css';
 
 const RegistrationDialog = ({ classes, handleClose, isOpen, onSubmit }: any) => {
+  const { t } = useTranslation();
+
   const handleOnClose = () => {
     handleClose();
   }
@@ -18,7 +21,7 @@ const RegistrationDialog = ({ classes, handleClose, isOpen, onSubmit }: any) =>
   return (
     <Dialog className="RegistrationDialog" onClose={handleOnClose} open={isOpen} maxWidth='xl'>
       <DialogTitle disableTypography className="dialog-title">
-        <Typography variant="h6">Create New Account</Typography>
+        <Typography variant="h6">{ t('RegistrationDialog.title') }</Typography>
 
         {handleOnClose ? (
           <IconButton onClick={handleOnClose}>
diff --git a/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.i18n.json b/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.i18n.json
new file mode 100644
index 00000000..c287b7a8
--- /dev/null
+++ b/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.i18n.json
@@ -0,0 +1,5 @@
+{
+  "RequestPasswordResetDialog": {
+    "title": "Request Password Reset"
+  }
+}
diff --git a/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.tsx b/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.tsx
index 0744a321..f550fc0c 100644
--- a/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.tsx
+++ b/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.tsx
@@ -5,12 +5,15 @@ import DialogTitle from '@material-ui/core/DialogTitle';
 import IconButton from '@material-ui/core/IconButton';
 import CloseIcon from '@material-ui/icons/Close';
 import Typography from '@material-ui/core/Typography';
+import { useTranslation } from 'react-i18next';
 
 import { RequestPasswordResetForm } from 'forms';
 
 import './RequestPasswordResetDialog.css';
 
 const RequestPasswordResetDialog = ({ classes, handleClose, isOpen, onSubmit, skipTokenRequest }: any) => {
+  const { t } = useTranslation();
+
   const handleOnClose = () => {
     handleClose();
   }
@@ -18,7 +21,7 @@ const RequestPasswordResetDialog = ({ classes, handleClose, isOpen, onSubmit, sk
   return (
     <Dialog onClose={handleOnClose} open={isOpen}>
       <DialogTitle disableTypography className="dialog-title">
-        <Typography variant="h6">Request Password Reset</Typography>
+        <Typography variant="h6">{ t('RequestPasswordResetDialog.title') }</Typography>
 
         {handleOnClose ? (
           <IconButton onClick={handleOnClose}>
diff --git a/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.i18n.json b/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.i18n.json
new file mode 100644
index 00000000..8047dcae
--- /dev/null
+++ b/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.i18n.json
@@ -0,0 +1,5 @@
+{
+  "ResetPasswordDialog": {
+    "title": "Reset Password"
+  }
+}
diff --git a/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.tsx b/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.tsx
index 230c19bb..a3cc3f09 100644
--- a/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.tsx
+++ b/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.tsx
@@ -5,12 +5,15 @@ import DialogTitle from '@material-ui/core/DialogTitle';
 import IconButton from '@material-ui/core/IconButton';
 import CloseIcon from '@material-ui/icons/Close';
 import Typography from '@material-ui/core/Typography';
+import { useTranslation } from 'react-i18next';
 
 import { ResetPasswordForm } from 'forms';
 
 import './ResetPasswordDialog.css';
 
 const ResetPasswordDialog = ({ classes, handleClose, isOpen, onSubmit, userName }: any) => {
+  const { t } = useTranslation();
+
   const handleOnClose = () => {
     handleClose();
   }
@@ -18,7 +21,7 @@ const ResetPasswordDialog = ({ classes, handleClose, isOpen, onSubmit, userName
   return (
     <Dialog onClose={handleOnClose} open={isOpen}>
       <DialogTitle disableTypography className="dialog-title">
-        <Typography variant="h6">Reset Password</Typography>
+        <Typography variant="h6">{t('ResetPasswordDialog.title')}</Typography>
 
         {handleOnClose ? (
           <IconButton onClick={handleOnClose}>
diff --git a/webclient/src/forms/AccountActivationForm/AccountActivationForm.i18n.json b/webclient/src/forms/AccountActivationForm/AccountActivationForm.i18n.json
new file mode 100644
index 00000000..0b510fb8
--- /dev/null
+++ b/webclient/src/forms/AccountActivationForm/AccountActivationForm.i18n.json
@@ -0,0 +1,10 @@
+{
+  "AccountActivationForm": {
+    "error": {
+      "failed": "Account activation failed"
+    },
+    "label": {
+      "activate": "Activate Account"
+    }
+  }
+}
diff --git a/webclient/src/forms/AccountActivationForm/AccountActivationForm.tsx b/webclient/src/forms/AccountActivationForm/AccountActivationForm.tsx
index f3ecde71..eb4308ab 100644
--- a/webclient/src/forms/AccountActivationForm/AccountActivationForm.tsx
+++ b/webclient/src/forms/AccountActivationForm/AccountActivationForm.tsx
@@ -3,6 +3,7 @@ import React, { useState } from "react";
 import { connect } from 'react-redux';
 import { Form, Field } from 'react-final-form';
 import { OnChange } from 'react-final-form-listeners';
+import { useTranslation } from 'react-i18next';
 
 import Button from '@material-ui/core/Button';
 import Typography from '@material-ui/core/Typography';
@@ -16,6 +17,7 @@ import { ServerTypes } from 'store';
 
 const AccountActivationForm = ({ onSubmit }) => {
   const [errorMessage, setErrorMessage] = useState(false);
+  const { t } = useTranslation();
 
   useReduxEffect(() => {
     setErrorMessage(true);
@@ -33,7 +35,7 @@ const AccountActivationForm = ({ onSubmit }) => {
     const errors: any = {};
 
     if (!values.token) {
-      errors.token = 'Required';
+      errors.token = t('Common.validation.required');
     }
 
     return errors;
@@ -45,17 +47,17 @@ const AccountActivationForm = ({ onSubmit }) => {
         return (
           <form className="AccountActivationForm" onSubmit={handleSubmit}>
             <div className="AccountActivationForm-item">
-              <Field label="Token" name="token" component={InputField} />
+              <Field label={t('Common.label.token')} name="token" component={InputField} />
             </div>
 
             {errorMessage && (
               <div className="AccountActivationForm-error">
-                <Typography color="error">Account activation failed</Typography>
+                <Typography color="error">{ t('AccountActivationForm.error.failed') }</Typography>
               </div>
             )}
 
             <Button className="AccountActivationForm-submit rounded tall" color="primary" variant="contained" type="submit">
-              Activate Account
+              { t('AccountActivationForm.label.activate') }
             </Button>
           </form>
         );
diff --git a/webclient/src/forms/KnownHostForm/KnownHostForm.i18n.json b/webclient/src/forms/KnownHostForm/KnownHostForm.i18n.json
new file mode 100644
index 00000000..fe614a12
--- /dev/null
+++ b/webclient/src/forms/KnownHostForm/KnownHostForm.i18n.json
@@ -0,0 +1,9 @@
+{
+  "KnownHostForm": {
+    "help": "Need help adding a new host?",
+    "label": {
+      "add": "Add Host",
+      "find": "Find Host"
+    }
+  }
+}
diff --git a/webclient/src/forms/KnownHostForm/KnownHostForm.tsx b/webclient/src/forms/KnownHostForm/KnownHostForm.tsx
index 4848eb7e..ded91157 100644
--- a/webclient/src/forms/KnownHostForm/KnownHostForm.tsx
+++ b/webclient/src/forms/KnownHostForm/KnownHostForm.tsx
@@ -2,6 +2,7 @@
 import React, { useState } from "react";
 import { connect } from 'react-redux';
 import { Form, Field } from 'react-final-form'
+import { useTranslation } from 'react-i18next';
 
 import Button from '@material-ui/core/Button';
 import AnchorLink from '@material-ui/core/Link';
@@ -12,20 +13,21 @@ import './KnownHostForm.css';
 
 const KnownHostForm = ({ host, onRemove, onSubmit }) => {
   const [confirmDelete, setConfirmDelete] = useState(false);
+  const { t } = useTranslation();
 
   const validate = values => {
     const errors: any = {};
 
     if (!values.name) {
-      errors.name = 'Required'
+      errors.name = t('Common.validation.required');
     }
 
     if (!values.host) {
-      errors.host = 'Required'
+      errors.host = t('Common.validation.required');
     }
 
     if (!values.port) {
-      errors.port = 'Required'
+      errors.port = t('Common.validation.required');
     }
 
     if (Object.keys(errors).length) {
@@ -54,29 +56,29 @@ const KnownHostForm = ({ host, onRemove, onSubmit }) => {
       {({ handleSubmit }) => (
         <form className="KnownHostForm" onSubmit={handleSubmit}>
           <div className="KnownHostForm-item">
-            <Field label="Host Name" name="name" component={InputField} />
+            <Field label={t('Common.label.hostName')} name="name" component={InputField} />
           </div>
           <div className="KnownHostForm-item">
-            <Field label="Host Address" name="host" component={InputField} />
+            <Field label={t('Common.label.hostAddress')} name="host" component={InputField} />
           </div>
           <div className="KnownHostForm-item">
-            <Field label="Port" name="port" type="number" component={InputField} />
+            <Field label={t('Common.label.port')} name="port" type="number" component={InputField} />
           </div>
 
           <Button className="KnownHostForm-submit" color="primary" variant="contained" type="submit">
-            {host ? 'Save Changes' : 'Add Host' }
+            {host ? t('Common.label.saveChanges') : t('KnownHostForm.label.add') }
           </Button>
 
           <div className="KnownHostForm-actions">
             <div className="KnownHostForm-actions__delete">
               { host && (
                 <Button color="inherit" onClick={() => !confirmDelete ? setConfirmDelete(true) : onRemove(host)}>
-                  { !confirmDelete ? 'Delete' : 'Are you sure?' }
+                  { !confirmDelete ? t('Common.label.delete') : t('Common.label.confirmSure') }
                 </Button>
               ) }
             </div>
             <AnchorLink href='https://github.com/Cockatrice/Cockatrice/wiki/Public-Servers' target='_blank'>
-              Need help adding a new host?
+              { t('KnownHostForm.label.find') }
             </AnchorLink>
           </div>
         </form>
diff --git a/webclient/src/forms/LoginForm/LoginForm.i18n.json b/webclient/src/forms/LoginForm/LoginForm.i18n.json
new file mode 100644
index 00000000..260b88b2
--- /dev/null
+++ b/webclient/src/forms/LoginForm/LoginForm.i18n.json
@@ -0,0 +1,11 @@
+{
+  "LoginForm": {
+    "label": {
+      "autoConnect": "Auto Connect",
+      "forgot": "Forgot Password",
+      "login": "Login",
+      "savePassword": "Save Password",
+      "savedPassword": "Saved Password"
+    }
+  }
+}
diff --git a/webclient/src/forms/LoginForm/LoginForm.tsx b/webclient/src/forms/LoginForm/LoginForm.tsx
index 112fac0e..91003daf 100644
--- a/webclient/src/forms/LoginForm/LoginForm.tsx
+++ b/webclient/src/forms/LoginForm/LoginForm.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useState, useCallback } from 'react';
 import { Form, Field } from 'react-final-form';
 import { OnChange } from 'react-final-form-listeners';
+import { useTranslation } from 'react-i18next';
 
 import Button from '@material-ui/core/Button';
 
@@ -12,22 +13,24 @@ import { APP_USER } from 'types';
 
 import './LoginForm.css';
 
-const PASSWORD_LABEL = 'Password';
-const STORED_PASSWORD_LABEL = '* Saved Password *';
-
 const LoginForm = ({ onSubmit, disableSubmitButton, onResetPassword }: LoginFormProps) => {
+  const { t } = useTranslation();
+  const PASSWORD_LABEL = t('Common.label.password');
+  const STORED_PASSWORD_LABEL = `* ${t('LoginForm.label.savedPassword')} *`;
+
   const [host, setHost] = useState(null);
   const [passwordLabel, setPasswordLabel] = useState(PASSWORD_LABEL);
   const [autoConnect, setAutoConnect] = useAutoConnect();
 
+
   const validate = values => {
     const errors: any = {};
 
     if (!values.userName) {
-      errors.userName = 'Required';
+      errors.userName = t('Common.validation.required');
     }
     if (!values.selectedHost) {
-      errors.selectedHost = 'Required';
+      errors.selectedHost = t('Common.validation.required');
     }
 
     return errors;
@@ -112,7 +115,7 @@ const LoginForm = ({ onSubmit, disableSubmitButton, onResetPassword }: LoginForm
           <form className='loginForm' onSubmit={handleSubmit}>
             <div className='loginForm-items'>
               <div className='loginForm-item'>
-                <Field label='Username' name='userName' component={InputField} autoComplete='username' />
+                <Field label={t('Common.label.username')} name='userName' component={InputField} autoComplete='username' />
                 <OnChange name="userName">{onUserNameChange}</OnChange>
               </div>
               <div className='loginForm-item'>
@@ -127,17 +130,19 @@ const LoginForm = ({ onSubmit, disableSubmitButton, onResetPassword }: LoginForm
                 />
               </div>
               <div className='loginForm-actions'>
-                <Field label='Save Password' name='remember' component={CheckboxField} />
+                <Field label={t('LoginForm.label.savePassword')} name='remember' component={CheckboxField} />
                 <OnChange name="remember">{onRememberChange}</OnChange>
 
-                <Button color='primary' onClick={onResetPassword}>Forgot Password</Button>
+                <Button color='primary' onClick={onResetPassword}>
+                  { t('LoginForm.label.forgot') }
+                </Button>
               </div>
               <div className='loginForm-item'>
                 <Field name='selectedHost' component={KnownHosts} />
                 <OnChange name="selectedHost">{setHost}</OnChange>
               </div>
               <div className='loginForm-actions'>
-                <Field label='Auto Connect' name='autoConnect' component={CheckboxField} />
+                <Field label={t('LoginForm.label.autoConnect')} name='autoConnect' component={CheckboxField} />
                 <OnChange name="autoConnect">{onAutoConnectChange}</OnChange>
               </div>
             </div>
@@ -148,7 +153,7 @@ const LoginForm = ({ onSubmit, disableSubmitButton, onResetPassword }: LoginForm
               type='submit'
               disabled={disableSubmitButton}
             >
-              Login
+              { t('LoginForm.label.login') }
             </Button>
           </form>
         )
diff --git a/webclient/src/forms/RegisterForm/RegisterForm.i18n.json b/webclient/src/forms/RegisterForm/RegisterForm.i18n.json
new file mode 100644
index 00000000..50e802ea
--- /dev/null
+++ b/webclient/src/forms/RegisterForm/RegisterForm.i18n.json
@@ -0,0 +1,10 @@
+{
+  "RegisterForm": {
+    "label": {
+      "register": "Register"
+    },
+    "toast": {
+      "registerSuccess": "Registration Successful!"
+    }
+  }
+}
diff --git a/webclient/src/forms/RegisterForm/RegisterForm.tsx b/webclient/src/forms/RegisterForm/RegisterForm.tsx
index 9f5f4c4d..dcfb87a9 100644
--- a/webclient/src/forms/RegisterForm/RegisterForm.tsx
+++ b/webclient/src/forms/RegisterForm/RegisterForm.tsx
@@ -1,7 +1,8 @@
 import { useState } from 'react';
 import { Form, Field } from 'react-final-form';
 import { OnChange } from 'react-final-form-listeners';
-import setFieldTouched from 'final-form-set-field-touched'
+import setFieldTouched from 'final-form-set-field-touched';
+import { useTranslation } from 'react-i18next';
 
 import Button from '@material-ui/core/Button';
 import Typography from '@material-ui/core/Typography';
@@ -14,12 +15,13 @@ import './RegisterForm.css';
 import { useToast } from 'components/Toast';
 
 const RegisterForm = ({ onSubmit }: RegisterFormProps) => {
+  const { t } = useTranslation();
   const [emailRequired, setEmailRequired] = useState(false);
   const [error, setError] = useState(null);
   const [emailError, setEmailError] = useState(null);
   const [passwordError, setPasswordError] = useState(null);
   const [userNameError, setUserNameError] = useState(null);
-  const { openToast } = useToast({ key: 'registration-success', children: 'Registration Successful!' })
+  const { openToast } = useToast({ key: 'registration-success', children: t('RegisterForm.toast.registerSuccess') })
 
   const onHostChange = (host) => setEmailRequired(false);
   const onEmailChange = () => emailError && setEmailError(null);
@@ -64,31 +66,31 @@ const RegisterForm = ({ onSubmit }: RegisterFormProps) => {
     const errors: any = {};
 
     if (!values.userName) {
-      errors.userName = 'Required';
+      errors.userName = t('Common.validation.required');
     } else if (userNameError) {
       errors.userName = userNameError;
     }
 
     if (!values.password) {
-      errors.password = 'Required';
+      errors.password = t('Common.validation.required');
     } else if (values.password.length < 8) {
-      errors.password = 'Minimum of 8 characters required';
+      errors.password = t('Common.validation.minChars', { count: 8 });
     } else if (passwordError) {
       errors.password = passwordError;
     }
 
     if (!values.passwordConfirm) {
-      errors.passwordConfirm = 'Required';
+      errors.passwordConfirm = t('Common.validation.required');
     } else if (values.password !== values.passwordConfirm) {
-      errors.passwordConfirm = 'Passwords don\'t match'
+      errors.passwordConfirm = t('Common.validation.passwordsMustMatch');
     }
 
     if (!values.selectedHost) {
-      errors.selectedHost = 'Required';
+      errors.selectedHost = t('Common.validation.required');
     }
 
     if (emailRequired && !values.email) {
-      errors.email = 'Required';
+      errors.email = t('Common.validation.required');
     } else if (emailError) {
       errors.email = emailError;
     }
@@ -111,16 +113,22 @@ const RegisterForm = ({ onSubmit }: RegisterFormProps) => {
             <form className="RegisterForm" onSubmit={handleSubmit}>
               <div className="RegisterForm-column">
                 <div className="RegisterForm-item">
-                  <Field label="Player Name" name="userName" component={InputField} autoComplete="username" />
+                  <Field label={t('Common.label.username')} name="userName" component={InputField} autoComplete="username" />
                   <OnChange name="userName">{onUserNameChange}</OnChange>
                 </div>
                 <div className="RegisterForm-item">
-                  <Field label="Password" name="password" type="password" component={InputField} autoComplete='new-password' />
+                  <Field
+                    label={t('Common.label.password')}
+                    name="password"
+                    type="password"
+                    component={InputField}
+                    autoComplete='new-password'
+                  />
                   <OnChange name="password">{onPasswordChange}</OnChange>
                 </div>
                 <div className="RegisterForm-item">
                   <Field
-                    label="Confirm Password"
+                    label={t('Common.label.confirmPassword')}
                     name="passwordConfirm"
                     type="password"
                     component={InputField}
@@ -134,17 +142,17 @@ const RegisterForm = ({ onSubmit }: RegisterFormProps) => {
               </div>
               <div className="RegisterForm-column" >
                 <div className="RegisterForm-item">
-                  <Field label="Real Name" name="realName" component={InputField} />
+                  <Field label={t('Common.label.realName')} name="realName" component={InputField} />
                 </div>
                 <div className="RegisterForm-item">
-                  <Field label="Email" name="email" type="email" component={InputField} />
+                  <Field label={t('Common.label.email')} name="email" type="email" component={InputField} />
                   <OnChange name="email">{onEmailChange}</OnChange>
                 </div>
                 <div className="RegisterForm-item">
-                  <Field label="Country" name="country" component={CountryDropdown} />
+                  <Field label={t('Common.label.country')} name="country" component={CountryDropdown} />
                 </div>
                 <Button className="RegisterForm-submit tall" color="primary" variant="contained" type="submit">
-                  Register
+                  { t('RegisterForm.label.register') }
                 </Button>
               </div>
             </form>
diff --git a/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.i18n.json b/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.i18n.json
new file mode 100644
index 00000000..c53f6d09
--- /dev/null
+++ b/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.i18n.json
@@ -0,0 +1,8 @@
+{
+  "RequestPasswordResetForm": {
+    "error": "Request password reset failed",
+    "mfaEnabled": "Server has multi-factor authentication enabled",
+    "request": "Request Reset Token",
+    "skipRequest": "I already have a reset token"
+  }
+}
diff --git a/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.tsx b/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.tsx
index c76197df..be2e4956 100644
--- a/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.tsx
+++ b/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.tsx
@@ -3,6 +3,7 @@ import React, { useState } from "react";
 import { connect } from 'react-redux';
 import { Form, Field } from 'react-final-form';
 import { OnChange } from 'react-final-form-listeners';
+import { useTranslation } from 'react-i18next';
 
 import Button from '@material-ui/core/Button';
 import Typography from '@material-ui/core/Typography';
@@ -17,6 +18,7 @@ import { ServerTypes } from 'store';
 const RequestPasswordResetForm = ({ onSubmit, skipTokenRequest }) => {
   const [errorMessage, setErrorMessage] = useState(false);
   const [isMFA, setIsMFA] = useState(false);
+  const { t } = useTranslation();
 
   useReduxEffect(() => {
     setErrorMessage(true);
@@ -39,13 +41,13 @@ const RequestPasswordResetForm = ({ onSubmit, skipTokenRequest }) => {
     const errors: any = {};
 
     if (!values.userName) {
-      errors.userName = 'Required';
+      errors.userName = t('Common.validation.required');
     }
     if (isMFA && !values.email) {
-      errors.email = 'Required';
+      errors.email = t('Common.validation.required');
     }
     if (!values.selectedHost) {
-      errors.selectedHost = 'Required';
+      errors.selectedHost = t('Common.validation.required');
     }
 
     return errors;
@@ -63,12 +65,12 @@ const RequestPasswordResetForm = ({ onSubmit, skipTokenRequest }) => {
           <form className="RequestPasswordResetForm" onSubmit={handleSubmit}>
             <div className="RequestPasswordResetForm-items">
               <div className="RequestPasswordResetForm-item">
-                <Field label="Username" name="userName" component={InputField} autoComplete="username" disabled={isMFA} />
+                <Field label={t('Common.label.username')} name="userName" component={InputField} autoComplete="username" disabled={isMFA} />
               </div>
               {isMFA ? (
                 <div className="RequestPasswordResetForm-item">
-                  <Field label="Email" name="email" type="email" component={InputField} autoComplete="email" />
-                  <div>Server has multi-factor authentication enabled</div>
+                  <Field label={t('Common.label.email')} name="email" type="email" component={InputField} autoComplete="email" />
+                  <div>{ t('RequestPasswordResetForm.mfaEnabled') }</div>
                 </div>
               ) : null}
               <div className="RequestPasswordResetForm-item selectedHost">
@@ -78,18 +80,18 @@ const RequestPasswordResetForm = ({ onSubmit, skipTokenRequest }) => {
 
               {errorMessage && (
                 <div className="RequestPasswordResetForm-item">
-                  <Typography color="error">Request password reset failed</Typography>
+                  <Typography color="error">{ t('RequestPasswordResetForm.error') }</Typography>
                 </div>
               )}
             </div>
 
             <Button className="RequestPasswordResetForm-submit rounded tall" color="primary" variant="contained" type="submit">
-              Request Reset Token
+              { t('RequestPasswordResetForm.request') }
             </Button>
 
             <div>
               <Button color="primary" onClick={() => skipTokenRequest(form.getState().values.userName)}>
-                I already have a reset token
+                { t('RequestPasswordResetForm.skipRequest') }
               </Button>
             </div>
           </form>
diff --git a/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.i18n.json b/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.i18n.json
new file mode 100644
index 00000000..2835134c
--- /dev/null
+++ b/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.i18n.json
@@ -0,0 +1,8 @@
+{
+  "ResetPasswordForm": {
+    "error": "Password reset failed",
+    "label": {
+      "reset": "Reset Password"
+    }
+  }
+}
diff --git a/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.tsx b/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.tsx
index 19bbc8d5..71fb667c 100644
--- a/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.tsx
+++ b/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.tsx
@@ -2,7 +2,8 @@
 import React, { useEffect, useState } from 'react';
 import { connect } from 'react-redux';
 import { Form, Field } from 'react-final-form'
-import { OnChange } from 'react-final-form-listeners'
+import { OnChange } from 'react-final-form-listeners';
+import { useTranslation } from 'react-i18next';
 
 import Button from '@material-ui/core/Button';
 import Typography from '@material-ui/core/Typography';
@@ -16,6 +17,7 @@ import { ServerTypes } from '../../store';
 
 const ResetPasswordForm = ({ onSubmit, userName }) => {
   const [errorMessage, setErrorMessage] = useState(false);
+  const { t } = useTranslation();
 
   useReduxEffect(() => {
     setErrorMessage(true);
@@ -25,25 +27,25 @@ const ResetPasswordForm = ({ onSubmit, userName }) => {
     const errors: any = {};
 
     if (!values.userName) {
-      errors.userName = 'Required';
+      errors.userName = t('Common.validation.required');
     }
     if (!values.token) {
-      errors.token = 'Required';
+      errors.token = t('Common.validation.required');
     }
 
     if (!values.newPassword) {
-      errors.newPassword = 'Required';
+      errors.newPassword = t('Common.validation.required');
     } else if (values.newPassword.length < 8) {
-      errors.newPassword = 'Minimum of 8 characters required';
+      errors.newPassword = t('Common.validation.minChars', { count: 8 });
     }
 
     if (!values.passwordAgain) {
-      errors.passwordAgain = 'Required';
+      errors.passwordAgain = t('Common.validation.required');
     } else if (values.newPassword !== values.passwordAgain) {
-      errors.passwordAgain = 'Passwords don\'t match'
+      errors.passwordAgain = t('Common.validation.passwordsMustMatch');
     }
     if (!values.selectedHost) {
-      errors.selectedHost = 'Required';
+      errors.selectedHost = t('Common.validation.required');
     }
 
     return errors;
@@ -62,16 +64,34 @@ const ResetPasswordForm = ({ onSubmit, userName }) => {
         <form className='ResetPasswordForm' onSubmit={handleSubmit}>
           <div className='ResetPasswordForm-items'>
             <div className='ResetPasswordForm-item'>
-              <Field label='Username' name='userName' component={InputField} autoComplete='username' disabled={!!userName} />
+              <Field
+                label={t('Common.label.username')}
+                name='userName'
+                component={InputField}
+                autoComplete='username'
+                disabled={!!userName}
+              />
             </div>
             <div className='ResetPasswordForm-item'>
-              <Field label='Token' name='token' component={InputField} />
+              <Field label={t('Common.label.token')} name='token' component={InputField} />
             </div>
             <div className='ResetPasswordForm-item'>
-              <Field label='Password' name='newPassword' type='password' component={InputField} autoComplete='new-password' />
+              <Field
+                label={t('Common.label.password')}
+                name='newPassword'
+                type='password'
+                component={InputField}
+                autoComplete='new-password'
+              />
             </div>
             <div className='ResetPasswordForm-item'>
-              <Field label='Password Again' name='passwordAgain' type='password' component={InputField} autoComplete='new-password' />
+              <Field
+                label={t('Common.label.passwordAgain')}
+                name='passwordAgain'
+                type='password'
+                component={InputField}
+                autoComplete='new-password'
+              />
             </div>
             <div className='ResetPasswordForm-item'>
               <Field name='selectedHost' component={KnownHosts} disabled />
@@ -79,12 +99,12 @@ const ResetPasswordForm = ({ onSubmit, userName }) => {
 
             {errorMessage && (
               <div className='ResetPasswordForm-item'>
-                <Typography color="error">Password reset failed</Typography>
+                <Typography color="error">{ t('ResetPasswordForm.error') }</Typography>
               </div>
             )}
           </div>
           <Button className='ResetPasswordForm-submit rounded tall' color='primary' variant='contained' type='submit'>
-            Reset Password
+            { t('ResetPasswordForm.label.reset') }
           </Button>
         </form>
       )}
diff --git a/webclient/src/i18n-default.json b/webclient/src/i18n-default.json
index 690e5780..a40915ac 100644
--- a/webclient/src/i18n-default.json
+++ b/webclient/src/i18n-default.json
@@ -1 +1 @@
-{"Common":{"language":"Translate into English.","disconnect":"Disconnect"},"LoginContainer":{"title":"Login","subtitle":"A cross-platform virtual tabletop for multiplayer card games."}}
\ No newline at end of file
+{"Common":{"language":"Translate into English.","disconnect":"Disconnect","label":{"confirmPassword":"Confirm Password","confirmSure":"Are you sure?","country":"Country","delete":"Delete","email":"Email","hostName":"Host Name","hostAddress":"Host Address","password":"Password","passwordAgain":"Password Again","port":"Port","realName":"Real Name","saveChanges":"Save Changes","token":"Token","username":"Username"},"validation":{"minChars":"Minimum of {count} {count, plural, one {character} other {characters}} required","passwordsMustMatch":"Passwords don't match","required":"Required"}},"KnownHosts":{"label":"Host","add":"Add new host","toast":"Host successfully {mode, select, created {created} deleted {deleted} other {edited}}."},"InitializeContainer":{"title":"DID YOU KNOW","subtitle":"<1>Cockatrice is run by volunteers</1><1>that love card games!</1>"},"LoginContainer":{"header":{"title":"Login","subtitle":"A cross-platform virtual tabletop for multiplayer card games."},"footer":{"registerPrompt":"Not registered yet?","registerAction":"Create an account","credit":"Cockatrice is an open source project","version":"Version"},"content":{"subtitle1":"Play multiplayer card games online.","subtitle2":"Cross-platform virtual tabletop for multiplayer card games. Forever free."},"toasts":{"passwordResetSuccessToast":"Password Reset Successfully","accountActivationSuccess":"Account Activated Successfully"}},"UnsupportedContainer":{"title":"Unsupported Browser","subtitle1":"Please update your browser and/or check your permissions.","subtitle2":"Note: Private browsing causes some browsers to disable certain permissions or features."},"AccountActivationDialog":{"title":"Account Activation","subtitle1":"Your account has not been activated yet.","subtitle2":"You need to provide the activation token received in the activation email."},"KnownHostDialog":{"title":"{mode, select, edit {Edit} other {Add}} Known Host","subtitle":"Adding a new host allows you to connect to different servers. Enter the details below to your host list."},"RegistrationDialog":{"title":"Create New Account"},"RequestPasswordResetDialog":{"title":"Request Password Reset"},"ResetPasswordDialog":{"title":"Reset Password"},"AccountActivationForm":{"error":{"failed":"Account activation failed"},"label":{"activate":"Activate Account"}},"KnownHostForm":{"help":"Need help adding a new host?","label":{"add":"Add Host","find":"Find Host"}},"LoginForm":{"label":{"autoConnect":"Auto Connect","forgot":"Forgot Password","login":"Login","savePassword":"Save Password","savedPassword":"Saved Password"}},"RegisterForm":{"label":{"register":"Register"},"toast":{"registerSuccess":"Registration Successful!"}},"RequestPasswordResetForm":{"error":"Request password reset failed","mfaEnabled":"Server has multi-factor authentication enabled","request":"Request Reset Token","skipRequest":"I already have a reset token"},"ResetPasswordForm":{"error":"Password reset failed","label":{"reset":"Reset Password"}}}
\ No newline at end of file
diff --git a/webclient/src/i18n.ts b/webclient/src/i18n.ts
index 8c805354..ef188596 100644
--- a/webclient/src/i18n.ts
+++ b/webclient/src/i18n.ts
@@ -1,5 +1,6 @@
 import i18n from 'i18next';
 import LanguageDetector from 'i18next-browser-languagedetector';
+import ICU from 'i18next-icu';
 import { initReactI18next } from 'react-i18next';
 
 import { Language } from 'types';
@@ -10,6 +11,7 @@ import I18nBackend from './i18n-backend';
 import translation from './i18n-default.json';
 
 i18n
+  .use(ICU)
   .use(I18nBackend)
   .use(LanguageDetector)
   .use(initReactI18next)
@@ -24,7 +26,7 @@ i18n
     interpolation: {
       // not needed for react as it escapes by default
       escapeValue: false,
-    },
+    }
   });
 
 export default i18n;