From 206c0b4d85b35c9346b66c113e62eea205b1d93b Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 4 Sep 2020 16:32:42 +0200 Subject: [PATCH] Swap to actual react-i18next (#431) * Swap to actual react-i18next * Update i18n creation --- packages/extension-ui/package.json | 3 ++ .../src/Popup/Accounts/Account.tsx | 10 ++--- .../src/Popup/Accounts/AddAccount.tsx | 2 +- .../extension-ui/src/Popup/Accounts/index.tsx | 2 +- .../src/Popup/Authorize/Request.tsx | 23 +++++----- .../src/Popup/Authorize/index.tsx | 2 +- .../src/Popup/CreateAccount/AccountName.tsx | 2 +- .../src/Popup/CreateAccount/Mnemonic.tsx | 6 +-- .../src/Popup/CreateAccount/index.tsx | 2 +- .../src/Popup/Derive/DerivationPath.tsx | 2 +- .../src/Popup/Derive/SelectParent.tsx | 10 ++--- .../extension-ui/src/Popup/Derive/index.tsx | 4 +- packages/extension-ui/src/Popup/Export.tsx | 10 ++--- packages/extension-ui/src/Popup/Forget.tsx | 8 ++-- packages/extension-ui/src/Popup/ImportQr.tsx | 4 +- .../extension-ui/src/Popup/ImportSeed.tsx | 6 +-- .../src/Popup/Metadata/Request.tsx | 18 ++++---- .../extension-ui/src/Popup/Metadata/index.tsx | 2 +- .../extension-ui/src/Popup/RestoreJson.tsx | 8 ++-- .../extension-ui/src/Popup/Signing/Bytes.tsx | 4 +- .../src/Popup/Signing/Extrinsic.tsx | 25 ++++++----- .../extension-ui/src/Popup/Signing/Qr.tsx | 2 +- .../src/Popup/Signing/Request.tsx | 6 +-- .../extension-ui/src/Popup/Signing/Unlock.tsx | 2 +- .../extension-ui/src/Popup/Signing/index.tsx | 2 +- packages/extension-ui/src/Popup/Welcome.tsx | 14 +++--- .../extension-ui/src/components/Loading.tsx | 2 +- .../src/components/MnemonicSeed.tsx | 4 +- packages/extension-ui/src/createView.tsx | 2 + .../extension-ui/src/hooks/useTranslation.ts | 17 +------ packages/extension-ui/src/i18n.ts | 30 +++++++++++++ packages/extension-ui/src/partials/Back.tsx | 2 +- .../extension-ui/src/partials/MenuAdd.tsx | 6 +-- .../src/partials/MenuSettings.tsx | 8 ++-- packages/extension-ui/src/partials/Name.tsx | 2 +- .../extension-ui/src/partials/Password.tsx | 4 +- yarn.lock | 45 ++++++++++++++++++- 37 files changed, 183 insertions(+), 118 deletions(-) create mode 100644 packages/extension-ui/src/i18n.ts diff --git a/packages/extension-ui/package.json b/packages/extension-ui/package.json index 6dd3f2ff..9d6322cc 100644 --- a/packages/extension-ui/package.json +++ b/packages/extension-ui/package.json @@ -13,9 +13,12 @@ "@polkadot/react-qr": "^0.59.0-beta.0", "@polkadot/util": "^3.4.1", "@polkadot/util-crypto": "^3.4.1", + "i18next": "^19.7.0", + "i18next-browser-languagedetector": "^5.0.1", "react": "^16.13.1", "react-dom": "^16.13.1", "react-dropzone": "^11.0.3", + "react-i18next": "^11.7.2", "react-is": "^16.13.1", "react-router": "^5.2.0", "react-router-dom": "^5.2.0", diff --git a/packages/extension-ui/src/Popup/Accounts/Account.tsx b/packages/extension-ui/src/Popup/Accounts/Account.tsx index 464feee7..8953e38f 100644 --- a/packages/extension-ui/src/Popup/Accounts/Account.tsx +++ b/packages/extension-ui/src/Popup/Accounts/Account.tsx @@ -69,14 +69,14 @@ function Account ({ address, className, genesisHash, isExternal, isHidden, paren className='menuItem' onClick={_toggleEdit} > - {t('Rename')} + {t('Rename')} {!isExternal && ( - {t('Derive New Account')} + {t('Derive New Account')} )} @@ -86,7 +86,7 @@ function Account ({ address, className, genesisHash, isExternal, isHidden, paren isDanger to={`/account/export/${address}`} > - {t('Export Account')} + {t('Export Account')} )} - {t('Forget Account')} + {t('Forget Account')}
('Visible (always inject)')} onClick={_toggleVisibility} />
diff --git a/packages/extension-ui/src/Popup/Accounts/AddAccount.tsx b/packages/extension-ui/src/Popup/Accounts/AddAccount.tsx index 62de2c78..742543de 100644 --- a/packages/extension-ui/src/Popup/Accounts/AddAccount.tsx +++ b/packages/extension-ui/src/Popup/Accounts/AddAccount.tsx @@ -36,7 +36,7 @@ function AddAccount ({ className }: Props): React.ReactElement {
-

{t("You currently don't have any accounts. Create your first account to get started.")}

+

{t("You currently don't have any accounts. Create your first account to get started.")}

diff --git a/packages/extension-ui/src/Popup/Accounts/index.tsx b/packages/extension-ui/src/Popup/Accounts/index.tsx index 00cc2c87..e3cc2772 100644 --- a/packages/extension-ui/src/Popup/Accounts/index.tsx +++ b/packages/extension-ui/src/Popup/Accounts/index.tsx @@ -24,7 +24,7 @@ export default function Accounts (): React.ReactElement {
('Accounts')} /> {hierarchy.map((json, index): React.ReactNode => ( diff --git a/packages/extension-ui/src/Popup/Authorize/Request.tsx b/packages/extension-ui/src/Popup/Authorize/Request.tsx index 7ac9130f..559ce828 100644 --- a/packages/extension-ui/src/Popup/Authorize/Request.tsx +++ b/packages/extension-ui/src/Popup/Authorize/Request.tsx @@ -6,6 +6,7 @@ import { RequestAuthorizeTab } from '@polkadot/extension-base/background/types'; import { ThemeProps } from '../../types'; import React, { useCallback, useContext } from 'react'; +import { Trans } from 'react-i18next'; import styled from 'styled-components'; import { ActionBar, ActionContext, Button, Icon, Link, Warning } from '../../components'; @@ -38,7 +39,6 @@ function Request ({ authId, className, isFirst, request: { origin }, url }: Prop [authId, onAction] ); - // FIXME i18next component to be used here return (
@@ -48,20 +48,21 @@ function Request ({ authId, className, isFirst, request: { origin }, url }: Prop onClick={_onReject} />
- An application, self-identifying as {origin} is requesting access from{' '} - - {url} - . + An application, self-identifying as {origin} is requesting access from{' '} + + {url} + . +
{isFirst && ( <> - {t('Only approve this request if you trust the application. Approving gives the application access to the addresses of your accounts.')} - {t('Yes, allow this application access')} + {t('Only approve this request if you trust the application. Approving gives the application access to the addresses of your accounts.')} + {t('Yes, allow this application access')} )} diff --git a/packages/extension-ui/src/Popup/Authorize/index.tsx b/packages/extension-ui/src/Popup/Authorize/index.tsx index e23ef5d7..d3868683 100644 --- a/packages/extension-ui/src/Popup/Authorize/index.tsx +++ b/packages/extension-ui/src/Popup/Authorize/index.tsx @@ -17,7 +17,7 @@ export default function Authorize (): React.ReactElement { return ( <> -
+
('Authorize')} /> {requests.map(({ id, request, url }, index): React.ReactNode => ( - {t('Add the account with the generated seed')} + {t('Add the account with the generated seed')} diff --git a/packages/extension-ui/src/Popup/CreateAccount/Mnemonic.tsx b/packages/extension-ui/src/Popup/CreateAccount/Mnemonic.tsx index d67cc2d5..9e43c08c 100644 --- a/packages/extension-ui/src/Popup/CreateAccount/Mnemonic.tsx +++ b/packages/extension-ui/src/Popup/CreateAccount/Mnemonic.tsx @@ -40,11 +40,11 @@ function Mnemonic ({ onNextStep, seed }: Props): React.ReactElement { onCopy={_onCopy} seed={seed} /> - {t("Please write down your wallet's mnemonic seed and keep it in a safe place. The mnemonic can be used to restore your wallet. Keep it carefully to not lose your assets.")} + {t("Please write down your wallet's mnemonic seed and keep it in a safe place. The mnemonic can be used to restore your wallet. Keep it carefully to not lose your assets.")} ('I have saved my mnemonic seed safely.')} onChange={setIsMnemonicSaved} /> @@ -52,7 +52,7 @@ function Mnemonic ({ onNextStep, seed }: Props): React.ReactElement { isDisabled={!isMnemonicSaved} onClick={onNextStep} > - {t('Next step')} + {t('Next step')} diff --git a/packages/extension-ui/src/Popup/CreateAccount/index.tsx b/packages/extension-ui/src/Popup/CreateAccount/index.tsx index 321fcac2..c51a4bec 100644 --- a/packages/extension-ui/src/Popup/CreateAccount/index.tsx +++ b/packages/extension-ui/src/Popup/CreateAccount/index.tsx @@ -49,7 +49,7 @@ export default function CreateAccount (): React.ReactElement { <> ('Create an account')} />
diff --git a/packages/extension-ui/src/Popup/Derive/DerivationPath.tsx b/packages/extension-ui/src/Popup/Derive/DerivationPath.tsx index ba9121fb..40388ee9 100644 --- a/packages/extension-ui/src/Popup/Derive/DerivationPath.tsx +++ b/packages/extension-ui/src/Popup/Derive/DerivationPath.tsx @@ -47,7 +47,7 @@ function DerivationPath ({ className, defaultPath, isError, onChange }: Props): : t('Derivation Path (unlock to edit)') } onChange={_onChange} - placeholder={t('//hard/soft')} + placeholder={t('//hard/soft')} value={path} /> diff --git a/packages/extension-ui/src/Popup/Derive/SelectParent.tsx b/packages/extension-ui/src/Popup/Derive/SelectParent.tsx index 2a90e3ef..532f54bb 100644 --- a/packages/extension-ui/src/Popup/Derive/SelectParent.tsx +++ b/packages/extension-ui/src/Popup/Derive/SelectParent.tsx @@ -95,7 +95,7 @@ export function SelectParent ({ isLocked, onDerivationConfirmed, parentAddress, {!isLocked && ( ('Derive new account from existing')} onChange={setShouldAccountBeDerived} /> )} @@ -108,7 +108,7 @@ export function SelectParent ({ isLocked, onDerivationConfirmed, parentAddress, /> ) : ( -