diff --git a/.yarn/cache/dedent-npm-1.5.1-8d0a005200-c3c300a14e.zip b/.yarn/cache/dedent-npm-1.5.1-8d0a005200-c3c300a14e.zip new file mode 100644 index 000000000..6448efcb2 Binary files /dev/null and b/.yarn/cache/dedent-npm-1.5.1-8d0a005200-c3c300a14e.zip differ diff --git a/.yarn/cache/plural-forms-npm-0.5.5-17e30e89ab-97e1ff5bb6.zip b/.yarn/cache/plural-forms-npm-0.5.5-17e30e89ab-97e1ff5bb6.zip new file mode 100644 index 000000000..fc9c4b192 Binary files /dev/null and b/.yarn/cache/plural-forms-npm-0.5.5-17e30e89ab-97e1ff5bb6.zip differ diff --git a/.yarn/cache/ttag-npm-1.8.12-a48f025d37-7bb7713fdc.zip b/.yarn/cache/ttag-npm-1.8.12-a48f025d37-7bb7713fdc.zip new file mode 100644 index 000000000..33e0cb351 Binary files /dev/null and b/.yarn/cache/ttag-npm-1.8.12-a48f025d37-7bb7713fdc.zip differ diff --git a/packages/web/package.json b/packages/web/package.json index 62ee4ac5f..2b27ae343 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -120,6 +120,7 @@ "comlink": "^4.4.1", "fast-diff": "^1.3.0", "lexical": "0.38.1", + "ttag": "^1.8.12", "unicode-script": "^1.2.0" } } diff --git a/packages/web/src/javascripts/Components/AccountMenu/ConfirmPassword.tsx b/packages/web/src/javascripts/Components/AccountMenu/ConfirmPassword.tsx index 673abc0ab..bcb518af4 100644 --- a/packages/web/src/javascripts/Components/AccountMenu/ConfirmPassword.tsx +++ b/packages/web/src/javascripts/Components/AccountMenu/ConfirmPassword.tsx @@ -20,6 +20,7 @@ import { useCaptcha } from '@/Hooks/useCaptcha' import { isErrorResponse } from '@standardnotes/snjs' import MergeLocalDataCheckbox from './MergeLocalDataCheckbox' import ConfirmNoMergeDialog from './ConfirmNoMergeDialog' +import { c } from 'ttag' type Props = { setMenuPane: (pane: AccountMenuPane) => void @@ -165,9 +166,9 @@ const ConfirmPassword: FunctionComponent = ({ setMenuPane, email, passwor const confirmPasswordForm = ( <>
- Because your notes are encrypted using your password,{' '} - Standard Notes does not have a password reset option. If you forget your - password, you will permanently lose access to your data. + {c('Info').jt`Because your notes are encrypted using your password, ${( + Standard Notes does not have a password reset option + )}. If you forget your password, you will permanently lose access to your data.`}
{!isRegistering && ( @@ -177,7 +178,7 @@ const ConfirmPassword: FunctionComponent = ({ setMenuPane, email, passwor left={[]} onChange={handlePasswordChange} onKeyDown={handleKeyDown} - placeholder="Confirm password" + placeholder={c('Label').t`Confirm password`} ref={passwordInputRef} value={confirmPassword} /> @@ -187,13 +188,13 @@ const ConfirmPassword: FunctionComponent = ({ setMenuPane, email, passwor primary fullWidth className="mb-3 mt-1" - label={isRegistering ? 'Creating account...' : 'Create account & sign in'} + label={isRegistering ? c('Action').t`Creating account...` : c('Action').t`Create account & sign in`} onClick={handleConfirmFormSubmit} disabled={isRegistering} /> = ({ setMenuPane, email, passwor
-
{captchaURL ? 'Human verification' : 'Confirm password'}
+
+ {captchaURL ? c('Title').t`Human verification` : c('Title').t`Confirm password`} +
{captchaURL ?
{captchaIframe}
: confirmPasswordForm} {showNoMergeConfirmation && ( diff --git a/packages/web/src/javascripts/Components/AccountMenu/CreateAccount.tsx b/packages/web/src/javascripts/Components/AccountMenu/CreateAccount.tsx index caa8cc610..3cee72526 100644 --- a/packages/web/src/javascripts/Components/AccountMenu/CreateAccount.tsx +++ b/packages/web/src/javascripts/Components/AccountMenu/CreateAccount.tsx @@ -16,6 +16,7 @@ import Icon from '@/Components/Icon/Icon' import IconButton from '@/Components/Button/IconButton' import AdvancedOptions from './AdvancedOptions' import HorizontalSeparator from '../Shared/HorizontalSeparator' +import { c } from 'ttag' type Props = { setMenuPane: (pane: AccountMenuPane) => void @@ -101,12 +102,12 @@ const CreateAccount: FunctionComponent = ({ setMenuPane, email, setEmail,
-
Create account
+
{c('Title').t`Create account`}
= ({ setMenuPane, email, setEmail, left={[]} onChange={handleEmailChange} onKeyDown={handleKeyDown} - placeholder="Email" + placeholder={c('Label').t`Email`} ref={emailInputRef} type="email" value={email} @@ -126,11 +127,17 @@ const CreateAccount: FunctionComponent = ({ setMenuPane, email, setEmail, left={[]} onChange={handlePasswordChange} onKeyDown={handleKeyDown} - placeholder="Password" + placeholder={c('Label').t`Password`} ref={passwordInputRef} value={password} /> - + ) + return (
- You're not signed in + {c('Title').t`You're not signed in`}
- Sign in to sync your notes and preferences across all your devices and enable end-to-end encryption. -
- + {c('Info') + .t`Sign in to sync your notes and preferences across all your devices and enable end-to-end encryption.`}
+ {!application.isNativeIOS() && ( )}