remove hardcode language #272

BuildOnViction · Jun 6, 2020 · bff48ff · bff48ff
1 parent 554782e
commit bff48ff
Show file tree

Hide file tree

Showing 14 changed files with 76 additions and 29 deletions.
diff --git a/src/app/CreateWalletPage/CreateWalletPageRenderer.jsx b/src/app/CreateWalletPage/CreateWalletPageRenderer.jsx
@@ -172,7 +172,7 @@ const WalletConfirmMnemonicStep = props => {
               })
             }
           </ConfirmMnemonicWrapper>
-          <ErrorMessage>{mnemonicErrorMessage}</ErrorMessage>
+          <ErrorMessage>{mnemonicErrorMessage && <FormattedMessage id="createWalletPage.mnemonicErrorMessage" />}</ErrorMessage>
         </MarginWrapper>
 
         <Paragraph textAlign="center">

diff --git a/src/app/lending/DappTrade/DappTrade.jsx b/src/app/lending/DappTrade/DappTrade.jsx
@@ -12,6 +12,7 @@ import { Theme } from '../../../components/Common'
 import DappLendingOrderForm from '../../../components/lending/DappLendingOrderForm'
 import LendingTradesTable from '../../../components/lending/LendingTradesTable'
 import DappLendingOrderBook from '../../../components/lending/DappLendingOrderBook'
+import { FormattedMessage } from 'react-intl'
 
 type State = {
   chartTadId: string,
@@ -61,7 +62,7 @@ export default class DappOrderPlace extends React.PureComponent<Props, State> {
               <Cell><DappLendingOrderBook /></Cell>
             </Grid>
           <Cell>
-            <Title>Market Contracts</Title>
+            <Title><FormattedMessage id="dapp.marketContracts" /></Title>
             <LendingTradesTable />
           </Cell>
         </Grid>
@@ -75,7 +76,7 @@ export default class DappOrderPlace extends React.PureComponent<Props, State> {
 
             <OrdersLink to="/dapp/lending/orders">
               <i className="fa fa-file-text-o" aria-hidden="true"></i>
-              <Typo>Orders</Typo>
+              <Typo><FormattedMessage id="dapp.orders" /></Typo>
             </OrdersLink>
           </Header>)}
       </OrderFormCell>

diff --git a/src/app/trading/DappTrade/DappTrade.jsx b/src/app/trading/DappTrade/DappTrade.jsx
@@ -72,7 +72,7 @@ export default class DappOrderPlace extends React.PureComponent<Props, State> {
             </Pair>
             <OrdersLink to="/dapp/spot/orders">
               <i className="fa fa-file-text-o" aria-hidden="true"></i>
-              <Typo><FormattedMessage id="dapp.spot.book" /></Typo>
+              <Typo><FormattedMessage id="dapp.orders" /></Typo>
             </OrdersLink>
           </Header>)}
       </OrderFormCell>

diff --git a/src/components/Notifier/Notifier.jsx b/src/components/Notifier/Notifier.jsx
@@ -79,7 +79,7 @@ const NotificationFactory = (type, intl, options: NotificationOptions) => {
       }
     case 'copied': 
       return {
-        message: 'The data is copied',
+        message: intl.formatMessage({id: "notifications.copyData"}),
         icon: 'tick',
         intent: 'success',
         timeout: 2000,

diff --git a/src/components/OrdersTable/OrdersTableRenderer.jsx b/src/components/OrdersTable/OrdersTableRenderer.jsx
@@ -14,7 +14,7 @@ import { Link as InternalLink } from 'react-router-dom'
 
 import { TOMOSCAN_URL } from '../../config/environment'
 import { Colors, Loading, TmColors, Theme, Link, Centered, Text, UtilityIcon } from '../Common'
-import { formatDate, capitalizeFirstLetter } from '../../utils/helpers'
+import { formatDate } from '../../utils/helpers'
 import type { Order } from '../../types/orders'
 import tickUrl from '../../assets/images/tick.svg'
 import FundsTable from '../FundsTable'
@@ -46,6 +46,11 @@ const ORDERTYPES = {
   'MO': <FormattedMessage id='exchangePage.market' />,
 }
 
+const ORDERSIDES = {
+  'BUY': <FormattedMessage id='exchangePage.buy' />,
+  'SELL': <FormattedMessage id='exchangePage.sell' />,
+}
+
 const rowHeight = 45
 const overscanRowCount = 5
 const widthColumns = ['15%', '15%', '8%', '8%', '13%', '13%', '13%', '10%', '5%']
@@ -244,7 +249,7 @@ const OpenOrderTable = ({orders, cancelOrder, isHideOtherPairs, handleChangeHide
           {ORDERTYPES[order.type]}
         </Cell>
         <Cell width={widthColumns[3]} className={`${order.side && order.side.toLowerCase() === "buy" ? "up" : "down"}`} muted>
-          {order.side && capitalizeFirstLetter(order.side)}
+          {order.side && ORDERSIDES[order.side.toUpperCase()]}
         </Cell>
         <Cell width={widthColumns[4]} title={order.price} muted>
           {order.type === 'LO' ? BigNumber(order.price).toFormat() : 'Market'}
@@ -324,7 +329,7 @@ const OrderHistoryTable = ({orders, cancelOrder, isHideOtherPairs, handleChangeH
           {ORDERTYPES[order.type]}
         </Cell>
         <Cell width={widthColumnsOrderHistory[3]} className={`${order.side && order.side.toLowerCase() === "buy" ? "up" : "down"}`} muted>
-          {order.side && capitalizeFirstLetter(order.side)}
+          {order.side && ORDERSIDES[order.side.toUpperCase()]}
         </Cell>
         <Cell width={widthColumnsOrderHistory[4]} title={order.price} muted>
           {order.type === 'LO' ? BigNumber(order.price).toFormat() : 'Market'}
@@ -408,7 +413,7 @@ const TradeHistoryTable = ({orders, cancelOrder, isHideOtherPairs, handleChangeH
           {ORDERTYPES[order.type]}
         </Cell>
         <Cell width={widthColumnsTradeHistory[6]} className={`${order.side && order.side.toLowerCase() === "buy" ? "up" : "down"}`} muted>
-          {order.side && capitalizeFirstLetter(order.side)}
+          {order.side && ORDERSIDES[order.side.toUpperCase()]}
         </Cell>
         <Cell width={widthColumnsTradeHistory[3]} title={order.price} className={`${order.side && order.side.toLowerCase() === "buy" ? "up" : "down"}`} muted>
           {order.type === 'LO' ? BigNumber(order.price).toFormat() : 'Market'}

diff --git a/src/components/OrdersTableMobile/OrdersTableRendererMobile.jsx b/src/components/OrdersTableMobile/OrdersTableRendererMobile.jsx
@@ -159,7 +159,7 @@ const OpenOrderTable = ({orders, cancelOrder, isHideOtherPairs, handleChangeHide
     <ListContainer>
       <CheckboxHidePairs checked={isHideOtherPairs} onChange={handleChangeHideOtherPairs} label="Hide other pairs" />
 
-      {(orders.length === 0) && (<NoOrders><CenteredMessage message="No orders" /></NoOrders>)}
+      {(orders.length === 0) && (<NoOrders><CenteredMessage message={<FormattedMessage id="app.noOrders" />} /></NoOrders>)}
 
       {(orders.length > 0) &&
         (<ListBodyWrapper>
@@ -216,7 +216,7 @@ const OrderHistoryTable = ({orders, cancelOrder, isHideOtherPairs, handleChangeH
     <ListContainer className="list-container">
       <CheckboxHidePairs checked={isHideOtherPairs} onChange={handleChangeHideOtherPairs} label="Hide other pairs" />
 
-      {(orders.length === 0) && (<NoOrders><CenteredMessage message="No orders" /></NoOrders>)}
+      {(orders.length === 0) && (<NoOrders><CenteredMessage message={<FormattedMessage id="app.noOrders" />} /></NoOrders>)}
 
       {(orders.length > 0) &&
         (<>
@@ -255,7 +255,7 @@ const TradeHistoryTable = ({orders, isHideOtherPairs, handleChangeHideOtherPairs
     <ListContainer className="list-container">
       <CheckboxHidePairs checked={isHideOtherPairs} onChange={handleChangeHideOtherPairs} label="Hide other pairs" />
 
-      {(orders.length === 0) && (<NoOrders><CenteredMessage message="No orders" /></NoOrders>)}
+      {(orders.length === 0) && (<NoOrders><CenteredMessage message={<FormattedMessage id="app.noOrders" />} /></NoOrders>)}
 
       {(orders.length > 0) &&
         (<>

diff --git a/src/components/lending/DappLendingOrderForm/DappLendingOrderFormRenderer.jsx b/src/components/lending/DappLendingOrderForm/DappLendingOrderFormRenderer.jsx
@@ -2,6 +2,7 @@
 import React, { useState } from 'react'
 import styled from 'styled-components'
 import { Tab, Tabs } from "@blueprintjs/core"
+import { FormattedMessage } from 'react-intl'
 
 import {
   SpinnerContainer,
@@ -17,8 +18,8 @@ function OrderFormRenderer(props) {
   return (
     <Container>
       <Tabs id="order-tabs" onChange={handleTabChange} selectedTabId={selectedTabId}>
-        <Tab id="borrow" title="Borrow" panel={<DappBorrowOrderForm {...props} />} />
-        <Tab id="lend" title="Lend" panel={<DappLendOrderForm {...props} />} />
+        <Tab id="borrow" title={<FormattedMessage id="exchangeLendingPage.orderPlace.btnBorrow" />} panel={<DappBorrowOrderForm {...props} />} />
+        <Tab id="lend" title={<FormattedMessage id="exchangeLendingPage.orderPlace.btnLend" />} panel={<DappLendOrderForm {...props} />} />
       </Tabs>
 
       {props.loading && <SpinnerContainer />}

diff --git a/src/components/lending/DappLendingOrdersTable/DappLendingOrdersTableRenderer.jsx b/src/components/lending/DappLendingOrdersTable/DappLendingOrdersTableRenderer.jsx
@@ -39,8 +39,8 @@ const DappLendingOrdersTableRenderer = (props: Props ) => {
 
   return (
     <PanelTabs id="orders-contracts" onChange={handleChangePanel} selectedPanel={selectedPanel}>
-      <Tab id="orders" title="Orders" panel={<OrdersPanel {...rest} />} />
-      <Tab id="contracts" title="Contracts" panel={<TradesPanel {...rest} />} />
+      <Tab id="orders" title={<FormattedMessage id="dapp.orders" />} panel={<OrdersPanel {...rest} />} />
+      <Tab id="contracts" title={<FormattedMessage id="dapp.contracts" />} panel={<TradesPanel {...rest} />} />
     </PanelTabs>
   )
 }
@@ -157,7 +157,7 @@ const OpenOrderTable = ({orders, cancelOrder, isHideOtherPairs, handleChangeHide
     <ListContainer>
       <CheckboxHidePairs checked={isHideOtherPairs} onChange={handleChangeHideOtherPairs} label="Hide other pairs" />
 
-      {(orders.length === 0) && (<NoOrders><CenteredMessage message="No orders" /></NoOrders>)}
+      {(orders.length === 0) && (<NoOrders><CenteredMessage message={<FormattedMessage id="app.noOrders" />} /></NoOrders>)}
 
       {(orders.length > 0) &&
         (<ListBodyWrapper>
@@ -218,7 +218,7 @@ const OrderHistoryTable = ({orders, cancelOrder, isHideOtherPairs, handleChangeH
         <HeaderCell textAlign="right" width={"30%"}><FormattedMessage id="exchangePage.filledAmount" />/<FormattedMessage id="exchangePage.amount" /></HeaderCell>
       </ListHeader>
 
-      {(orders.length === 0) && (<NoOrders><CenteredMessage message="No orders" /></NoOrders>)}
+      {(orders.length === 0) && (<NoOrders><CenteredMessage  message={<FormattedMessage id="app.noOrders" />} /></NoOrders>)}
 
       {(orders.length > 0) && 
         (<ListBodyWrapper className="list">
@@ -272,7 +272,7 @@ const OpenTradesTable = ({
         <HeaderCell textAlign="right" width={"30%"}><FormattedMessage id="exchangePage.amount" /></HeaderCell>
       </ListHeader>
 
-      {(items.length === 0) && (<NoOrders><CenteredMessage message="No orders" /></NoOrders>)}
+      {(items.length === 0) && (<NoOrders><CenteredMessage message={<FormattedMessage id="app.noOrders" />} /></NoOrders>)}
 
       <DetailsDrawer
         actions={true}
@@ -332,7 +332,7 @@ const CloseTradesTable = ({
         <HeaderCell textAlign="right" width={"30%"}><FormattedMessage id="exchangePage.amount" /></HeaderCell>
       </ListHeader>
 
-      {(items.length === 0) && (<NoOrders><CenteredMessage message="No orders" /></NoOrders>)}
+      {(items.length === 0) && (<NoOrders><CenteredMessage message={<FormattedMessage id="app.noOrders" />} /></NoOrders>)}
 
       <DetailsDrawer 
         item={selectedTrade}

diff --git a/src/components/lending/LendingOrdersTable/OrdersTableRenderer.jsx b/src/components/lending/LendingOrdersTable/OrdersTableRenderer.jsx
@@ -609,7 +609,7 @@ const TypeInfoPopover = _ => (
 
 const TypeInfoContent = _ => (
   <Info>
-    <span>Order type-TopUp type</span>
+    <span><FormattedMessage id="exchangeLendingPage.orders.orderType" />-<FormattedMessage id="exchangeLendingPage.orders.topUpType" /></span>
   </Info>
 )
 
@@ -627,8 +627,8 @@ const LiqInfoPopover = _ => (
 
 const LiqInfoContent = _ => (
   <Info>
-    <div>Collateral token / Lending token</div>
-    <div>Hover on liquidating price to see details</div>
+    <div><FormattedMessage id="exchangeLendingPage.orders.liqInfor1" /></div>
+    <div><FormattedMessage id="exchangeLendingPage.orders.liqInfor2" /></div>
   </Info>
 )
 

diff --git a/src/locales/langs/en.json b/src/locales/langs/en.json
@@ -1,10 +1,12 @@
 {
+  "app.noOrders": "No orders",
   "app.wallet": "Wallet",
   "app.closeWallet": "Close Wallet",
   "app.volume": "Volume: {volume}",
   "app.mustLogin1": "You must be",
   "app.mustLogin2": "unlock wallet",
   "app.mustLogin3": "to view this content",
+  "notifications.copyData": "The data is copied",
   "notifications.title": "Notifications",
   "notifications.markAllAsRead": "Mark all as read",
   "notifications.markAsRead": "Mark as read",
@@ -105,6 +107,7 @@
   "createWalletPage.confirmMnemonic.confirm": "Confirm",
   "createWalletPage.privateKeyBackupInstruction": "Back up your private key on paper and keep it somewhere secret and safe.",
   "createWalletPage.modalPrivateKey.title": "Your Private Key",
+  "createWalletPage.mnemonicErrorMessage": "Incorrect Mnemonic Phrase order. Please try again.",
   "marketsPage.favorites": "Favorites",
   "marketsPage.all": "All",
   "marketsPage.search": "Search",
@@ -199,6 +202,10 @@
   "exchangeLendingPage.orders.actions.topUp": "Top up",
   "exchangeLendingPage.orders.actions.repay": "Repay",
   "exchangeLendingPage.orders.actions.details": "Details",
+  "exchangeLendingPage.orders.orderType": "Order type",
+  "exchangeLendingPage.orders.topUpType": "TopUp type",
+  "exchangeLendingPage.orders.liqInfor1": "Collateral token / Lending token",
+  "exchangeLendingPage.orders.liqInfor2": "Hover on liquidating price to see details",
   "portfolioPage.send": "Send",
   "portfolioPage.receive": "Receive",
   "portfolioPage.hideZeroAmounts": "Hide zero amounts",
@@ -241,5 +248,6 @@
   "dapp.menu.account": "Account",
   "dapp.switchToSpot": "Switch to Spot",
   "dapp.switchToLending": "Switch to Lending",
-  "dapp.marketContracts": "Market contracts"
+  "dapp.marketContracts": "Market contracts",
+  "dapp.contracts": "Kontratlar"
 }
diff --git a/src/locales/langs/fr.json b/src/locales/langs/fr.json
@@ -1,10 +1,12 @@
 {
+  "app.noOrders": "No orders",
   "app.wallet": "Wallet",
   "app.closeWallet": "Close Wallet",
   "app.volume": "Volume: {volume}",
   "app.mustLogin1": "Vous devais être",
   "app.mustLogin2": "débloquer le wallet",
   "app.mustLogin3": "pour voir ce contenu",
+  "notifications.copyData": "The data is copied",
   "notifications.title": "Notifications",
   "notifications.markAllAsRead": "Tout marqué comme lu",
   "notifications.markAsRead": "Marqué comme lu",
@@ -105,6 +107,7 @@
   "createWalletPage.confirmMnemonic.confirm": "Confirmer",
   "createWalletPage.privateKeyBackupInstruction": "Sauvegardez votre clé privée sur papier et conservez-la dans un endroit secret et sûr.",
   "createWalletPage.modalPrivateKey.title": "Votre clé privée",
+  "createWalletPage.mnemonicErrorMessage": "Incorrect Mnemonic Phrase order. Please try again.",
   "marketsPage.favorites": "Favoris",
   "marketsPage.all": "Tout",
   "marketsPage.search": "Recherche",
@@ -199,6 +202,10 @@
   "exchangeLendingPage.orders.actions.topUp": "Recharger",
   "exchangeLendingPage.orders.actions.repay": "Rembourser",
   "exchangeLendingPage.orders.actions.details": "Détails",
+  "exchangeLendingPage.orders.orderType": "Order type",
+  "exchangeLendingPage.orders.topUpType": "TopUp type",
+  "exchangeLendingPage.orders.liqInfor1": "Collateral token / Lending token",
+  "exchangeLendingPage.orders.liqInfor2": "Hover on liquidating price to see details",
   "portfolioPage.send": "Envoyer",
   "portfolioPage.receive": "Recevoir",
   "portfolioPage.hideZeroAmounts": "Masquer les montants nuls",
@@ -241,5 +248,6 @@
   "dapp.menu.account": "Account",
   "dapp.switchToSpot": "Switch to Spot",
   "dapp.switchToLending": "Switch to Lending",
-  "dapp.marketContracts": "Market contracts"
+  "dapp.marketContracts": "Market contracts",
+  "dapp.contracts": "Kontratlar"
 }
diff --git a/src/locales/langs/nl.json b/src/locales/langs/nl.json
@@ -1,10 +1,12 @@
 {
+  "app.noOrders": "No orders",
   "app.wallet": "Wallet",
   "app.closeWallet": "Close Wallet",
   "app.volume": "Volume: {volume}",
   "app.mustLogin1": "U moet",
   "app.mustLogin2": "Wallet ontgrendelen",
   "app.mustLogin3": "om de inhoud te kunnen zien",
+  "notifications.copyData": "The data is copied",
   "notifications.title": "Om de inhoud hiervan te zien",
   "notifications.markAllAsRead": "Notificaties",
   "notifications.markAsRead": "Markeer als gelezen",
@@ -105,6 +107,7 @@
   "createWalletPage.confirmMnemonic.confirm": "Bevestigen",
   "createWalletPage.privateKeyBackupInstruction": "Schrijf uw private key op papier en berg het veilig op.",
   "createWalletPage.modalPrivateKey.title": "Geef uw private key",
+  "createWalletPage.mnemonicErrorMessage": "Incorrect Mnemonic Phrase order. Please try again.",
   "marketsPage.favorites": "Favorieten",
   "marketsPage.all": "Alles",
   "marketsPage.search": "Zoeken",
@@ -199,6 +202,10 @@
   "exchangeLendingPage.orders.actions.topUp": "Verhogen",
   "exchangeLendingPage.orders.actions.repay": "Terug betalen",
   "exchangeLendingPage.orders.actions.details": "Details",
+  "exchangeLendingPage.orders.orderType": "Order type",
+  "exchangeLendingPage.orders.topUpType": "TopUp type",
+  "exchangeLendingPage.orders.liqInfor1": "Collateral token / Lending token",
+  "exchangeLendingPage.orders.liqInfor2": "Hover on liquidating price to see details",
   "portfolioPage.send": "Verzenden",
   "portfolioPage.receive": "Ontvangen",
   "portfolioPage.hideZeroAmounts": "Verberg lege rekeningen",
@@ -241,5 +248,6 @@
   "dapp.menu.account": "Account",
   "dapp.switchToSpot": "Switch to Spot",
   "dapp.switchToLending": "Switch to Lending",
-  "dapp.marketContracts": "Market contracts"
+  "dapp.marketContracts": "Market contracts",
+  "dapp.contracts": "Kontratlar"
 }
diff --git a/src/locales/langs/tr.json b/src/locales/langs/tr.json
@@ -1,10 +1,12 @@
 {
+  "app.noOrders": "Emir Yok",
   "app.wallet": "Cüzdan",
   "app.closeWallet": "Cüzdanı Kapat",
   "app.volume": "Hacim: {volume}",
   "app.mustLogin1": "Bu içeriği",
   "app.mustLogin2": "görebilmek için",
   "app.mustLogin3": "cüzdanınızı açmalısınız",
+  "notifications.copyData": "Veri kopyalandı",
   "notifications.title": "Bildirimler",
   "notifications.markAllAsRead": "Tümünü okunmuş say",
   "notifications.markAsRead": "Okunmuş say",
@@ -105,6 +107,7 @@
   "createWalletPage.confirmMnemonic.confirm": "Onayla",
   "createWalletPage.privateKeyBackupInstruction": "Özel anahtarınızı kağıda yazın, gizli ve güvenli bir yerde saklayın.",
   "createWalletPage.modalPrivateKey.title": "Özel Anahtarınız",
+  "createWalletPage.mnemonicErrorMessage": "Yanlış kurtarma ifadesi. Lütfen tekrar deneyin.",
   "marketsPage.favorites": "Favoriler",
   "marketsPage.all": "Hepsi",
   "marketsPage.search": "Arama",
@@ -162,7 +165,7 @@
   "exchangeLendingPage.orderPlace.interest": "Faiz (APR)",
   "exchangeLendingPage.orderPlace.selectCollateral": "Teminat seçin",
   "exchangeLendingPage.orderPlace.estimatedProfit": "Tahmini kâr",
-  "exchangeLendingPage.orderPlace.collateralRequired": "Teminat gerekli",
+  "exchangeLendingPage.orderPlace.collateralRequired": "Gerekli teminat",
   "exchangeLendingPage.orderPlace.onlyForTomoWallet": "Sadece TomoWallet İçin",
   "exchangeLendingPage.orderbook.interest": "Faiz(APR)",
   "exchangeLendingPage.orderbook.amount": "Miktar({symbol})",
@@ -199,6 +202,10 @@
   "exchangeLendingPage.orders.actions.topUp": "Teminatla",
   "exchangeLendingPage.orders.actions.repay": "Geri Öde",
   "exchangeLendingPage.orders.actions.details": "Detaylar",
+  "exchangeLendingPage.orders.orderType": "Emir Türü",
+  "exchangeLendingPage.orders.topUpType": "Teminat Türü",
+  "exchangeLendingPage.orders.liqInfor1": "Teminatlanmış Token / Borç Verilmiş Token",
+  "exchangeLendingPage.orders.liqInfor2": "Ayrıntıları görmek için likitide fiyatının üzerine gelin",
   "portfolioPage.send": "Gönder",
   "portfolioPage.receive": "Al",
   "portfolioPage.hideZeroAmounts": "Sıfır tutarları gizle",
@@ -241,5 +248,6 @@
   "dapp.menu.account": "Hesap",
   "dapp.switchToSpot": "Borsa'ya Geç",
   "dapp.switchToLending": "P2P Kredi'ye Geç",
-  "dapp.marketContracts": "Piyasa Kontratlar"
+  "dapp.marketContracts": "Piyasa Kontratlar",
+  "dapp.contracts": "Kontratlar"
 }