fix(FormattedMessages) id fixes batch 4

blockchain · May 23, 2018 · f4e9ef9 · f4e9ef9
1 parent fafd686
commit f4e9ef9
Show file tree

Hide file tree

Showing 39 changed files with 110 additions and 90 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Alerts/template.js b/packages/blockchain-wallet-v4-frontend/src/components/Alerts/template.js
@@ -18,7 +18,7 @@ const Wrapper = styled.div`
 
   & > * { margin-top: 5px; }
 
-  @media(min-width: 768px) { 
+  @media(min-width: 768px) {
     bottom: 5px;
     left: 5px;
     width: auto;
@@ -36,7 +36,7 @@ const selectHeader = nature => {
 
 const selectMessage = (message, data = undefined) => {
   switch (message) {
-    case C.ADDRESS_ADD_ERROR: return <FormattedMessage id='components.alerts.address_error_add' defaultMessage='Error adding address.' />
+    case C.ADDRESS_ADD_ERROR: return <FormattedMessage id='components.alerts.addresserroradd' defaultMessage='Error adding address.' />
     case C.ADDRESS_DOES_NOT_EXIST_ERROR: return <FormattedMessage id='components.alerts.address_does_not_exist_error' defaultMessage='This address already exists in your wallet.' />
     case C.ADDRESS_FORMAT_NOT_SUPPORTED_ERROR: return <FormattedMessage id='components.alerts.address_format_not_supported_error' defaultMessage='This address format is not supported.' />
     case C.ADDRESS_LABEL_MAXIMUM_ERROR: return <FormattedMessage id='components.alerts.address_label_maximum_error' defaultMessage='You cannot label more than 15 unused addresses in a row; please send some bitcoins to at least one of them.' />

diff --git a/packages/blockchain-wallet-v4-frontend/src/components/BuySell/FundingSource.js b/packages/blockchain-wallet-v4-frontend/src/components/BuySell/FundingSource.js
@@ -13,7 +13,7 @@ const FundingSource = ({ account }) => (
         : <Fragment>
           <Text size='14px' weight={300}>
             {`${capitalize(account.accountType)} `}
-            <FormattedMessage id='buy.account_ending_with' defaultMessage='ending with' />
+            <FormattedMessage id='buy.accountendingwith' defaultMessage='ending with' />
             {' ' + account.accountNumber}
           </Text>
           <Text size='12px' weight={300}>

diff --git a/...blockchain-wallet-v4-frontend/src/components/BuySell/OrderHistoryTable/TradeItem/index.js b/...blockchain-wallet-v4-frontend/src/components/BuySell/OrderHistoryTable/TradeItem/index.js
@@ -26,7 +26,7 @@ const TradeItem = props => {
               <FormattedMessage id='buysell.orderhistory.finishtrade' defaultMessage='Finish Trade' />
             </Link>
             : <Link size='13px' weight={300} capitalize onClick={() => handleClick(trade)}>
-              <FormattedMessage id='scenes.exchangehistory.list.details' defaultMessage='View details' />
+              <FormattedMessage id='buysell.orderhistory.list.details' defaultMessage='View details' />
             </Link>
         }
       </TableCell>

diff --git a/packages/blockchain-wallet-v4-frontend/src/components/BuySell/OrderHistoryTable/index.js b/packages/blockchain-wallet-v4-frontend/src/components/BuySell/OrderHistoryTable/index.js
@@ -23,23 +23,23 @@ class OrderHistoryTable extends React.PureComponent {
         <TableHeader>
           <TableCell width='15%'>
             <Text size='13px' weight={500} capitalize>
-              <FormattedMessage id='scenes.orderhistory.list.status' defaultMessage='Status' />
+              <FormattedMessage id='scenes.buysell.orderhistory.list.status' defaultMessage='Status' />
             </Text>
           </TableCell>
           <TableCell width='15%' />
           <TableCell width='30%'>
             <Text size='13px' weight={500} capitalize>
-              <FormattedMessage id='scenes.orderhistory.list.date' defaultMessage='Date' />
+              <FormattedMessage id='scenes.buysell.orderhistory.list.date' defaultMessage='Date' />
             </Text>
           </TableCell>
           <TableCell width='20%'>
             <Text size='13px' weight={500} capitalize>
-              <FormattedMessage id='scenes.orderhistory.list.exchanged' defaultMessage='Exchanged' />
+              <FormattedMessage id='scenes.buysell.orderhistory.list.exchanged' defaultMessage='Exchanged' />
             </Text>
           </TableCell>
           <TableCell width='20%'>
             <Text size='13px' weight={500} capitalize>
-              <FormattedMessage id='scenes.orderhistory.list.received' defaultMessage='Received' />
+              <FormattedMessage id='scenes.buysell.orderhistory.list.received' defaultMessage='Received' />
             </Text>
           </TableCell>
         </TableHeader>

diff --git a/packages/blockchain-wallet-v4-frontend/src/components/ExchangeTimeline/Step2/index.js b/packages/blockchain-wallet-v4-frontend/src/components/ExchangeTimeline/Step2/index.js
@@ -59,7 +59,7 @@ const Step2 = props => (
       </SmallCircle>
     </Circle>
     <Text size='13px' weight={500} capitalize>
-      <FormattedMessage id='components.exchangetimeline.exchange' defaultMessage='Exchange In Progress' />
+      <FormattedMessage id='components.exchangetimeline.exchange.inprogress' defaultMessage='Exchange In Progress' />
     </Text>
   </Wrapper>
 )

diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Faq/FaqContent/index.js b/packages/blockchain-wallet-v4-frontend/src/components/Faq/FaqContent/index.js
diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Form/CountdownTimer/template.js b/packages/blockchain-wallet-v4-frontend/src/components/Form/CountdownTimer/template.js
@@ -21,8 +21,8 @@ const CountdownTimer = (props) => (
       <FormattedMessage id='scenes.exchange.secondstep.expiry' defaultMessage='Quote expires in: {timeLeft}' values={{ timeLeft: props.timeLeft }} />
     </Text>
     <Tooltip>
-      <FormattedMessage id='scenes.exchange.secondstep.expiry_tooltip1' defaultMessage='This rate will expire after {time}.' values={{time: props.tooltipExpiryTime}} />
-      <FormattedMessage id='scenes.exchange.secondstep.expiry_tooltip2' defaultMessage='If that happens please restart your trade.' />
+      <FormattedMessage id='scenes.exchange.secondstep.expiry.tooltip1' defaultMessage='This rate will expire after {time}.' values={{time: props.tooltipExpiryTime}} />
+      <FormattedMessage id='scenes.exchange.secondstep.expiry.tooltip2' defaultMessage='If that happens please restart your trade.' />
     </Tooltip>
   </Wrapper>
 )

diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Form/TabMenuBuySellStatus/template.js b/packages/blockchain-wallet-v4-frontend/src/components/Form/TabMenuBuySellStatus/template.js
@@ -16,7 +16,7 @@ const TabMenuBuySellStatus = props => {
         <FormattedMessage id='components.form.tabmenubuysell.sell' defaultMessage='Sell' />
       </TabMenuItem>
       <TabMenuItem selected={value === 'order_history'} onClick={() => handleClick('order_history')}>
-        <FormattedMessage id='components.form.tabmenubuysell.order_history' defaultMessage='Order History' />
+        <FormattedMessage id='components.form.tabmenubuysell.orderhistory' defaultMessage='Order History' />
       </TabMenuItem>
     </TabMenu>
   )

diff --git a/...s/blockchain-wallet-v4-frontend/src/components/TransactionListItem/Confirmations/index.js b/...s/blockchain-wallet-v4-frontend/src/components/TransactionListItem/Confirmations/index.js
@@ -50,8 +50,8 @@ const Confirmations = (props) => {
           props.confirmations < props.minConfirmations &&
           <TransactionTooltip>
             <Tooltip colors={'red'}>
-              <FormattedMessage id='scenes.transactions.content.list.listitem.transaction_unconfirmed' defaultMessage='Your transaction will be complete after it has {minConfirmations} confirmations.' values={{minConfirmations: props.minConfirmations}} />
-              <Link href='https://support.blockchain.com/hc/en-us/articles/217116406-Why-hasn-t-my-transaction-confirmed-yet-' target='_blank' size='12px' weight={300} altFont>Learn more.</Link>
+              <FormattedMessage id='scenes.transactions.content.list.listitem.transactionunconfirmed' defaultMessage='Your transaction will be complete after it has {minConfirmations} confirmations.' values={{minConfirmations: props.minConfirmations}} />
+              <Link href='https://support.blockchain.com/hc/en-us/articles/217116406-Why-hasn-t-my-transaction-confirmed-yet-' target='_blank' size='10px' weight={300} altFont>Learn more.</Link>
             </Tooltip>
           </TransactionTooltip>
         }

diff --git a/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/template.js b/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/template.js
@@ -102,7 +102,7 @@ const TransactionListItem = (props) => {
           { (transaction.fromWatchOnly || transaction.toWatchOnly) && (
             <BannerWrapper>
               <Banner type='informational'>
-                <FormattedMessage id='components.txlistitem.watch_only' defaultMessage='Watch Only' />
+                <FormattedMessage id='components.txlistitem.watchonly' defaultMessage='Watch Only' />
               </Banner>
             </BannerWrapper>
           )}

diff --git a/packages/blockchain-wallet-v4-frontend/src/components/WhatsNew/WhatsNewContent/index.js b/packages/blockchain-wallet-v4-frontend/src/components/WhatsNew/WhatsNewContent/index.js
@@ -23,7 +23,7 @@ const Announcements = [
     desc: <FormattedMessage id='layouts.wallet.header.whatsnew.whatsnew.desc10' defaultMessage='If you had bitcoin in your wallet before August 1, 2017, you can now access Bitcoin Cash via Settings > General.' />,
     date: 'October 3, 2017',
     link: <NavLink to='/bch/transactions' style={{color: Color('brand-secondary')}}>
-      <FormattedMessage id='layouts.wallet.header.whatsnew.whatsnew.link.12' defaultMessage='Learn More' />
+      <FormattedMessage id='layouts.wallet.header.whatsnew.whatsnew.link.10' defaultMessage='Learn More' />
     </NavLink>
   }, {
     title: <FormattedMessage id='layouts.wallet.header.whatsnew.whatsnew.title9' defaultMessage='Exchange Assets' />,

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/CoinifyExchangeData/Confirm/template.js b/packages/blockchain-wallet-v4-frontend/src/modals/CoinifyExchangeData/Confirm/template.js
@@ -131,7 +131,7 @@ const Confirm = (props) => {
             !busy && !editing
               ? <FormattedMessage id='coinifyexchangedata.confirm.confirm' defaultMessage='confirm' />
               : editing
-                ? <FormattedMessage id='coinifyexchangedata.confirm.confirm' defaultMessage='update' />
+                ? <FormattedMessage id='coinifyexchangedata.confirm.update' defaultMessage='update' />
                 : <HeartbeatLoader height='20px' width='20px' color='white' />
           }
         </Button>

diff --git a/...ockchain-wallet-v4-frontend/src/modals/CoinifyExchangeData/Create/AcceptTerms/template.js b/...ockchain-wallet-v4-frontend/src/modals/CoinifyExchangeData/Create/AcceptTerms/template.js
@@ -37,7 +37,7 @@ const AcceptTerms = (props) => {
       <ColLeft>
         <InputWrapper>
           <PartnerHeader>
-            <FormattedMessage id='coinifyexchangedata.create.verifyemail.partner.header.create_your_account' defaultMessage='Create Your Account' />
+            <FormattedMessage id='coinifyexchangedata.create.verifyemail.partner.header.createyouraccount' defaultMessage='Create Your Account' />
           </PartnerHeader>
           <PartnerSubHeader>
             <FormattedHTMLMessage id='coinifyexchangedata.create.accept.partner.header.enter_email_code' defaultMessage='We teamed up with Coinify’s exchange platform to offer buy and sell to our customers in Europe. We just sent a verification code to your {email} email address.' values={{ email: email }} />

diff --git a/...ockchain-wallet-v4-frontend/src/modals/CoinifyExchangeData/Create/VerifyEmail/template.js b/...ockchain-wallet-v4-frontend/src/modals/CoinifyExchangeData/Create/VerifyEmail/template.js
@@ -30,10 +30,10 @@ const VerifyEmail = (props) => {
       <ColLeft>
         <InputWrapper>
           <PartnerHeader>
-            <FormattedMessage id='coinifyexchangedata.create.verifyemail.partner.header.change_email' defaultMessage="What's your email?" />
+            <FormattedMessage id='coinifyexchangedata.create.verifyemail.partner.header.whatsyouremail' defaultMessage="What's your email?" />
           </PartnerHeader>
           <PartnerSubHeader>
-            <FormattedMessage id='coinifyexchangedata.create.verifyemail.partner.subheader.change_email' defaultMessage="Enter the email address you would like to use with your Coinify account. We'll send you a verification code to make sure it's yours." />
+            <FormattedMessage id='coinifyexchangedata.create.verifyemail.partner.subheader.enteremail' defaultMessage="Enter the email address you would like to use with your Coinify account. We'll send you a verification code to make sure it's yours." />
           </PartnerSubHeader>
           {
             ui.create === 'enter_email_code'
@@ -48,7 +48,7 @@ const VerifyEmail = (props) => {
               </EmailInput>
               : <EmailInput>
                 <Text size='14px' weight={400} style={{ 'margin-bottom': '5px' }}>
-                  <FormattedMessage id='coinifyexchangedata.create.verifyemail.confirm' defaultMessage="Enter the email address you'd like to verify:" />
+                  <FormattedMessage id='coinifyexchangedata.create.verifyemail.enteremail.youwouldlike' defaultMessage="Enter the email address you'd like to verify:" />
                 </Text>
                 <Field name='emailAddress' component={TextBox} validate={[required]} />
               </EmailInput>

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/CoinifyExchangeData/ISignThis/index.js b/packages/blockchain-wallet-v4-frontend/src/modals/CoinifyExchangeData/ISignThis/index.js
@@ -189,7 +189,7 @@ class ISignThisContainer extends Component {
         <ButtonContainer>
           <Button nature='empty-secondary' onClick={() => coinifyActions.cancelISX()}>
             <Text size='13px' weight={300}>
-              <FormattedMessage id='cancel' defaultMessage='Cancel' />
+              <FormattedMessage id='coinifyexchangedata.ist.cancel' defaultMessage='Cancel' />
             </Text>
           </Button>
         </ButtonContainer>

diff --git a/...ges/blockchain-wallet-v4-frontend/src/modals/CoinifyExchangeData/Payment/mediumHelpers.js b/...ges/blockchain-wallet-v4-frontend/src/modals/CoinifyExchangeData/Payment/mediumHelpers.js
@@ -44,7 +44,7 @@ export const cardOptionHelper = (quote, limits, isChecked, handlePaymentClick) =
       <OptionLabel htmlFor='card'>
         <PaymentIcon name='credit-card-filled' cursor size='50px' isChecked={isChecked} />
         <PaymentText isChecked={isChecked}>
-          <FormattedMessage id='coinifyexchangedata.payment.card' defaultMessage='Credit / Debit' />
+          <FormattedMessage id='coinifyexchangedata.payment.mediumhelpers.card' defaultMessage='Credit / Debit' />
         </PaymentText>
       </OptionLabel>
     </PaymentOption>
@@ -54,9 +54,9 @@ export const cardOptionHelper = (quote, limits, isChecked, handlePaymentClick) =
     <PaymentOptionContainer>
       <Field name='inMedium' value='card' isChecked={isChecked} handlePaymentClick={handlePaymentClick} component={PaymentRadioCard} validate={[required]} />
       <Text size='14px' weight={300} color='gray-2' style={spacing('mt-25')}>
-        <FormattedMessage id='coinifyexchangedata.payment.card.detail1' defaultMessage='Receive bitcoin instantly' /><br />
-        <FormattedMessage id='coinifyexchangedata.payment.card.detail2' defaultMessage='3% convenience fee' /><br />
-        <FormattedMessage id='coinifyexchangedata.payment.card.detail3' defaultMessage='Visa or Mastercard' />
+        <FormattedMessage id='coinifyexchangedata.payment.mediumhelpers.card.detail1' defaultMessage='Receive bitcoin instantly' /><br />
+        <FormattedMessage id='coinifyexchangedata.payment.mediumhelpers.card.detail2' defaultMessage='3% convenience fee' /><br />
+        <FormattedMessage id='coinifyexchangedata.payment.mediumhelpers.card.detail3' defaultMessage='Visa or Mastercard' />
       </Text>
     </PaymentOptionContainer>
   )
@@ -91,7 +91,7 @@ export const bankOptionHelper = (quote, limits, isChecked, handlePaymentClick, b
       <OptionLabel htmlFor='bank'>
         <PaymentIcon name='bank-filled' cursor size='50px' isChecked={isChecked} />
         <PaymentText isChecked={isChecked}>
-          <FormattedMessage id='coinifyexchangedata.payment.bank' defaultMessage='Bank Transfer' />
+          <FormattedMessage id='coinifyexchangedata.payment.mediumhelpers.bank' defaultMessage='Bank Transfer' />
         </PaymentText>
       </OptionLabel>
     </PaymentOption>
@@ -106,9 +106,9 @@ export const bankOptionHelper = (quote, limits, isChecked, handlePaymentClick, b
             <FormattedMessage id='coinifyexchangedata.payment.bank.unavailable' defaultMessage='Bank transfers are unavailable until Identity Verification has finished.' />
           </Text>
           : <Text size='14px' weight={300} color='gray-2' style={spacing('mt-25')}>
-            <FormattedMessage id='coinifyexchangedata.payment.bank.detail1' defaultMessage='One time ID verification' /><br />
-            <FormattedMessage id='coinifyexchangedata.payment.bank.detail2' defaultMessage='Receive bitcoin in 2-3 days' /><br />
-            <FormattedMessage id='coinifyexchangedata.payment.bank.detail3' defaultMessage='No payment fees' />
+            <FormattedMessage id='coinifyexchangedata.payment.mediumhelpers.bank.detail1' defaultMessage='One time ID verification' /><br />
+            <FormattedMessage id='coinifyexchangedata.payment.mediumhelpers.bank.detail2' defaultMessage='Receive bitcoin in 2-3 days' /><br />
+            <FormattedMessage id='coinifyexchangedata.payment.mediumhelpers.bank.detail3' defaultMessage='No payment fees' />
           </Text>
       }
     </PaymentOptionContainer>

diff --git a/.../blockchain-wallet-v4-frontend/src/modals/CoinifyExchangeData/Payment/template.success.js b/.../blockchain-wallet-v4-frontend/src/modals/CoinifyExchangeData/Payment/template.success.js
@@ -83,7 +83,7 @@ const Payment = (props) => {
           }
           <CancelWrapper style={{ ...flex('row justify/center'), ...spacing('mt-15') }}>
             <StepTransition prev Component={Link}>
-              <FormattedMessage id='cancel' defaultMessage='Cancel' />
+              <FormattedMessage id='coinifyexchangedata.payment.cancel' defaultMessage='Cancel' />
             </StepTransition>
           </CancelWrapper>
           { faqHelper() }

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/CoinifyExchangeData/index.js b/packages/blockchain-wallet-v4-frontend/src/modals/CoinifyExchangeData/index.js
@@ -28,7 +28,7 @@ class CoinifyExchangeData extends React.PureComponent {
     this.state = { show: false }
     this.stepMap = {
       account: <FormattedMessage id='modals.coinifyexchangedata.steps.account' defaultMessage='Create Account' />,
-      isx: <FormattedMessage id='modals.coinifyexchangedata.steps.identity_verify' defaultMessage='Identity Verification' />
+      isx: <FormattedMessage id='modals.coinifyexchangedata.steps.identityverify' defaultMessage='Identity Verification' />
     }
   }
 
@@ -62,7 +62,7 @@ class CoinifyExchangeData extends React.PureComponent {
         <ModalHeader tray paddingHorizontal='15%' onClose={this.handleClose.bind(this)}>
           <HeaderWrapper>
             <Text size='20px' weight={300}>
-              <FormattedMessage id='coinify.header.start' defaultMessage='Start buying and selling in two simple steps.' />
+              <FormattedMessage id='coinifyexchangedata.header.start' defaultMessage='Start buying and selling in two simple steps.' />
             </Text>
             <StepIndicator adjuster={0} barFullWidth flexEnd minWidth='135px' maxWidth='135px' step={step} stepMap={this.stepMap} />
           </HeaderWrapper>

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/CoinifyTradeDetails/Kyc.js b/packages/blockchain-wallet-v4-frontend/src/modals/CoinifyTradeDetails/Kyc.js
@@ -20,7 +20,7 @@ const Kyc = ({ close, status }) => {
     <Fragment>
       <ModalHeader onClose={close}>
         <Text>
-          <FormattedMessage id='order_details.identity_verification.header' defaultMessage='Buy & Sell Bitcoin' />
+          <FormattedMessage id='modals.coinifytradedetails.kyc.identityverification.header' defaultMessage='Buy & Sell Bitcoin' />
         </Text>
       </ModalHeader>
       <ModalBody>
@@ -32,7 +32,7 @@ const Kyc = ({ close, status }) => {
         </Text>
         <ButtonRow>
           <Button width='100px' onClick={close} nature='primary'>
-            <FormattedMessage id='close' defaultMessage='Close' />
+            <FormattedMessage id='modals.coinifytradedetails.kyc.close' defaultMessage='Close' />
           </Button>
         </ButtonRow>
       </ModalBody>

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/CoinifyTradeDetails/Trade.js b/packages/blockchain-wallet-v4-frontend/src/modals/CoinifyTradeDetails/Trade.js
@@ -36,7 +36,7 @@ const Trade = ({ trade, close }) => {
           { bodyStatus.text }
         </Text>
         <Text style={spacing('pt-5')} size='13px' weight={300}>
-          <FormattedMessage id='order_details.trade_id' defaultMessage='Your order ID is: CNY-{id}' values={{ id: trade.id }} />
+          <FormattedMessage id='modals.coinifytradedetails.trade.tradeid' defaultMessage='Your order ID is: CNY-{id}' values={{ id: trade.id }} />
         </Text>
         <OrderDetailsTable style={spacing('mt-10')}>
           {renderDetailsRow(
@@ -58,7 +58,7 @@ const Trade = ({ trade, close }) => {
         </OrderDetailsTable>
         <ButtonRow>
           <Button width='100px' onClick={close} nature='primary'>
-            <FormattedMessage id='close' defaultMessage='Close' />
+            <FormattedMessage id='modals.coinifytradedetails.trade.close' defaultMessage='Close' />
           </Button>
         </ButtonRow>
       </ModalBody>

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/ExchangeDetails/template.success.js b/packages/blockchain-wallet-v4-frontend/src/modals/ExchangeDetails/template.success.js
@@ -41,11 +41,11 @@ const TableCell = styled.div`
 const getModalHeader = (status) => {
   switch (status) {
     case 'complete':
-      return <FormattedMessage id='modals.exchangedetails.title_success' defaultMessage='Exchange Completed' />
+      return <FormattedMessage id='modals.exchangedetails.title.success' defaultMessage='Exchange Completed' />
     case 'resolved':
-      return <FormattedMessage id='modals.exchangedetails.title_refunded' defaultMessage='Trade Refunded' />
+      return <FormattedMessage id='modals.exchangedetails.title.refunded' defaultMessage='Trade Refunded' />
     default:
-      return <FormattedMessage id='modals.exchangedetails.title_inprogress' defaultMessage='Exchange in Progress' />
+      return <FormattedMessage id='modals.exchangedetails.title.inprogress' defaultMessage='Exchange in Progress' />
   }
 }