From 36ff40b50da7b099958ac7825d4093bcbb02a133 Mon Sep 17 00:00:00 2001 From: ddasilva Date: Mon, 18 Jun 2018 18:09:50 +0200 Subject: [PATCH 1/3] Testing wording branch --- static/i18n/en/onboarding.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/i18n/en/onboarding.yml b/static/i18n/en/onboarding.yml index d09f78e2..90c50cd4 100644 --- a/static/i18n/en/onboarding.yml +++ b/static/i18n/en/onboarding.yml @@ -2,7 +2,7 @@ start: title: Welcome to Ledger Live startBtn: Get Started init: - title: Welcome to Ledger Live, the computer companion app to your Ledger device + title: Welcome to the Ledger Live companion app newDevice: title: Initialize your new Ledger device desc: Please replace it with the final wording once it’s done. From 6139d7a839e12e80553bfaf0112b1dfd892ed397 Mon Sep 17 00:00:00 2001 From: ddasilva Date: Wed, 20 Jun 2018 12:22:52 +0200 Subject: [PATCH 2/3] Onboarding wording and added the missing screens --- src/reducers/onboarding.js | 12 +-- static/i18n/en/onboarding.yml | 166 +++++++++++++++++++--------------- 2 files changed, 98 insertions(+), 80 deletions(-) diff --git a/src/reducers/onboarding.js b/src/reducers/onboarding.js index 3412a4fc..69bfeef9 100644 --- a/src/reducers/onboarding.js +++ b/src/reducers/onboarding.js @@ -73,7 +73,7 @@ const state: OnboardingState = { }, { name: 'selectDevice', - label: 'Select Device', + label: 'onboarding:breadcrumb.selectDevice', options: { showFooter: false, showBackground: true, @@ -82,7 +82,7 @@ const state: OnboardingState = { }, { name: 'selectPIN', - label: 'Select PIN', + label: 'onboarding:breadcrumb.SelectPIN', options: { showFooter: false, showBackground: true, @@ -91,7 +91,7 @@ const state: OnboardingState = { }, { name: 'writeSeed', - label: 'Write Seed', + label: 'onboarding:breadcrumb.writeSeed', options: { showFooter: false, showBackground: true, @@ -100,7 +100,7 @@ const state: OnboardingState = { }, { name: 'genuineCheck', - label: 'Genuine Check', + label: 'onboarding:breadcrumb.genuineCheck', options: { showFooter: false, showBackground: true, @@ -109,7 +109,7 @@ const state: OnboardingState = { }, { name: 'setPassword', - label: 'Set Password', + label: 'onboarding:breadcrumb.setPassword', options: { showFooter: false, showBackground: true, @@ -118,7 +118,7 @@ const state: OnboardingState = { }, { name: 'analytics', - label: 'Analytics & Bug report', + label: 'onboarding:breadcrumb.analytics', options: { showFooter: false, showBackground: true, diff --git a/static/i18n/en/onboarding.yml b/static/i18n/en/onboarding.yml index 90c50cd4..5f73c17f 100644 --- a/static/i18n/en/onboarding.yml +++ b/static/i18n/en/onboarding.yml @@ -1,20 +1,23 @@ +breadcrumb: + selectDevice: Select device + choosePIN: Choose PIN + saveRecovery: Recovery phrase + securityCheck: Security check + setPassword: Encrypt data + shareAnalytics: Analytics start: title: Welcome to Ledger Live - startBtn: Get Started + startBtn: Get started init: - title: Welcome to the Ledger Live companion app + title: Get started with your Ledger device newDevice: - title: Initialize your new Ledger device - desc: Please replace it with the final wording once it’s done. + title: Initialize a new Ledger device restoreDevice: title: Restore a Ledger device - desc: Please replace it with the final wording once it’s done. initializedDevice: - title: I have already initialized my device - desc: Please replace it with the final wording once it’s done. + title: Use a device that's already initialized noDevice: title: Do not have a Ledger device yet? - desc: Please replace it with the final wording once it’s done. noDevice: title: Do not have a Ledger device yet? buyNew: @@ -24,100 +27,115 @@ noDevice: learnMore: title: Learn about Ledger Live selectDevice: - title: To get started, select your device + title: Select your device ledgerNanoCard: title: Ledger Nano S - desc: Please replace it with the final wording once it’s done. ledgerBlueCard: title: Ledger Blue - desc: Please replace it with the final wording once it’s done. selectPIN: - title: Start initialization & choose your PIN code - instructions: - ledgerNano: - step1: Connect the Ledger Nano S to your computer. - step2: Press both buttons simultaneously as instructed on the screen. - step3: Press the right button to select Configure as new device. - step4: Choose a PIN code between 4 and 8 digits long. - ledgerBlue: - step1: Connect the Ledger Blue to your computer. - step2: Tap on Configure as new device. - step3: Choose a PIN code between 4 and 8 digits long. + initialize: + title: Start initialization - Choose your PIN code + instructions: + nano: + step1: Connect the Ledger Nano S to your computer. + step2: Press both buttons simultaneously as instructed on the screen. + step3: Press the right button to select Configure as new device?. # Configure as new device?. + step4: 'Choose a PIN code between 4 and 8 digits long. Then select the checkmark (✓).' + blue: + step1: Connect the Ledger Blue to your computer. + step2: Tap on Configure as new device. + step3: Choose a PIN code between 4 and 8 digits long. + restore: + title: Start restoration - Choose your PIN code + instructions: + nano: + step1: Connect the Ledger Nano S to your computer. + step2: Press both buttons simultaneously as instructed on the screen. + step3: Press the left button to cancel Initialize as new device?. Press the right button to select Restore configuration?. # Initialize as new device? Restore configuration?. + step4: 'Choose a PIN code between 4 and 8 digits long. Then select the checkmark (✓).' + blue: + step1: Connect the Ledger Blue to your computer. + step2: Tap on Restore configuration. # Restore configuration. + step3: Choose a PIN code between 4 and 8 digits long. disclaimer: - note1: Choose your own PIN code. This code unlocks your device. + note1: Choose your own PIN code. This code will unlock your device. note2: An 8-digit PIN code offers an optimum level of security. - note3: Never use a device supplied with a PIN code and/or a 24-word recovery phrase. + note3: Never use a device supplied with a PIN code or a 24-word recovery phrase. writeSeed: +initialize: + title: Save your recovery phrase + desc: Your device will generate a recovery phrase of 24 words, displayed only once. + nano: + step1: 'Copy the word displayed below Word #1 in position 1 on a blank Recovery sheet.' # Word #1 Recovery sheet + step2: 'Press the right button to display Word #2 and repeat the process until all 24 words are copied on the Recovery sheet.' # Word #2 Recovery sheet + step3: 'Confirm your recovery phrase: select each requested word and press both buttons to validate it.' + blue: + step1: Copy each word of the recovery phrase on a blank Recovery sheet. Copy the words in the same order. + step2: Tap Next to move to the next words. Repeat the process until the Confirmation screen appears. # Next Confirmation + step3: Type each requested word to confirm your recovery phrase. restore: - title: Save your recovery phrase - desc: Your recovery phrase is formed by 24 words. They will be displayed only once. - step1: Press the right button to select the length of your recovery phrase. Press both buttons to confirm. - step2: 'Select the first letters of Word #1 by pressing the right or left button. Press both buttons to confirm each letter.' - step3: 'Select Word #1 from the suggested words. Press both buttons to continue.' - step4: Repeat the process until the last word. - nano: - title: Save your recovery phrase - desc: Your recovery phrase is formed by 24 words. They will be displayed only once. - step1: 'Copy the first word (Word #1) in position 1 on the blank Recovery sheet.' - step2: 'Press the right button to display Word #2 and repeat the process until all 24 words are copied on the Recovery sheet.' - step3: Confirm your recovery phrase press both buttons to validate each word displayed on the screen. - blue: - title: Save your recovery phrase - desc: Your recovery phrase is formed by 24 words. They will be displayed only once. - step1: Copy each word of the recovery phrase on the blank Recovery sheet. Make sure to copy the words in the same order. - step2: Tap NEXT to display the following words. Tap PREVIOUS to go back. - step3: Enter the requested words to confirm your recovery phrase. + title: Enter your recovery phrase + desc: Copy the 24-word recovery phrase from your Recovery sheet on your device. + nano: + step1: Select the length of your recovery phrase. Press both buttons to continue. + step2: 'Select the first letters of Word #1 by pressing the right or left button. Press both buttons to confirm each letter.' # Word #1 + step3: 'Select Word #1 from the suggested words. Press both buttons to continue.' # Word #1 + step4: Repeat the process until the last word. + blue: + step1: Select the length of your recovery phrase. + step2: Type the first word of your recovery phrase. Select the word when it appears. + step3: Repeat the process until the last word. disclaimer: - note1: Carefully secure your 24 words out of sight. - note2: Ledger does not keep any backup of your 24 words. - note3: Make sure you are the sole holder of the 24-word recovery phrase. - note4: Never use a device supplied with a recovery phrase and/or a PIN code. + note1: Carefully secure your 24-word recovery phrase out of sight. + note2: Ledger does not keep any backup of your recovery phrase. + note3: Make sure you are the sole holder of your recovery phrase. + note4: Never use a device supplied with a recovery phrase or a PIN code. genuineCheck: title: Final security check - descNano: Your Ledger Nano S should now display Your device is now ready. Before getting started, please confirm that - descBlue: Your Ledger Blue should now display Your device is now ready. Before getting started, please confirm that + descBlue: #Your Ledger Blue should now display Your device is now ready. Before getting started, please confirm that steps: step1: title: Did you choose your PIN code by yourself? - desc: This is a long text, please replace it with the final wording once it’s done. Lorem ipsum dolor amet ledger lorem dolor step2: title: Did you save your recovery phrase by yourself? - desc: This is a long text, please replace it with the final wording once it’s done. Lorem ipsum dolor amet ledger lorem dolor + desc: step3: title: Check if your Ledger device is genuine - desc: This is a long text, please replace it with the final wording once it’s done. Lorem ipsum dolor amet ledger lorem dolor - isGenuinePassed: Your Nano S is genuine + desc: + isGenuinePassed: + nano: ✓ Genuine + blue: ✓ Genuine buttons: genuineCheck: Genuine check - contactSupport: Contact Support + contactSupport: Ledger Support errorPage: ledgerNano: - title: Something is wrong with your Ledger Nano S - desc: A problem occurred with your Ledger Nano S. Contact Ledger Support to get assistance or go back to the security check. + title: Oops, something went wrong... + desc: Go back to the security check or request Ledger Support assistance. ledgerBlue: - title: Something is wrong with your Ledger Blue - desc: A problem occurred with your Ledger Blue. Contact Ledger Support to get assistance or go back to the security check. + title: Oops, something went wrong... + desc: Go back to the security check or request Ledger Support assistance. setPassword: - title: Protect your privacy (optional) - desc: Set a password to prevent unauthorized access to Ledger Live data stored on your computer, including account names, balances, transactions and public addresses. + title: Encrypt Ledger Live data + desc: Enhance your privacy. Set a password to encrypt Ledger Live data stored on your computer, including account names, balances, transactions and public addresses. disclaimer: - note1: Make sure to remember your password and do not share it. + note1: Make sure to remember your password. Do not share it. note2: Losing your password requires resetting Ledger Live and re-adding accounts. - note3: Loss of password doesn’t affect your crypto-assets. + note3: Resetting Ledger Live does not affect your crypto-assets. + password: Password + confirmPassword: Confirm password + skipThisStep: Skip this step analytics: - title: Help Ledger to improve its products and services - desc: This is a long text, please replace it with the final wording once it’s done.
Lorem ipsum dolor amet ledger lorem dolor ipsum amet + title: Analytics and bug reports + desc: Share anonymous usage and diagnostics data to help improve Ledger products, services and security features. shareAnalytics: - title: Share analytics - desc: Help Ledger improve its products and services by automatically sending diagnostics and usage data. - termsConditions: - title: Terms and Conditions - desc: Please accept terms and conditions to proceed + title: Share usage data + desc: Enable analytics of anonymous data to help Ledger improve its user's experience. This includes the operating system, language, firmware versions and the number of added accounts. sentryLogs: - title: Sentry Logs - desc: Help Ledger improve its products and services by automatically sending diagnostics and usage data. + title: Report bugs + desc: Automatically send bug reports to help Ledger developers diagnose issues and improve Ledger Live performance. finish: - title: This is the title of the screen. 1 line is the maximum - desc: This is a long text, please replace it with the final wording once it’s done.
Lorem ipsum dolor amet ledger lorem dolor ipsum amet - openAppButton: Open app - followUsLabel: Follow us to stay updated + title: Ready for launch! + desc: The value of crypto assets can go up or down. Balances shown in your portfolio may involve double conversions and are for indicative purposes only! + openAppButton: Launch + followUsLabel: From 8b6aa667e4c83cbc31b60a6d15921861e8cb8461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Wed, 20 Jun 2018 14:21:51 +0200 Subject: [PATCH 3/3] fix wording --- .../Onboarding/OnboardingBreadcrumb.js | 8 +- .../steps/WriteSeed/WriteSeedNano.js | 4 +- src/reducers/onboarding.js | 2 +- static/i18n/en/onboarding.yml | 82 +++++++++---------- 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/components/Onboarding/OnboardingBreadcrumb.js b/src/components/Onboarding/OnboardingBreadcrumb.js index e3137645..93053a37 100644 --- a/src/components/Onboarding/OnboardingBreadcrumb.js +++ b/src/components/Onboarding/OnboardingBreadcrumb.js @@ -3,6 +3,7 @@ import React from 'react' import { connect } from 'react-redux' import findIndex from 'lodash/findIndex' +import { translate } from 'react-i18next' import type { OnboardingState } from 'reducers/onboarding' @@ -14,15 +15,16 @@ const mapStateToProps = state => ({ type Props = { onboarding: OnboardingState, + t: *, } function OnboardingBreadcrumb(props: Props) { - const { onboarding } = props + const { onboarding, t } = props const { stepName, genuine } = onboarding const filteredSteps = onboarding.steps .filter(step => !step.external) - .map(step => ({ ...step, label: step.label })) // TODO: translate + .map(step => ({ ...step, label: t(step.label) })) // TODO: translate const stepIndex = findIndex(filteredSteps, s => s.name === stepName) const genuineStepIndex = findIndex(filteredSteps, s => s.name === 'genuineCheck') @@ -36,4 +38,4 @@ function OnboardingBreadcrumb(props: Props) { ) } -export default connect(mapStateToProps)(OnboardingBreadcrumb) +export default translate()(connect(mapStateToProps)(OnboardingBreadcrumb)) diff --git a/src/components/Onboarding/steps/WriteSeed/WriteSeedNano.js b/src/components/Onboarding/steps/WriteSeed/WriteSeedNano.js index d1e76f4d..2a412a31 100644 --- a/src/components/Onboarding/steps/WriteSeed/WriteSeedNano.js +++ b/src/components/Onboarding/steps/WriteSeed/WriteSeedNano.js @@ -69,8 +69,8 @@ class WriteSeedNano extends PureComponent { return ( - {t('onboarding:writeSeed.nano.title')} - {t('onboarding:writeSeed.nano.desc')} + {t('onboarding:writeSeed.title')} + {t('onboarding:writeSeed.desc')} diff --git a/src/reducers/onboarding.js b/src/reducers/onboarding.js index 69bfeef9..9a05cad5 100644 --- a/src/reducers/onboarding.js +++ b/src/reducers/onboarding.js @@ -82,7 +82,7 @@ const state: OnboardingState = { }, { name: 'selectPIN', - label: 'onboarding:breadcrumb.SelectPIN', + label: 'onboarding:breadcrumb.selectPIN', options: { showFooter: false, showBackground: true, diff --git a/static/i18n/en/onboarding.yml b/static/i18n/en/onboarding.yml index 5f73c17f..256da37a 100644 --- a/static/i18n/en/onboarding.yml +++ b/static/i18n/en/onboarding.yml @@ -1,10 +1,10 @@ breadcrumb: selectDevice: Select device - choosePIN: Choose PIN - saveRecovery: Recovery phrase - securityCheck: Security check + selectPIN: Choose PIN + writeSeed: Recovery phrase + genuineCheck: Security check setPassword: Encrypt data - shareAnalytics: Analytics + analytics: Analytics start: title: Welcome to Ledger Live startBtn: Get started @@ -33,46 +33,45 @@ selectDevice: ledgerBlueCard: title: Ledger Blue selectPIN: - initialize: - title: Start initialization - Choose your PIN code - instructions: - nano: - step1: Connect the Ledger Nano S to your computer. - step2: Press both buttons simultaneously as instructed on the screen. - step3: Press the right button to select Configure as new device?. # Configure as new device?. - step4: 'Choose a PIN code between 4 and 8 digits long. Then select the checkmark (✓).' - blue: - step1: Connect the Ledger Blue to your computer. - step2: Tap on Configure as new device. - step3: Choose a PIN code between 4 and 8 digits long. - restore: - title: Start restoration - Choose your PIN code - instructions: - nano: - step1: Connect the Ledger Nano S to your computer. - step2: Press both buttons simultaneously as instructed on the screen. - step3: Press the left button to cancel Initialize as new device?. Press the right button to select Restore configuration?. # Initialize as new device? Restore configuration?. - step4: 'Choose a PIN code between 4 and 8 digits long. Then select the checkmark (✓).' - blue: - step1: Connect the Ledger Blue to your computer. - step2: Tap on Restore configuration. # Restore configuration. - step3: Choose a PIN code between 4 and 8 digits long. +# initialize: + title: Start initialization - Choose your PIN code + instructions: + ledgerNano: + step1: Connect the Ledger Nano S to your computer. + step2: Press both buttons simultaneously as instructed on the screen. + step3: Press the right button to select Configure as new device?. # Configure as new device?. + step4: 'Choose a PIN code between 4 and 8 digits long. Then select the checkmark (✓).' + ledgerBlue: + step1: Connect the Ledger Blue to your computer. + step2: Tap on Configure as new device. + step3: Choose a PIN code between 4 and 8 digits long. + # restore: + # title: Start restoration - Choose your PIN code + # instructions: + # nano: + # step1: Connect the Ledger Nano S to your computer. + # step2: Press both buttons simultaneously as instructed on the screen. + # step3: Press the left button to cancel Initialize as new device?. Press the right button to select Restore configuration?. # Initialize as new device? Restore configuration?. + # step4: 'Choose a PIN code between 4 and 8 digits long. Then select the checkmark (✓).' + # blue: + # step1: Connect the Ledger Blue to your computer. + # step2: Tap on Restore configuration. # Restore configuration. + # step3: Choose a PIN code between 4 and 8 digits long. disclaimer: note1: Choose your own PIN code. This code will unlock your device. note2: An 8-digit PIN code offers an optimum level of security. note3: Never use a device supplied with a PIN code or a 24-word recovery phrase. writeSeed: -initialize: title: Save your recovery phrase desc: Your device will generate a recovery phrase of 24 words, displayed only once. - nano: - step1: 'Copy the word displayed below Word #1 in position 1 on a blank Recovery sheet.' # Word #1 Recovery sheet - step2: 'Press the right button to display Word #2 and repeat the process until all 24 words are copied on the Recovery sheet.' # Word #2 Recovery sheet - step3: 'Confirm your recovery phrase: select each requested word and press both buttons to validate it.' - blue: - step1: Copy each word of the recovery phrase on a blank Recovery sheet. Copy the words in the same order. - step2: Tap Next to move to the next words. Repeat the process until the Confirmation screen appears. # Next Confirmation - step3: Type each requested word to confirm your recovery phrase. + nano: + step1: 'Copy the word displayed below Word #1 in position 1 on a blank Recovery sheet.' # Word #1 Recovery sheet + step2: 'Press the right button to display Word #2 and repeat the process until all 24 words are copied on the Recovery sheet.' # Word #2 Recovery sheet + step3: 'Confirm your recovery phrase: select each requested word and press both buttons to validate it.' + ledgerBlue: + step1: Copy each word of the recovery phrase on a blank Recovery sheet. Copy the words in the same order. # Recovery sheet + step2: Tap Next to move to the next words. Repeat the process until the Confirmation screen appears. # Next Confirmation + step3: Type each requested word to confirm your recovery phrase. restore: title: Enter your recovery phrase desc: Copy the 24-word recovery phrase from your Recovery sheet on your device. @@ -81,7 +80,7 @@ initialize: step2: 'Select the first letters of Word #1 by pressing the right or left button. Press both buttons to confirm each letter.' # Word #1 step3: 'Select Word #1 from the suggested words. Press both buttons to continue.' # Word #1 step4: Repeat the process until the last word. - blue: + ledgerBlue: step1: Select the length of your recovery phrase. step2: Type the first word of your recovery phrase. Select the word when it appears. step3: Repeat the process until the last word. @@ -92,6 +91,7 @@ initialize: note4: Never use a device supplied with a recovery phrase or a PIN code. genuineCheck: title: Final security check + descNano: Your Ledger Nano S should now display Your device is now ready. Before getting started, please confirm that descBlue: #Your Ledger Blue should now display Your device is now ready. Before getting started, please confirm that steps: step1: @@ -102,9 +102,7 @@ genuineCheck: step3: title: Check if your Ledger device is genuine desc: - isGenuinePassed: - nano: ✓ Genuine - blue: ✓ Genuine + isGenuinePassed: 'Genuine' buttons: genuineCheck: Genuine check contactSupport: Ledger Support @@ -135,7 +133,7 @@ analytics: title: Report bugs desc: Automatically send bug reports to help Ledger developers diagnose issues and improve Ledger Live performance. finish: - title: Ready for launch! + title: 'Ready for launch!' desc: The value of crypto assets can go up or down. Balances shown in your portfolio may involve double conversions and are for indicative purposes only! openAppButton: Launch followUsLabel: