diff --git a/apps/mobile/app/components/auth/two-factor.tsx b/apps/mobile/app/components/auth/two-factor.tsx index 17b6ca500..e5e0f20a0 100644 --- a/apps/mobile/app/components/auth/two-factor.tsx +++ b/apps/mobile/app/components/auth/two-factor.tsx @@ -80,7 +80,11 @@ const TwoFactorVerification = ({ const onNext = async () => { if (!code.current || code.current.length < 6) { setError( - new Error("Please provide a valid multi-factor authentication code.") + new Error( + currentMethod.method === "recoveryCode" + ? strings.provideValidMultiFactorAuthRecoveryCode() + : strings.provideValidMultiFactorAuthCode() + ) ); return; } @@ -214,7 +218,11 @@ const TwoFactorVerification = ({ marginBottom: Spacing.LEVEL_1 }} > - {currentMethod.method ? strings["2fa"]() : strings.select2faMethod()} + {currentMethod.method === "recoveryCode" + ? strings.recoveryCodeTitle() + : currentMethod.method + ? strings["2fa"]() + : strings.select2faMethod()} diff --git a/apps/mobile/app/components/sheets/buy-plan/index.tsx b/apps/mobile/app/components/sheets/buy-plan/index.tsx index e370bff90..d725307aa 100644 --- a/apps/mobile/app/components/sheets/buy-plan/index.tsx +++ b/apps/mobile/app/components/sheets/buy-plan/index.tsx @@ -196,7 +196,7 @@ export const BuyPlan = (props: { - + {hasTrialOffer ? "Free" : pricingPlans.getStandardPrice( @@ -238,7 +238,7 @@ export const BuyPlan = (props: { {dayjs() .add(billingDuration?.duration || 0, "day") .format("DD MMMM,YYYY")}{" "} - *{" "} + •{" "} {isAnnual ? strings.billingType.annual() : is5YearPlanSelected @@ -343,7 +343,7 @@ export const BuyPlan = (props: { color: colors.primary.accent }} onPress={() => { - openLinkInBrowser("https://notesnook.com/privacy"); + openLinkInBrowser("https://notesnook.com/tos"); }} > {strings.subTerms[1]()} @@ -354,7 +354,7 @@ export const BuyPlan = (props: { color: colors.primary.accent }} onPress={() => { - openLinkInBrowser("https://notesnook.com/tos"); + openLinkInBrowser("https://notesnook.com/privacy"); }} > {strings.subTerms[3]()} diff --git a/apps/mobile/app/components/ui/pin-input/index.tsx b/apps/mobile/app/components/ui/pin-input/index.tsx index 618471879..17c40eb4e 100644 --- a/apps/mobile/app/components/ui/pin-input/index.tsx +++ b/apps/mobile/app/components/ui/pin-input/index.tsx @@ -244,7 +244,10 @@ const PinInput = ({ rowGap: Spacing.LEVEL_1, columnGap: Spacing.LEVEL_1, borderWidth: 1, - borderColor: colors.primary.border, + borderColor: + focusedIndex !== null + ? colors.selected.accent + : colors.primary.border, borderRadius: Radius.S, paddingVertical: Spacing.LEVEL_3, paddingHorizontal: Spacing.LEVEL_2 diff --git a/packages/intl/locale/en.po b/packages/intl/locale/en.po index d99633363..05638c0a2 100644 --- a/packages/intl/locale/en.po +++ b/packages/intl/locale/en.po @@ -6,6 +6,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: @lingui/cli\n" "Language: en\n" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: \n" +"Plural-Forms: \n" #: src/strings.ts:2442 msgid " \"Notebook > Notes\"" @@ -683,8 +689,8 @@ msgid "About" msgstr "About" #: src/strings.ts:2845 -msgid "Access on all devices" -msgstr "Access on all devices" +msgid "Access on all your devices" +msgstr "Access on all your devices" #: src/strings.ts:1040 msgid "Account" @@ -786,7 +792,7 @@ msgstr "Add to notebook" msgid "Add your first note" msgstr "Add your first note" -#: src/strings.ts:2847 +#: src/strings.ts:2861 msgid "Add Your First Note" msgstr "Add Your First Note" @@ -1397,8 +1403,8 @@ msgid "Cancel" msgstr "Cancel" #: src/strings.ts:2606 -msgid "Cancel anytime, subscription auto-renews." -msgstr "Cancel anytime, subscription auto-renews." +msgid "Cancel anytime, Subscription auto-renews." +msgstr "Cancel anytime, Subscription auto-renews." #: src/strings.ts:2568 msgid "Cancel anytime." @@ -2849,25 +2855,21 @@ msgid "Enter recovery code" msgstr "Enter recovery code" #: src/strings.ts:119 -msgid "Enter the 6 digit code from your authenticator app to continue logging in" -msgstr "Enter the 6 digit code from your authenticator app to continue logging in" +msgid "Enter the 6 digit code from your authenticator app to continue logging in." +msgstr "Enter the 6 digit code from your authenticator app to continue logging in." #: src/strings.ts:115 -msgid "Enter the 6 digit code sent to your email to continue logging in" -msgstr "Enter the 6 digit code sent to your email to continue logging in" +msgid "Enter the 6 digit code sent to your email to continue logging in." +msgstr "Enter the 6 digit code sent to your email to continue logging in." #: src/strings.ts:117 -msgid "Enter the 6 digit code sent to your phone number to continue logging in" -msgstr "Enter the 6 digit code sent to your phone number to continue logging in" +msgid "Enter the 6 digit code sent to your phone number to continue logging in." +msgstr "Enter the 6 digit code sent to your phone number to continue logging in." #: src/strings.ts:2465 msgid "Enter the gift code to redeem your subscription." msgstr "Enter the gift code to redeem your subscription." -#: src/strings.ts:120 -msgid "Enter the recovery code to continue logging in" -msgstr "Enter the recovery code to continue logging in" - #: src/strings.ts:2653 msgid "Enter title" msgstr "Enter title" @@ -2888,6 +2890,10 @@ msgstr "Enter your PGP private key" msgid "Enter your PGP public key" msgstr "Enter your PGP public key" +#: src/strings.ts:120 +msgid "Enter your recovery code." +msgstr "Enter your recovery code." + #: src/strings.ts:2120 msgid "Enter your username" msgstr "Enter your username" @@ -4582,7 +4588,7 @@ msgstr "No notebooks selected to move" msgid "No notebooks yet" msgstr "No notebooks yet" -#: src/strings.ts:2844 +#: src/strings.ts:2858 msgid "No notes yet" msgstr "No notes yet" @@ -5025,8 +5031,8 @@ msgid "Payment method" msgstr "Payment method" #: src/strings.ts:2841 -msgid "Payment summary" -msgstr "Payment summary" +msgid "Payment Summary" +msgstr "Payment Summary" #: src/strings.ts:788 msgid "PDF is password protected" @@ -5179,6 +5185,14 @@ msgstr "Please make sure you have saved the recovery key. Tap one more time to c msgid "Please note that we will respond to your issue on the given link. We recommend that you save it." msgstr "Please note that we will respond to your issue on the given link. We recommend that you save it." +#: src/strings.ts:2869 +msgid "Please provide a valid multi factor authentication code." +msgstr "Please provide a valid multi factor authentication code." + +#: src/strings.ts:2867 +msgid "Please provide a valid multi factor authentication recovery code." +msgstr "Please provide a valid multi factor authentication recovery code." + #: src/strings.ts:1786 msgid "Please refer to the" msgstr "Please refer to the" @@ -5341,14 +5355,14 @@ msgstr "Privacy for everyone" msgid "Privacy mode" msgstr "Privacy mode" -#: src/strings.ts:2609 -msgid "privacy policy" -msgstr "privacy policy" - #: src/strings.ts:1301 msgid "Privacy policy" msgstr "Privacy policy" +#: src/strings.ts:2611 +msgid "Privacy Policy." +msgstr "Privacy Policy." + #: src/strings.ts:104 msgid "Privacy Policy. " msgstr "Privacy Policy. " @@ -5561,6 +5575,10 @@ msgstr "Recommended by Privacy Guides" msgid "Recover your account" msgstr "Recover your account" +#: src/strings.ts:2865 +msgid "Recovery Code" +msgstr "Recovery Code" + #: src/strings.ts:1021 msgid "Recovery codes copied!" msgstr "Recovery codes copied!" @@ -5646,8 +5664,8 @@ msgid "Reload app" msgstr "Reload app" #: src/strings.ts:1849 -msgid "Relogin to your Account" -msgstr "Relogin to your Account" +msgid "Relogin to your account" +msgstr "Relogin to your account" #: src/strings.ts:1817 msgid "Remembered your password?" @@ -6413,7 +6431,7 @@ msgstr "Set the interval to create a partial backup (without attachments) automa msgid "Set your name" msgstr "Set your name" -#: src/strings.ts:2845 +#: src/strings.ts:2863 msgid "Setting up your account..." msgstr "Setting up your account..." @@ -6684,8 +6702,8 @@ msgid "Subscribe" msgstr "Subscribe" #: src/strings.ts:2604 -msgid "Subscribe and start free trial" -msgstr "Subscribe and start free trial" +msgid "Subscribe & Start Your Free Trial" +msgstr "Subscribe & Start Your Free Trial" #: src/strings.ts:1041 msgid "Subscribe to Pro" @@ -6938,14 +6956,14 @@ msgstr "Tell us what happened" msgid "Terms of service" msgstr "Terms of service" +#: src/strings.ts:2609 +msgid "Terms of Service" +msgstr "Terms of Service" + #: src/strings.ts:102 msgid "Terms of Service " msgstr "Terms of Service " -#: src/strings.ts:2611 -msgid "terms of use." -msgstr "terms of use." - #: src/strings.ts:1643 msgid "Test connection" msgstr "Test connection" @@ -7821,8 +7839,8 @@ msgid "What went wrong?" msgstr "What went wrong?" #: src/strings.ts:2840 -msgid "What's included" -msgstr "What's included" +msgid "What's Included" +msgstr "What's Included" #: src/strings.ts:2541 msgid "Why do you need my credit card details for a free trial?" @@ -8079,7 +8097,7 @@ msgstr "Your account email will be changed without affecting your subscription o msgid "Your account has been recovered." msgstr "Your account has been recovered." -#: src/strings.ts:2846 +#: src/strings.ts:2864 msgid "Your account is almost ready, please wait." msgstr "Your account is almost ready, please wait." @@ -8252,7 +8270,7 @@ msgstr "Your support request has been forwarded to our support team. We will get msgid "Your tags" msgstr "Your tags" -#: src/strings.ts:2846 +#: src/strings.ts:2860 msgid "Your thoughts deserve a home. Create your first note and start organizing your life today." msgstr "Your thoughts deserve a home. Create your first note and start organizing your life today." diff --git a/packages/intl/locale/pseudo-LOCALE.po b/packages/intl/locale/pseudo-LOCALE.po index 82408cf19..95e4eb4e2 100644 --- a/packages/intl/locale/pseudo-LOCALE.po +++ b/packages/intl/locale/pseudo-LOCALE.po @@ -6,6 +6,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: @lingui/cli\n" "Language: pseudo-LOCALE\n" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: \n" +"Plural-Forms: \n" #: src/strings.ts:2442 msgid " \"Notebook > Notes\"" @@ -680,10 +686,10 @@ msgstr "" #: src/strings.ts:1305 msgid "About" -msgstr "" +msgstr "<<<<<<< HEAD" #: src/strings.ts:2845 -msgid "Access on all devices" +msgid "Access on all your devices" msgstr "" #: src/strings.ts:1040 @@ -786,7 +792,7 @@ msgstr "" msgid "Add your first note" msgstr "" -#: src/strings.ts:2847 +#: src/strings.ts:2861 msgid "Add Your First Note" msgstr "" @@ -1397,7 +1403,7 @@ msgid "Cancel" msgstr "" #: src/strings.ts:2606 -msgid "Cancel anytime, subscription auto-renews." +msgid "Cancel anytime, Subscription auto-renews." msgstr "" #: src/strings.ts:2568 @@ -2838,25 +2844,21 @@ msgid "Enter recovery code" msgstr "" #: src/strings.ts:119 -msgid "Enter the 6 digit code from your authenticator app to continue logging in" +msgid "Enter the 6 digit code from your authenticator app to continue logging in." msgstr "" #: src/strings.ts:115 -msgid "Enter the 6 digit code sent to your email to continue logging in" +msgid "Enter the 6 digit code sent to your email to continue logging in." msgstr "" #: src/strings.ts:117 -msgid "Enter the 6 digit code sent to your phone number to continue logging in" +msgid "Enter the 6 digit code sent to your phone number to continue logging in." msgstr "" #: src/strings.ts:2465 msgid "Enter the gift code to redeem your subscription." msgstr "" -#: src/strings.ts:120 -msgid "Enter the recovery code to continue logging in" -msgstr "" - #: src/strings.ts:2653 msgid "Enter title" msgstr "" @@ -2877,6 +2879,10 @@ msgstr "" msgid "Enter your PGP public key" msgstr "" +#: src/strings.ts:120 +msgid "Enter your recovery code." +msgstr "" + #: src/strings.ts:2120 msgid "Enter your username" msgstr "" @@ -4562,7 +4568,7 @@ msgstr "" msgid "No notebooks yet" msgstr "" -#: src/strings.ts:2844 +#: src/strings.ts:2858 msgid "No notes yet" msgstr "" @@ -4996,10 +5002,10 @@ msgstr "" #: src/strings.ts:2230 msgid "Payment method" -msgstr "" +msgstr "<<<<<<< HEAD" #: src/strings.ts:2841 -msgid "Payment summary" +msgid "Payment Summary" msgstr "" #: src/strings.ts:788 @@ -5153,6 +5159,14 @@ msgstr "" msgid "Please note that we will respond to your issue on the given link. We recommend that you save it." msgstr "" +#: src/strings.ts:2869 +msgid "Please provide a valid multi factor authentication code." +msgstr "" + +#: src/strings.ts:2867 +msgid "Please provide a valid multi factor authentication recovery code." +msgstr "" + #: src/strings.ts:1786 msgid "Please refer to the" msgstr "" @@ -5315,14 +5329,14 @@ msgstr "" msgid "Privacy mode" msgstr "" -#: src/strings.ts:2609 -msgid "privacy policy" -msgstr "" - #: src/strings.ts:1301 msgid "Privacy policy" msgstr "" +#: src/strings.ts:2611 +msgid "Privacy Policy." +msgstr "" + #: src/strings.ts:104 msgid "Privacy Policy. " msgstr "" @@ -5535,6 +5549,10 @@ msgstr "" msgid "Recover your account" msgstr "" +#: src/strings.ts:2865 +msgid "Recovery Code" +msgstr "" + #: src/strings.ts:1021 msgid "Recovery codes copied!" msgstr "" @@ -5620,7 +5638,7 @@ msgid "Reload app" msgstr "" #: src/strings.ts:1849 -msgid "Relogin to your Account" +msgid "Relogin to your account" msgstr "" #: src/strings.ts:1817 @@ -6387,7 +6405,7 @@ msgstr "" msgid "Set your name" msgstr "" -#: src/strings.ts:2845 +#: src/strings.ts:2863 msgid "Setting up your account..." msgstr "" @@ -6650,7 +6668,7 @@ msgid "Subscribe" msgstr "" #: src/strings.ts:2604 -msgid "Subscribe and start free trial" +msgid "Subscribe & Start Your Free Trial" msgstr "" #: src/strings.ts:1041 @@ -6897,12 +6915,12 @@ msgstr "" msgid "Terms of service" msgstr "" -#: src/strings.ts:102 -msgid "Terms of Service " +#: src/strings.ts:2609 +msgid "Terms of Service" msgstr "" -#: src/strings.ts:2611 -msgid "terms of use." +#: src/strings.ts:102 +msgid "Terms of Service " msgstr "" #: src/strings.ts:1643 @@ -7768,10 +7786,10 @@ msgstr "" #: src/strings.ts:1688 msgid "What went wrong?" -msgstr "" +msgstr "<<<<<<< HEAD" #: src/strings.ts:2840 -msgid "What's included" +msgid "What's Included" msgstr "" #: src/strings.ts:2541 @@ -8018,7 +8036,7 @@ msgstr "" msgid "Your account has been recovered." msgstr "" -#: src/strings.ts:2846 +#: src/strings.ts:2864 msgid "Your account is almost ready, please wait." msgstr "" @@ -8191,7 +8209,7 @@ msgstr "" msgid "Your tags" msgstr "" -#: src/strings.ts:2846 +#: src/strings.ts:2860 msgid "Your thoughts deserve a home. Create your first note and start organizing your life today." msgstr "" diff --git a/packages/intl/src/strings.ts b/packages/intl/src/strings.ts index 6d02f2c9b..4b839d627 100644 --- a/packages/intl/src/strings.ts +++ b/packages/intl/src/strings.ts @@ -112,12 +112,12 @@ export const strings = { select2faCodeHelpText: () => t`Select how you would like to recieve the code`, "2faCodeHelpText": { email: () => - t`Enter the 6 digit code sent to your email to continue logging in`, + t`Enter the 6 digit code sent to your email to continue logging in.`, sms: () => - t`Enter the 6 digit code sent to your phone number to continue logging in`, + t`Enter the 6 digit code sent to your phone number to continue logging in.`, app: () => - t`Enter the 6 digit code from your authenticator app to continue logging in`, - recoveryCode: () => t`Enter the recovery code to continue logging in` + t`Enter the 6 digit code from your authenticator app to continue logging in.`, + recoveryCode: () => t`Enter your recovery code.` }, "2faCodeSecondaryMethodText": { email: () => t`I don't have access to email`, @@ -2601,14 +2601,14 @@ Use this if changes from other devices are not appearing on this device. This wi ], purchase: () => t`Purchase`, subscribe: () => t`Subscribe`, - subscribeAndStartTrial: () => t`Subscribe and start free trial`, + subscribeAndStartTrial: () => t`Subscribe & Start Your Free Trial`, oneTimePurchase: () => t`This is a one time purchase, no subscription.`, - cancelAnytimeAlt: () => t`Cancel anytime, subscription auto-renews.`, + cancelAnytimeAlt: () => t`Cancel anytime, Subscription auto-renews.`, subTerms: [ () => t`By joining you agree to our`, - () => t`privacy policy`, + () => t`Terms of Service`, () => t`and`, - () => t`terms of use.` + () => t`Privacy Policy.` ], bestValue: () => t`Best value`, planLimits: () => t`Plan limits`, @@ -2837,12 +2837,12 @@ Continue without attachments?`, monthly: () => t`Billed monthly`, oneTime: () => t`One time purchase` }, - whatsIncluded: () => t`What's included`, - paymentSummary: () => t`Payment summary`, + whatsIncluded: () => t`What's Included`, + paymentSummary: () => t`Payment Summary`, planWhatsIncluded: { unlimitedNotes: () => t`Unlimited notes and attachments`, endToEnd: () => t`End-to-end encryption (XChaCha20)`, - allDevices: () => t`Access on all devices`, + allDevices: () => t`Access on all your devices`, freeTrial: (days: number) => t`Free ${days} days trial, cancel anytime`, remind: () => t`Remind before your trial ends` }, @@ -2861,5 +2861,10 @@ Continue without attachments?`, button: () => t`Add Your First Note` }, settingUpYourAccount: () => t`Setting up your account...`, - accountAlmostReady: () => t`Your account is almost ready, please wait.` + accountAlmostReady: () => t`Your account is almost ready, please wait.`, + recoveryCodeTitle: () => t`Recovery Code`, + provideValidMultiFactorAuthRecoveryCode: () => + t`Please provide a valid multi factor authentication recovery code.`, + provideValidMultiFactorAuthCode: () => + t`Please provide a valid multi factor authentication code.` };