fix(i18n): extract pay form amount labels into own localizable string

address '"onchain" and "in channels" on the Pay screen' issue in #3045
LN-Zap · Oct 26, 2019 · c74ebef · c74ebef
1 parent e876168
commit c74ebef
Show file tree

Hide file tree

Showing 36 changed files with 84 additions and 76 deletions.
diff --git a/renderer/components/Pay/Pay.js b/renderer/components/Pay/Pay.js
@@ -736,14 +736,22 @@ class Pay extends React.Component {
                             <FormattedMessage {...messages.current_balance} />:
                           </Text>
                           <Text fontSize="xs" textAlign="center">
-                            <CryptoValue value={walletBalanceConfirmed} />
-                            {` `}
-                            {cryptoUnitName} <FormattedMessage {...messages.onchain_label} />
+                            <FormattedMessage
+                              {...messages.onchain_balance}
+                              values={{
+                                amount: <CryptoValue value={walletBalanceConfirmed} />,
+                                cryptoUnitName,
+                              }}
+                            />
                           </Text>
                           <Text fontSize="xs" textAlign="center">
-                            <CryptoValue value={channelBalance} />
-                            {` `}
-                            {cryptoUnitName} <FormattedMessage {...messages.in_channels_label} />
+                            <FormattedMessage
+                              {...messages.lightning_balance}
+                              values={{
+                                amount: <CryptoValue value={channelBalance} />,
+                                cryptoUnitName,
+                              }}
+                            />
                           </Text>
                         </React.Fragment>
                       )}

diff --git a/renderer/components/Pay/messages.js b/renderer/components/Pay/messages.js
@@ -30,6 +30,6 @@ export default defineMessages({
   sweep_funds: 'Send all of your funds',
   description:
     'Paste a Lightning Payment Request or a {chain} address in the field below to send {chain} ({ticker}) through the Lightning Network or make an On-Chain Transaction.',
-  in_channels_label: '(in channels)',
-  onchain_label: '(onchain)',
+  onchain_balance: '{amount} {cryptoUnitName} (onchain)',
+  lightning_balance: '{amount} {cryptoUnitName} (in channels)',
 })
diff --git a/translations/af-ZA.json b/translations/af-ZA.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "",
   "components.Pay.fee_upto": "",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",
   "components.Pay.request_label_onchain": "",

diff --git a/translations/ar-SA.json b/translations/ar-SA.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "",
   "components.Pay.fee_upto": "",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",
   "components.Pay.request_label_onchain": "",

diff --git a/translations/bg-BG.json b/translations/bg-BG.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "",
   "components.Pay.fee_upto": "",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "Бележка",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",
   "components.Pay.request_label_onchain": "",

diff --git a/translations/ca-ES.json b/translations/ca-ES.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "",
   "components.Pay.fee_upto": "",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",
   "components.Pay.request_label_onchain": "",

diff --git a/translations/cs-CZ.json b/translations/cs-CZ.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "Odečteno z celkového počtu",
   "components.Pay.fee_unknown": "neznámý",
   "components.Pay.fee_upto": "až do {maxFee} satoshi",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "Poznámka",
   "components.Pay.next": "Další",
   "components.Pay.next_block_confirmation": "další potvrzení bloku",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "Žádost o platbu nebo adresa",
   "components.Pay.request_label_offchain": "Žádost o platbu",
   "components.Pay.request_label_onchain": "Adresa",

diff --git a/translations/da-DK.json b/translations/da-DK.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "ukendt",
   "components.Pay.fee_upto": "op til {maxFee} satoshi",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "Notat",
   "components.Pay.next": "Næste",
   "components.Pay.next_block_confirmation": "næste blok bekæftelse",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "Betalings Anmodning eller Adresse",
   "components.Pay.request_label_offchain": "Betalings Anmodning",
   "components.Pay.request_label_onchain": "Adresse",

diff --git a/translations/de-DE.json b/translations/de-DE.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "Vom Totalen abgezogen",
   "components.Pay.fee_unknown": "unbekannt",
   "components.Pay.fee_upto": "bis zu {maxFee} satoshi",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "Memo",
   "components.Pay.next": "Weiter",
   "components.Pay.next_block_confirmation": "nächste Blockbestätigung",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "Zahlungsanforderung oder Adresse",
   "components.Pay.request_label_offchain": "Zahlungsanfrage",
   "components.Pay.request_label_onchain": "Adresse",

diff --git a/translations/el-GR.json b/translations/el-GR.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "",
   "components.Pay.fee_upto": "",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "Τιμολόγιο",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",
   "components.Pay.request_label_onchain": "",

diff --git a/translations/en.json b/translations/en.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "Deducted from total",
   "components.Pay.fee_unknown": "unknown",
   "components.Pay.fee_upto": "up to {maxFee} satoshi",
-  "components.Pay.in_channels_label": "(in channels)",
+  "components.Pay.lightning_balance": "{amount} {cryptoUnitName} (in channels)",
   "components.Pay.memo": "Memo",
   "components.Pay.next": "Next",
   "components.Pay.next_block_confirmation": "next block confirmation",
-  "components.Pay.onchain_label": "(onchain)",
+  "components.Pay.onchain_balance": "{amount} {cryptoUnitName} (onchain)",
   "components.Pay.request_label_combined": "Payment Request or Address",
   "components.Pay.request_label_offchain": "Payment Request",
   "components.Pay.request_label_onchain": "Address",

diff --git a/translations/es-ES.json b/translations/es-ES.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "Deducido del total",
   "components.Pay.fee_unknown": "desconocido",
   "components.Pay.fee_upto": "hasta {maxFee} satoshi",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "Memorándum",
   "components.Pay.next": "Proximo",
   "components.Pay.next_block_confirmation": "próxima confirmación de bloque",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "Solicitud de Pago o Dirección",
   "components.Pay.request_label_offchain": "Solicitud de Pago",
   "components.Pay.request_label_onchain": "Dirección",

diff --git a/translations/fi-FI.json b/translations/fi-FI.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "",
   "components.Pay.fee_upto": "",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",
   "components.Pay.request_label_onchain": "",

diff --git a/translations/fr-FR.json b/translations/fr-FR.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "Déduits du total",
   "components.Pay.fee_unknown": "inconnu",
   "components.Pay.fee_upto": "jusqu'à {maxFee} satoshis",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "Note",
   "components.Pay.next": "Continuer",
   "components.Pay.next_block_confirmation": "confirmation au prochain bloc",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "Demande de paiement ou adresse",
   "components.Pay.request_label_offchain": "Demande de paiement",
   "components.Pay.request_label_onchain": "Adresse",

diff --git a/translations/ga-IE.json b/translations/ga-IE.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "Asbhainte ón iomlán",
   "components.Pay.fee_unknown": "",
   "components.Pay.fee_upto": "",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "Meabhrán",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",
   "components.Pay.request_label_onchain": "",

diff --git a/translations/he-IL.json b/translations/he-IL.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "",
   "components.Pay.fee_upto": "",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "תזכיר",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",
   "components.Pay.request_label_onchain": "",

diff --git a/translations/hi-IN.json b/translations/hi-IN.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "",
   "components.Pay.fee_upto": "",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",
   "components.Pay.request_label_onchain": "",

diff --git a/translations/hr-HR.json b/translations/hr-HR.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "nepoznat",
   "components.Pay.fee_upto": "najviše {maxFee} satošija",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "Bilješka",
   "components.Pay.next": "Slijedeće",
   "components.Pay.next_block_confirmation": "potvrda u slijedećem bloku",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "Zahtjev za plaćanjem ili adresa",
   "components.Pay.request_label_offchain": "Zahtjev za plaćanjem",
   "components.Pay.request_label_onchain": "Adresa",

diff --git a/translations/hu-HU.json b/translations/hu-HU.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "",
   "components.Pay.fee_upto": "",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",
   "components.Pay.request_label_onchain": "",

diff --git a/translations/it-IT.json b/translations/it-IT.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "",
   "components.Pay.fee_upto": "",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",
   "components.Pay.request_label_onchain": "",

diff --git a/translations/ja-JP.json b/translations/ja-JP.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "",
   "components.Pay.fee_upto": "",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "メモ",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",
   "components.Pay.request_label_onchain": "",

diff --git a/translations/ko-KR.json b/translations/ko-KR.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "",
   "components.Pay.fee_upto": "",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",
   "components.Pay.request_label_onchain": "",

diff --git a/translations/nl-NL.json b/translations/nl-NL.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "",
   "components.Pay.fee_upto": "",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",
   "components.Pay.request_label_onchain": "",

diff --git a/translations/no-NO.json b/translations/no-NO.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "ukjent",
   "components.Pay.fee_upto": "opp til {maxFee} satoshi",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "Beskjed",
   "components.Pay.next": "Neste",
   "components.Pay.next_block_confirmation": "",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "Betalingsforespørsel",
   "components.Pay.request_label_onchain": "Adresse",

diff --git a/translations/pl-PL.json b/translations/pl-PL.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "",
   "components.Pay.fee_upto": "",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "Notatka",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",
   "components.Pay.request_label_onchain": "",

diff --git a/translations/pt-BR.json b/translations/pt-BR.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "",
   "components.Pay.fee_upto": "",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",
   "components.Pay.request_label_onchain": "",

diff --git a/translations/pt-PT.json b/translations/pt-PT.json
@@ -385,11 +385,11 @@
   "components.Pay.fee_subtraction": "",
   "components.Pay.fee_unknown": "",
   "components.Pay.fee_upto": "",
-  "components.Pay.in_channels_label": "",
+  "components.Pay.lightning_balance": "",
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
-  "components.Pay.onchain_label": "",
+  "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",
   "components.Pay.request_label_onchain": "",