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] 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: