fix(FormattedMessage): first batch

blockchain · May 23, 2018 · 6075d4d · 6075d4d
1 parent 1cc65ae
commit 6075d4d
Show file tree

Hide file tree

Showing 56 changed files with 232 additions and 232 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Recover/FirstStep/index.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Recover/FirstStep/index.js
@@ -68,7 +68,7 @@ const FirstStep = (props) => {
               <FormattedMessage id='scenes.recover.firststep.mnemonic' defaultMessage='Your backup phrase' />
             </MnemonicLabel>
             <Text size='12px' weight={300}>
-              <FormattedMessage id='scenes.recover.firststep.mnemonic_explain' defaultMessage='Enter your 12 word phrase, with spaces between each, to recover your funds & transactions.' />
+              <FormattedMessage id='scenes.recover.firststep.mnemonic.explain' defaultMessage='Enter your 12 word phrase, with spaces between each, to recover your funds & transactions.' />
             </Text>
             <Field name='mnemonic' autoFocus validate={[required, validMnemonic]} component={TextBox} />
           </FormItem>

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Recover/SecondStep/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Recover/SecondStep/template.js
@@ -68,7 +68,7 @@ const SecondStep = (props) => {
         </FormGroup>
         <FormGroup>
           <FormLabel for='confirmationPassword'>
-            <FormattedMessage id='scenes.recover.secondstep.confirmationPassword' defaultMessage='Confirm Password' />
+            <FormattedMessage id='scenes.recover.secondstep.confirmapassword' defaultMessage='Confirm Password' />
           </FormLabel>
           <Field name='confirmationPassword' validate={[required]} component={PasswordBox} />
         </FormGroup>

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Register/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Register/template.js
@@ -75,7 +75,7 @@ const Register = (props) => {
         <FormGroup>
           <FormItem>
             <FormLabel for='confirmationPassword'>
-              <FormattedMessage id='scenes.register.confirmationPassword' defaultMessage='Confirm Password' />
+              <FormattedMessage id='scenes.register.confirmpassword' defaultMessage='Confirm Password' />
             </FormLabel>
             <Field name='confirmationPassword' validate={[required]} component={PasswordBox} />
           </FormItem>

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Reset2FA/FirstStep/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Reset2FA/FirstStep/template.js
@@ -65,7 +65,7 @@ const FirstStep = (props) => {
             <Field name='guid' autoFocus validate={[required, validWalletId]} component={TextBox} placeholder='XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXX' />
             <TextGroup inline>
               <Text size='12px' weight={300}>
-                <FormattedMessage id='scenes.reset2fa.firststep.firststepform.guid_explain' defaultMessage='If you forgot your wallet identifier, please' />
+                <FormattedMessage id='scenes.reset2fa.firststep.firststepform.guidexplain' defaultMessage='If you forgot your wallet identifier, please' />
               </Text>
               <LinkContainer to='/reminder'>
                 <Link size='12px' weight={300}>
@@ -82,7 +82,7 @@ const FirstStep = (props) => {
             </FormLabel>
             <Field name='email' validate={[required, validEmail]} component={TextBox} />
             <Text size='12px' weight={300}>
-              <FormattedMessage id='scenes.reset2fa.firststep.firststepform.email_explain' defaultMessage='Enter the email associated with your wallet.  If you lost access to this email, please enter it regardless.' />
+              <FormattedMessage id='scenes.reset2fa.firststep.firststepform.emailexplain' defaultMessage='Enter the email associated with your wallet.  If you lost access to this email, please enter it regardless.' />
             </Text>
           </FormItem>
         </FormGroup>

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Reset2FA/ThirdStep/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Reset2FA/ThirdStep/template.js
@@ -61,7 +61,7 @@ const ThirdStep = (props) => {
         </Text>
         <Field name='message' component={TextArea} />
         <Text size='13px' weight={300}>
-          <FormattedMessage id='scenes.reset2fa.thirdstep.message_explain' defaultMessage='Enter a message for Blockchain.info admins to review.' />
+          <FormattedMessage id='scenes.reset2fa.thirdstep.message.explain' defaultMessage='Enter a message for Blockchain.info admins to review.' />
         </Text>
         <CaptchaText size='14px' weight={500}>
           <FormattedMessage id='scenes.reset2fa.thirdstep.captcha' defaultMessage='Captcha' />

diff --git a/...n-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/PasswordHint/Settings/template.js b/...n-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/PasswordHint/Settings/template.js
@@ -23,7 +23,7 @@ const Settings = (props) => {
       <Hint />
       { !updateToggled &&
         <Button nature='primary' onClick={handleToggle}>
-          <FormattedMessage id='scenes.securitysettings.basicsecurity.passwordhint.settings.change' defaultMessage='Change'/>
+          <FormattedMessage id='scenes.securitysettings.basicsecurity.passwordhint.settings.change' defaultMessage='Change' />
         </Button>
       }
       { updateToggled &&

diff --git a/...et-v4-frontend/src/scenes/SecurityCenter/Advanced/PasswordStretching/Settings/template.js b/...et-v4-frontend/src/scenes/SecurityCenter/Advanced/PasswordStretching/Settings/template.js
@@ -25,7 +25,7 @@ const Settings = (props) => {
       }
       { !updateToggled &&
         <Button nature='primary' onClick={handleToggle}>
-          <FormattedMessage id='scenes.securitysettings.advancedsettings.passwordstretching.settings.change' defaultMessage='Change'/>
+          <FormattedMessage id='scenes.securitysettings.advancedsettings.passwordstretching.settings.change' defaultMessage='Change' />
         </Button>
       }
       { updateToggled &&

diff --git a/...-v4-frontend/src/scenes/SecurityCenter/Advanced/SecondPasswordWallet/Settings/template.js b/...-v4-frontend/src/scenes/SecurityCenter/Advanced/SecondPasswordWallet/Settings/template.js
@@ -26,21 +26,21 @@ const Settings = (props) => {
       <SettingWrapper>
         { !updateToggled &&
           <Button nature='primary' onClick={handleToggle}>
-            <FormattedMessage id='scenes.securitysettings.basicsecurity.secondpasswordwallet.settings.remove' defaultMessage='Remove Second Password'/>
+            <FormattedMessage id='scenes.securitysettings.advanced.secondpasswordwallet.settings.remove' defaultMessage='Remove Second Password' />
           </Button>
         }
         { updateToggled &&
           <SettingForm>
             <Text size='14px' weight={300}>
-              <FormattedMessage id='scenes.securitysettings.basicsecurity.secondpasswordwallet.settings.label' defaultMessage='Second Password' />
+              <FormattedMessage id='scenes.securitysettings.advanced.secondpasswordwallet.settings.label' defaultMessage='Second Password' />
             </Text>
             <Field name='secondPassword' component={PasswordBox} />
             <ButtonWrapper>
               <Button nature='empty' capitalize onClick={handleCancel}>
-                <FormattedMessage id='scenes.securitysettings.basicsecurity.secondpasswordwallet.settings.cancel' defaultMessage='Cancel' />
+                <FormattedMessage id='scenes.securitysettings.advanced.secondpasswordwallet.settings.cancel' defaultMessage='Cancel' />
               </Button>
               <Button nature='primary' capitalize disabled={submitting || invalid} onClick={handleClick}>
-                <FormattedMessage id='scenes.securitysettings.basicsecurity.secondpasswordwallet.settings.save' defaultMessage='Save' />
+                <FormattedMessage id='scenes.securitysettings.advanced.secondpasswordwallet.settings.save' defaultMessage='Save' />
               </Button>
             </ButtonWrapper>
           </SettingForm>
@@ -52,42 +52,42 @@ const Settings = (props) => {
       <SecondPasswordWrapper toggled={updateToggled}>
         { !updateToggled &&
           <Button nature='primary' onClick={handleToggle}>
-            <FormattedMessage id='scenes.securitysettings.basicsecurity.secondpasswordwallet.settings.set' defaultMessage='Set Second Password' />
+            <FormattedMessage id='scenes.securitysettings.advanced.secondpasswordwallet.settings.set' defaultMessage='Set Second Password' />
           </Button>
         }
         { updateToggled &&
           <SettingForm>
             <TextGroup inline style={{'margin-bottom': '10px'}}>
               <Text size='14px' weight={300} color='error'>
-                <FormattedMessage id='scenes.securitysettings.basicsecurity.secondpasswordwallet.settings.warning' defaultMessage="We highly recommend you backup your wallet's recovery phrase before setting a second password." />
+                <FormattedMessage id='scenes.securitysettings.advanced.secondpasswordwallet.settings.warning' defaultMessage="We highly recommend you backup your wallet's recovery phrase before setting a second password." />
               </Text>
               <Text size='14px' weight={300} color='error'>
-                <FormattedMessage id='scenes.securitysettings.basicsecurity.secondpasswordwallet.settings.warning2' defaultMessage='Backing up your wallet will ensure your funds are safe in case you lose your password.' />
+                <FormattedMessage id='scenes.securitysettings.advanced.secondpasswordwallet.settings.warning2' defaultMessage='Backing up your wallet will ensure your funds are safe in case you lose your password.' />
               </Text>
               <Text size='14px' weight={300} color='error'>
-                <FormattedMessage id='scenes.securitysettings.basicsecurity.secondpasswordwallet.settings.warning3' defaultMessage='For your security, we do not keep any passwords on file.' />
+                <FormattedMessage id='scenes.securitysettings.advanced.secondpasswordwallet.settings.warning3' defaultMessage='For your security, we do not keep any passwords on file.' />
               </Text>
             </TextGroup>
             <FormGroup>
               <FormItem>
                 <FormLabel for='secondPassword'>
-                  <FormattedMessage id='scenes.securitysettings.basicsecurity.secondpasswordwallet.settings.label2' defaultMessage='Second Password' />
+                  <FormattedMessage id='scenes.securitysettings.advanced.secondpasswordwallet.settings.label2' defaultMessage='Second Password' />
                 </FormLabel>
                 <Field name='secondPassword' validate={[isMainPassword]} component={PasswordBox} />
               </FormItem>
               <FormItem style={{'margin-top': '10px'}}>
                 <FormLabel for='secondPasswordConfirmation'>
-                  <FormattedMessage id='scenes.securitysettings.basicsecurity.secondpasswordwallet.settings.explain' defaultMessage='Confirm Second Password' />
+                  <FormattedMessage id='scenes.securitysettings.advanced.secondpasswordwallet.settings.explain' defaultMessage='Confirm Second Password' />
                 </FormLabel>
                 <Field name='secondPasswordConfirmation' validate={(value, allValues) => (value === allValues['secondPassword']) ? undefined : 'Passwords do not match'} component={PasswordBox} />
               </FormItem>
             </FormGroup>
             <ButtonWrapper>
               <Button nature='empty' capitalize onClick={handleCancel}>
-                <FormattedMessage id='scenes.securitysettings.basicsecurity.secondpasswordwallet.settings.cancel2' defaultMessage='Cancel' />
+                <FormattedMessage id='scenes.securitysettings.advanced.secondpasswordwallet.settings.cancel2' defaultMessage='Cancel' />
               </Button>
               <Button nature='primary' capitalize disabled={submitting || invalid} onClick={handleClick}>
-                <FormattedMessage id='scenes.securitysettings.basicsecurity.secondpasswordwallet.settings.save2' defaultMessage='Save' />
+                <FormattedMessage id='scenes.securitysettings.advanced.secondpasswordwallet.settings.save2' defaultMessage='Save' />
               </Button>
             </ButtonWrapper>
           </SettingForm>

diff --git a/...in-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/SecondPasswordWallet/template.js b/...in-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/SecondPasswordWallet/template.js
@@ -9,17 +9,17 @@ const SecondPasswordWallet = (props) => {
     <SettingContainer>
       <SettingSummary>
         <SettingHeader>
-          <FormattedMessage id='scenes.security.secondpassword.title' defaultMessage='Second Password' />
+          <FormattedMessage id='scenes.security.advanced.secondpassword.title' defaultMessage='Second Password' />
           <SettingStatus active={secondPasswordEnabled}>
             {secondPasswordEnabled
-              ? <FormattedMessage id='scenes.security.secondpassword.enabled' defaultMessage='Enabled' />
-              : <FormattedMessage id='scenes.security.secondpassword.disabled' defaultMessage='Disabled' />
+              ? <FormattedMessage id='scenes.security.advanced.secondpassword.enabled' defaultMessage='Enabled' />
+              : <FormattedMessage id='scenes.security.advanced.secondpassword.disabled' defaultMessage='Disabled' />
             }
           </SettingStatus>
         </SettingHeader>
         <SettingDescription>
-          <FormattedMessage id='scenes.security.secondpassword.description' defaultMessage='For additional security, you can choose a second password that is asked whenever you want to spend funds.' />
-          <FormattedMessage id='scenes.security.secondpassword.description2' defaultMessage='As with your main password, if you forget your second password, we cannot reset it for you.' />
+          <FormattedMessage id='scenes.security.advanced.secondpassword.description' defaultMessage='For additional security, you can choose a second password that is asked whenever you want to spend funds.' />
+          <FormattedMessage id='scenes.security.advanced.secondpassword.description2' defaultMessage='As with your main password, if you forget your second password, we cannot reset it for you.' />
         </SettingDescription>
       </SettingSummary>
       <SettingComponent>

diff --git a/...wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/WalletPassword/Settings/template.js b/...wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/WalletPassword/Settings/template.js
@@ -22,37 +22,37 @@ const Settings = (props) => {
     <SettingWrapper>
       { !updateToggled &&
         <Button nature='primary' onClick={handleToggle}>
-          <FormattedMessage id='scenes.securitysettings.basicsecurity.walletpassword.settings.change' defaultMessage='Change'/>
+          <FormattedMessage id='scenes.securitysettings.advanced.walletpassword.settings.change' defaultMessage='Change' />
         </Button>
       }
       { updateToggled &&
         <Form>
           <FormGroup>
             <FormItem>
               <FormLabel for='currentPassword'>
-                <FormattedMessage id='scenes.securitysettings.basicsecurity.walletpassword.settings.current' defaultMessage='Current Password:' />
+                <FormattedMessage id='scenes.securitysettings.advanced.walletpassword.settings.current' defaultMessage='Current Password:' />
               </FormLabel>
               <Field name='currentPassword' component={PasswordBox} validate={(value) => (value === currentWalletPassword ? undefined : 'Incorrect password')} />
             </FormItem>
             <FormItem style={{marginTop: '5px'}}>
               <FormLabel for='newPassword'>
-                <FormattedMessage id='scenes.securitysettings.basicsecurity.walletpassword.settings.new' defaultMessage='New Password:' />
+                <FormattedMessage id='scenes.securitysettings.advanced.walletpassword.settings.new' defaultMessage='New Password:' />
               </FormLabel>
               <Field name='newPassword' component={PasswordBox} validate={[validStrongPassword]} score />
             </FormItem>
             <FormItem style={{marginTop: '5px'}}>
               <FormLabel for='walletPasswordConfirmation'>
-                <FormattedMessage id='scenes.securitysettings.basicsecurity.walletpassword.settings.confirm' defaultMessage='Current Password:' />
+                <FormattedMessage id='scenes.securitysettings.advanced.walletpassword.settings.confirm' defaultMessage='Current Password:' />
               </FormLabel>
               <Field name='walletPasswordConfirmation' validate={(value, allValues) => (value === allValues['newPassword']) ? undefined : 'Passwords do not match'} component={PasswordBox} />
             </FormItem>
           </FormGroup>
           <ButtonWrapper>
             <Button nature='empty' capitalize onClick={handleCancel}>
-              <FormattedMessage id='scenes.securitysettings.basicsecurity.walletpassword.settings.cancel' defaultMessage='Cancel' />
+              <FormattedMessage id='scenes.securitysettings.advanced.walletpassword.settings.cancel' defaultMessage='Cancel' />
             </Button>
             <Button nature='primary' capitalize disabled={submitting || invalid} onClick={handleClick}>
-              <FormattedMessage id='scenes.securitysettings.basicsecurity.walletpassword.settings.save' defaultMessage='Save' />
+              <FormattedMessage id='scenes.securitysettings.advanced.walletpassword.settings.save' defaultMessage='Save' />
             </Button>
           </ButtonWrapper>
         </Form>

diff --git a/...ockchain-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/WalletPassword/template.js b/...ockchain-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/WalletPassword/template.js
@@ -8,11 +8,11 @@ const WalletPassword = (props) => {
     <SettingContainer>
       <SettingSummary>
         <SettingHeader>
-          <FormattedMessage id='scenes.securitysettings.basicsecurity.walletpassword.title' defaultMessage='Password' />
+          <FormattedMessage id='scenes.securitysettings.advanced.walletpassword.title' defaultMessage='Password' />
         </SettingHeader>
         <SettingDescription>
-          <FormattedMessage id='scenes.securitysettings.basicsecurity.walletpassword.description' defaultMessage='Your password is never shared with Blockchain or stored on our servers. We cannot access or reset your password. The only way to restore your wallet is through your backup phrase.' />
-          <FormattedMessage id='scenes.securitysettings.basicsecurity.walletpassword.description2' defaultMessage='Make sure you write down your backup phrase which is the only way to restore access to your wallet in the event of a lost password.' />
+          <FormattedMessage id='scenes.securitysettings.advanced.walletpassword.description' defaultMessage='Your password is never shared with Blockchain or stored on our servers. We cannot access or reset your password. The only way to restore your wallet is through your backup phrase.' />
+          <FormattedMessage id='scenes.securitysettings.advanced.walletpassword.description2' defaultMessage='Make sure you write down your backup phrase which is the only way to restore access to your wallet in the event of a lost password.' />
         </SettingDescription>
       </SettingSummary>
       <SettingComponent>

diff --git a/...ckchain-wallet-v4-frontend/src/scenes/SecurityCenter/Components/ChangeEmailSteps/index.js b/...ckchain-wallet-v4-frontend/src/scenes/SecurityCenter/Components/ChangeEmailSteps/index.js
@@ -50,7 +50,7 @@ function ChangeEmailSteps (props) {
       </ChangeEmailWrapper>
       <CustomBannerWrapper>
         <Banner type='caution' size='20px' weight={200}>
-          <FormattedMessage id='scenes.security.email.changeemail' defaultMessage="This will change your wallet's email address. The email address you use to buy or sell with will remain the same." />
+          <FormattedMessage id='scenes.security.email.changeemail.description' defaultMessage="This will change your wallet's email address. The email address you use to buy or sell with will remain the same." />
         </Banner>
       </CustomBannerWrapper>
     </SecuritySummary>

diff --git a/...es/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/EmailAddress/template.error.js b/...es/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/EmailAddress/template.error.js
@@ -10,13 +10,13 @@ const EmailAddress = (props) => {
     <SecurityContainer>
       <SecuritySummary>
         <SecurityHeader>
-          <FormattedMessage id='scenes.preferences.email.title' defaultMessage='Email address' />
+          <FormattedMessage id='scenes.preferences.email.error.title' defaultMessage='Email address' />
           <Text>{message}</Text>
         </SecurityHeader>
         <SecurityDescription>
-          <FormattedMessage id='scenes.preferences.email.description' defaultMessage='Your verified email address is used to send login codes when suspicious or unusual activity is detected,' />
-          <FormattedMessage id='scenes.preferences.email.description2' defaultMessage='to remind you of your wallet login ID,' />
-          <FormattedMessage id='scenes.preferences.email.description3' defaultMessage='and to send bitcoin payment alerts when you receive funds.' />
+          <FormattedMessage id='scenes.preferences.email.error.description' defaultMessage='Your verified email address is used to send login codes when suspicious or unusual activity is detected,' />
+          <FormattedMessage id='scenes.preferences.email.error.description2' defaultMessage='to remind you of your wallet login ID,' />
+          <FormattedMessage id='scenes.preferences.email.error.description3' defaultMessage='and to send bitcoin payment alerts when you receive funds.' />
         </SecurityDescription>
       </SecuritySummary>
       <SecurityComponent>