(android) Clean up and streamline translations (wip)

ACINQ · Dec 21, 2023 · 51a8e52 · 51a8e52
1 parent 3ba72ca
commit 51a8e52
Show file tree

Hide file tree

Showing 11 changed files with 111 additions and 282 deletions.
diff --git a/.../src/main/kotlin/fr/acinq/phoenix/android/payments/details/PaymentDetailsTechnicalView.kt b/.../src/main/kotlin/fr/acinq/phoenix/android/payments/details/PaymentDetailsTechnicalView.kt
@@ -302,7 +302,7 @@ private fun DetailsForLightningOutgoingPayment(
             InvoiceSection(paymentRequest = details.paymentRequest)
         }
         is LightningOutgoingPayment.Details.SwapOut -> {
-            TechnicalRowSelectable(label = stringResource(id = R.string.paymentdetails_swapout_address_label), value = details.address)
+            TechnicalRowSelectable(label = stringResource(id = R.string.paymentdetails_bitcoin_address_label), value = details.address)
             TechnicalRowSelectable(label = stringResource(id = R.string.paymentdetails_payment_hash_label), value = details.paymentHash.toHex())
         }
         is LightningOutgoingPayment.Details.KeySend -> {
@@ -329,15 +329,15 @@ private fun DetailsForChannelClose(
     payment: ChannelCloseOutgoingPayment
 ) {
     TechnicalRowSelectable(
-        label = stringResource(id = R.string.paymentdetails_closing_channel_label),
+        label = stringResource(id = R.string.paymentdetails_channel_id_label),
         value = payment.channelId.toHex()
     )
     TechnicalRowSelectable(
-        label = stringResource(id = R.string.paymentdetails_closing_address_label),
+        label = stringResource(id = R.string.paymentdetails_bitcoin_address_label),
         value = payment.address
     )
     TechnicalRow(
-        label = stringResource(id = R.string.paymentdetails_closing_tx_label),
+        label = stringResource(id = R.string.paymentdetails_tx_id_label),
         content = { TransactionLinkButton(txId = payment.txId) }
     )
     TechnicalRowSelectable(
@@ -357,7 +357,7 @@ private fun DetailsForCpfp(
     payment: SpliceCpfpOutgoingPayment
 ) {
     TechnicalRow(
-        label = stringResource(id = R.string.paymentdetails_splice_cpfp_transaction_label),
+        label = stringResource(id = R.string.paymentdetails_tx_id_label),
         content = { TransactionLinkButton(txId = payment.txId) }
     )
 }
@@ -385,11 +385,11 @@ private fun DetailsForSpliceOut(
         value = payment.channelId.toHex()
     )
     TechnicalRowSelectable(
-        label = stringResource(id = R.string.paymentdetails_splice_out_address_label),
+        label = stringResource(id = R.string.paymentdetails_bitcoin_address_label),
         value = payment.address
     )
     TechnicalRow(
-        label = stringResource(id = R.string.paymentdetails_splice_out_tx_label),
+        label = stringResource(id = R.string.paymentdetails_tx_id_label),
         content = { TransactionLinkButton(txId = payment.txId) }
     )
 

diff --git a/...droid/src/main/kotlin/fr/acinq/phoenix/android/payments/liquidity/RequestLiquidityView.kt b/...droid/src/main/kotlin/fr/acinq/phoenix/android/payments/liquidity/RequestLiquidityView.kt
@@ -210,7 +210,7 @@ private fun RequestLiquidityBottomSection(
             LeaseEstimationView(amountRequested = amount, leaseFees = state.fees, actualFeerate = state.actualFeerate)
             Spacer(modifier = Modifier.height(24.dp))
             if (state.fees.serviceFee + state.fees.miningFee.toMilliSatoshi() > balance) {
-                ErrorMessage(header = "Total fees exceed your balance")
+                ErrorMessage(header = stringResource(id = R.string.liquidityads_over_balance))
             } else {
                 FilledButton(
                     text = stringResource(id = R.string.liquidityads_request_button),

diff --git a/...-android/src/main/kotlin/fr/acinq/phoenix/android/settings/channels/ImportChannelsData.kt b/...-android/src/main/kotlin/fr/acinq/phoenix/android/settings/channels/ImportChannelsData.kt
@@ -56,7 +56,7 @@ fun ImportChannelsData(
     DefaultScreenLayout {
         DefaultScreenHeader(onBackClick = onBackClick, title = stringResource(id = R.string.channelimport_title))
         Card(internalPadding = PaddingValues(16.dp)) {
-            Text(text = stringResource(id = R.string.legacy_channels_import_instructions))
+            Text(text = stringResource(id = R.string.channelimport_instructions))
             Spacer(modifier = Modifier.height(24.dp))
             TextInput(
                 text = dataInput,
@@ -115,7 +115,7 @@ fun ImportChannelsData(
                             header = stringResource(id = R.string.channelimport_error_title),
                             details = when (result) {
                                 is ChannelsImportResult.Failure.Generic -> result.error.message
-                                is ChannelsImportResult.Failure.MalformedData -> stringResource(id = R.string.channelimport_error_decryption)
+                                is ChannelsImportResult.Failure.MalformedData -> stringResource(id = R.string.channelimport_error_malformed)
                                 is ChannelsImportResult.Failure.DecryptionError -> stringResource(id = R.string.channelimport_error_decryption)
                                 is ChannelsImportResult.Failure.UnknownVersion -> stringResource(id = R.string.channelimport_error_unknown_version, result.version)
                             },