update tr language #272

BuildOnViction · Aug 6, 2020 · 98a39cc · 98a39cc
1 parent eb427c0
commit 98a39cc
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 7 deletions.
diff --git a/src/components/OrdersTableMobile/OrdersTableRendererMobile.jsx b/src/components/OrdersTableMobile/OrdersTableRendererMobile.jsx
@@ -33,6 +33,11 @@ const ORDERTYPES = {
   'MO': <FormattedMessage id='exchangePage.market' />,
 }
 
+const ORDERSIDES = {
+  'BUY': <FormattedMessage id='exchangePage.buy' />,
+  'SELL': <FormattedMessage id='exchangePage.sell' />,
+}
+
 const OrdersTableRendererMobile = (props: Props) => {
   const {
     loading,
@@ -166,7 +171,9 @@ const OpenOrderTable = ({orders, cancelOrder, isHideOtherPairs, handleChangeHide
           {orders.map((order, index) => (
             <Row key={index}>
               <CenterCell width={"25%"} muted>  
-                <FieldValue style={{marginBottom: "7px"}} color={order.side === 'BUY' ? TmColors.GREEN : TmColors.RED}>{order.side} {order.type}</FieldValue>
+                <FieldValue style={{marginBottom: "7px"}} color={order.side === 'BUY' ? TmColors.GREEN : TmColors.RED}>
+                  {ORDERSIDES[order.side.toUpperCase()]} {ORDERTYPES[order.type]}
+                </FieldValue>
                 <div style={{width: "40px"}}>
                   <CircularProgressbar 
                     value={calcPercent(order.filled, order.amount, amountPrecision).toFixed(0)}
@@ -498,9 +505,12 @@ const FieldTitle = styled.span`
   color: ${props => props.color || TmColors.LIGHT_GRAY};
 `
 
-const FieldValue = styled.span`
+const FieldValue = styled.div`
   display: inline-block;
-  color: ${props => props.color || TmColors.WHITE};
+  
+  span {
+    color: ${props => props.color || TmColors.WHITE} !important;
+  }
 `
 
 export default OrdersTableRendererMobile
diff --git a/src/components/lending/DappLendingOrdersTable/DappLendingOrdersTableRenderer.jsx b/src/components/lending/DappLendingOrdersTable/DappLendingOrdersTableRenderer.jsx
@@ -30,6 +30,16 @@ type Props = {
   }
 }
 
+const ORDERTYPES = {
+  'LO': <FormattedMessage id='exchangePage.limit' />,
+  'MO': <FormattedMessage id='exchangePage.market' />,
+}
+
+const ORDERSIDES = {
+  'BORROW': <FormattedMessage id='exchangeLendingPage.orderPlace.btnBorrow' />,
+  'LEND': <FormattedMessage id='exchangeLendingPage.orderPlace.btnLend' />,
+}
+
 const DappLendingOrdersTableRenderer = (props: Props ) => {
   const {
     selectedPanel,
@@ -164,7 +174,9 @@ const OpenOrderTable = ({orders, cancelOrder, isHideOtherPairs, handleChangeHide
           {orders.map((order, index) => (
             <Row key={index}>
               <CenterCell width={"25%"} muted>  
-                <FieldValue style={{marginBottom: "7px"}} color={order.side === 'BORROW' ? TmColors.GREEN : TmColors.RED}>{order.side} {order.type}</FieldValue>
+                <FieldValue style={{marginBottom: "7px"}} color={order.side === 'BORROW' ? TmColors.GREEN : TmColors.RED}>
+                  {ORDERSIDES[order.side.toUpperCase()]} {ORDERTYPES[order.type]}
+                </FieldValue>
                 <div style={{width: "40px"}}>
                   <CircularProgressbar 
                     value={calcPercent(order.filled, order.amount, amountPrecision).toFixed(0)}
@@ -597,10 +609,13 @@ const FieldTitle = styled.span`
   color: ${props => props.color || TmColors.LIGHT_GRAY};
 `
 
-const FieldValue = styled.span`
+const FieldValue = styled.div`
   display: inline-block;
   font-size: 10px;
-  color: ${props => props.color || TmColors.WHITE};
+
+  span {
+    color: ${props => props.color || TmColors.WHITE} !important;
+  }
 `
 
 export default DappLendingOrdersTableRenderer
diff --git a/src/components/lending/LendingOrdersTable/OrdersTableRenderer.jsx b/src/components/lending/LendingOrdersTable/OrdersTableRenderer.jsx
@@ -46,6 +46,11 @@ const TOPUPTYPES = {
   '1': <FormattedMessage id='exchangeLendingPage.orders.topUpAuto' />,
 }
 
+const ORDERSIDES = {
+  'BORROW': <FormattedMessage id='exchangeLendingPage.orderPlace.btnBorrow' />,
+  'LEND': <FormattedMessage id='exchangeLendingPage.orderPlace.btnLend' />,
+}
+
 const rowHeight = 45
 const overscanRowCount = 5
 const columnsOpenOrder = {
@@ -235,7 +240,7 @@ const OpenOrderTable = ({
           {ORDERTYPES[order.type]}
         </Cell>
         <Cell width={columnsOpenOrder["side"]} className={`${order.side && order.side.toLowerCase() === "borrow" ? "up" : "down"}`} muted>
-          {order.side && capitalizeFirstLetter(order.side)}
+          {order.side && ORDERSIDES[order.side.toUpperCase()]}
         </Cell>
         <Cell width={columnsOpenOrder["interest"]} muted>
           {BigNumber(order.interest).toFormat(2)}&#37;