Merge pull request #212 from Uniswap/dev

Dev

public/locales/de.json

@@ -25,6 +25,7 @@
   "noLiquidity": "Keine Liquidität.",
   "unlockTokenCont": "Token freischalten um fortzufahren.",
   "transactionDetails": "Details der Transaktion",
+  "hideDetails": "Details ausblenden",
   "youAreSelling": "Du verkaufst",
   "orTransFail": "oder die Transaktion wird fehlschlagen.",
   "youWillReceive": "Du erhältst mindestens",
@@ -53,6 +54,8 @@
   "youWillMint": "Du prägst",
   "liquidityTokens": "Liquiditätstokens.",
   "totalSupplyIs": "Die gesamte Anzahl Liquiditätstokens ist aktuell",
+  "youAreSettingExRate": "Du setzt den anfänglichen Wechselkurs auf",
+  "totalSupplyIs0": "Die gesamte Anzahl Liquiditätstokens ist aktuell 0.",
   "tokenWorth": "Zum gegenwärtigen Wechselkurs ist jeder Pool Token so viel Wert",
   "firstLiquidity": "Du bist die erste Person die Liquidität bereitstellt!",
   "initialExchangeRate": "The initial exchange rate will be set based on your deposits. Please make sure that your ETH and {{ label }} deposits have the same fiat value.",

public/locales/en.json

@@ -24,6 +24,7 @@
   "noLiquidity": "No liquidity.",
   "unlockTokenCont": "Please unlock token to continue.",
   "transactionDetails": "Transaction Details",
+  "hideDetails": "Hide Details",
   "youAreSelling": "You are selling",
   "orTransFail": "or the transaction will fail.",
   "youWillReceive": "You will receive at least",
@@ -48,10 +49,12 @@
   "youAreAdding": "You are adding between",
   "and": "and",
   "intoPool": "into the liquidity pool.",
-  "outPool": "into the liquidity pool.",
+  "outPool": "from the liquidity pool.",
   "youWillMint": "You will mint",
   "liquidityTokens": "liquidity tokens.",
   "totalSupplyIs": "Current total supply of liquidity tokens is",
+  "youAreSettingExRate": "You are setting the initial exchange rate to",
+  "totalSupplyIs0": "Current total supply of liquidity tokens is 0.",
   "tokenWorth": "At current exchange rate, each pool token is worth",
   "firstLiquidity": "You are the first person to add liquidity!",
   "initialExchangeRate": "The initial exchange rate will be set based on your deposits. Please make sure that your ETH and {{ label }} deposits have the same fiat value.",

public/locales/es-AR.json

@@ -24,6 +24,7 @@
 	"noLiquidity": "Sin liquidez.",
 	"unlockTokenCont": "Por favor desbloqueá un token para continuar.",
 	"transactionDetails": "Detalles de la transacción",
+	"hideDetails": "Ocultar detalles",
 	"youAreSelling": "Estás vendiendo",
 	"orTransFail": "o la transacción fallará.",
 	"youWillReceive": "Vas a recibir al menos",
@@ -52,6 +53,8 @@
 	"youWillMint": "Vas a acuñar",
 	"liquidityTokens": "tokens de liquidez.",
 	"totalSupplyIs": "El actual suministro total de tokens de liquidez es",
+	"youAreSettingExRate": "Está configurando el tipo de cambio inicial a",
+	"totalSupplyIs0": "El actual suministro total de tokens de liquidez es 0.",
 	"tokenWorth": "Al tipo de cambio actual, cada token del pool vale",
 	"firstLiquidity": "Sos la primer persona en agregar liquidez!",
 	"initialExchangeRate": "El tipo de cambio inicial se establecerá en función de tus depósitos. Por favor, asegúrate de que tus depósitos en ETH y {{ label }} tengan el mismo valor fíat.",

public/locales/es-US.json

@@ -24,6 +24,7 @@
 	"noLiquidity": "Sin liquidez.",
 	"unlockTokenCont": "Por favor desbloquea un token para continuar.",
 	"transactionDetails": "Detalles de la transacción",
+	"hideDetails": "Ocultar detalles",
 	"youAreSelling": "Está vendiendo",
 	"orTransFail": "o la transacción fallará.",
 	"youWillReceive": "Va a recibir al menos",
@@ -52,6 +53,8 @@
 	"youWillMint": "Va a acuñar",
 	"liquidityTokens": "tokens de liquidez.",
 	"totalSupplyIs": "El actual suministro total de tokens de liquidez es",
+	"youAreSettingExRate": "Está configurando el tipo de cambio inicial a",
+	"totalSupplyIs0": "El actual suministro total de tokens de liquidez es 0.",
 	"tokenWorth": "Al tipo de cambio actual, cada token del pool vale",
 	"firstLiquidity": "Es la primer persona en agregar liquidez!",
 	"initialExchangeRate": "El tipo de cambio inicial se establecerá en función de sus depósitos. Por favor, asegúrese de que sus depósitos en ETH y {{ label }} tengan el mismo valor fíat.",

public/locales/zh-CN.json

@@ -24,6 +24,7 @@
   "noLiquidity": "没有流动金。",
   "unlockTokenCont": "请解锁代币继续。",
   "transactionDetails": "交易明细",
+  "hideDetails": "隐藏明细",
   "youAreSelling": "你正在出售",
   "orTransFail": "或交易失败。",
   "youWillReceive": "你将收到至少",
@@ -52,6 +53,8 @@
   "youWillMint": "你将铸造",
   "liquidityTokens": "流动代币。",
   "totalSupplyIs": "当前流动代币的总量是",
+  "youAreSettingExRate": "你将初始兑换率设置为",
+  "totalSupplyIs0": "当前流动代币的总量是0。",
   "tokenWorth": "当前兑换率下，每个资金池代币价值",
   "firstLiquidity": "你是第一个添加流动金的人！",
   "initialExchangeRate": "初始兑换率将由你的存入情况决定。请确保你存入的 ETH 和 {{ label }} 具有相同的法币价值。",

src/pages/Pool/AddLiquidity.js

@@ -432,7 +432,8 @@ class AddLiquidity extends Component {
     return (
       <ContextualInfo
         key="context-info"
-        openModalText={t("transactionDetails")}
+        openDetailsText={t("transactionDetails")}
+        closeDetailsText={t("hideDetails")}
         contextualInfo={contextualInfo}
         isError={isError}
         renderTransactionDetails={this.renderTransactionDetails}
@@ -461,10 +462,10 @@ class AddLiquidity extends Component {
     if (this.isNewExchange()) {
       return (
         <div>
-          <div className="pool__summary-item">You are adding {b(`${inputValue} ETH`)} and {b(`${outputValue} ${label}`)} to the liquidity pool.</div>
-          <div className="pool__summary-item">You are setting the initial exchange rate to {b(`1 ETH = ${BN(outputValue).dividedBy(inputValue).toFixed(4)} ${label}`)}.</div>
-          <div className="pool__summary-item">You will mint {b(`${inputValue} liquidity tokens`)}.</div>
-          <div className="pool__summary-item">Current total supply of liquidity tokens is 0.</div>
+          <div className="pool__summary-item">{t("youAreAdding")} {b(`${inputValue} ETH`)} {t("and")} {b(`${outputValue} ${label}`)} {t("intoPool")}</div>
+          <div className="pool__summary-item">{t("youAreSettingExRate")} {b(`1 ETH = ${BN(outputValue).dividedBy(inputValue).toFixed(4)} ${label}`)}.</div>
+          <div className="pool__summary-item">{t("youWillMint")} {b(`${inputValue}`)} {t("liquidityTokens")}</div>
+          <div className="pool__summary-item">{t("totalSupplyIs0")}</div>
         </div>
       );
     }

src/pages/Pool/RemoveLiquidity.js

@@ -184,7 +184,8 @@ class RemoveLiquidity extends Component {
     return (
       <ContextualInfo
         key="context-info"
-        openModalText={t("transactionDetails")}
+        openDetailsText={t("transactionDetails")}
+        closeDetailsText={t("hideDetails")}
         contextualInfo={contextualInfo}
         isError={isError}
         renderTransactionDetails={this.renderTransactionDetails}

src/pages/Send/index.js

@@ -570,7 +570,8 @@ class Send extends Component {
 
     return (
       <ContextualInfo
-        openModalText={t("transactionDetails")}
+        openDetailsText={t("transactionDetails")}
+        closeDetailsText={t("hideDetails")}
         contextualInfo={contextualInfo}
         isError={isError}
         renderTransactionDetails={this.renderTransactionDetails}

src/pages/Swap/index.js

@@ -556,7 +556,8 @@ class Swap extends Component {
 
     return (
       <ContextualInfo
-        openModalText={t("transactionDetails")}
+        openDetailsText={t("transactionDetails")}
+        closeDetailsText={t("hideDetails")}
         contextualInfo={contextualInfo}
         isError={isError}
         renderTransactionDetails={this.renderTransactionDetails}