summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2024-03-05 09:29:43 -0600
committerTorsten Grote <t@grobox.de>2024-03-06 14:18:56 -0300
commiteac4bca09fc8cdba124fa29773ce4387ef99907b (patch)
tree550a913c5674fc8a3a21e80001f472c9a663e317
parentda3d59bcabc0195f09f1259ded4058b6e9b5c385 (diff)
downloadtaler-android-eac4bca09fc8cdba124fa29773ce4387ef99907b.tar.gz
taler-android-eac4bca09fc8cdba124fa29773ce4387ef99907b.tar.bz2
taler-android-eac4bca09fc8cdba124fa29773ce4387ef99907b.zip
[wallet] Generalize some string resources
-rw-r--r--wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt2
-rw-r--r--wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt2
-rw-r--r--wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt4
-rw-r--r--wallet/src/main/res/values/strings.xml4
4 files changed, 6 insertions, 6 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt b/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt
index 026ab05..807d631 100644
--- a/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt
@@ -85,7 +85,7 @@ fun TransactionDepositComposable(
}
TransactionAmountComposable(
- label = stringResource(id = R.string.send_peer_payment_amount_sent),
+ label = stringResource(id = R.string.amount_sent),
amount = t.amountEffective,
amountType = AmountType.Negative,
)
diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt
index 375e6f3..898ff69 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt
@@ -63,7 +63,7 @@ fun ColumnScope.TransactionPeerPullCreditComposable(t: TransactionPeerPullCredit
}
TransactionAmountComposable(
- label = stringResource(id = R.string.send_peer_payment_amount_received),
+ label = stringResource(id = R.string.amount_received),
amount = t.amountEffective,
amountType = AmountType.Positive,
)
diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt
index 2efa8bb..75d299b 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt
@@ -40,7 +40,7 @@ import net.taler.wallet.transactions.TransactionState
@Composable
fun TransactionPeerPushCreditComposable(t: TransactionPeerPushCredit) {
TransactionAmountComposable(
- label = stringResource(id = R.string.send_peer_payment_amount_sent),
+ label = stringResource(id = R.string.amount_sent),
amount = t.amountRaw,
amountType = AmountType.Neutral,
)
@@ -55,7 +55,7 @@ fun TransactionPeerPushCreditComposable(t: TransactionPeerPushCredit) {
}
TransactionAmountComposable(
- label = stringResource(id = R.string.send_peer_payment_amount_received),
+ label = stringResource(id = R.string.amount_received),
amount = t.amountEffective,
amountType = AmountType.Positive,
)
diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml
index bd9514e..829061d 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -76,6 +76,8 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card
<string name="amount_positive">+%s</string>
<string name="amount_negative">-%s</string>
<string name="amount_chosen">Chosen Amount</string>
+ <string name="amount_sent">Amount sent</string>
+ <string name="amount_received">Amount received</string>
<string name="balances_inbound_label">inbound</string>
<string name="balances_empty_state">There is no digital cash in your wallet.\n\nYou can get test money from the demo bank:\n\nhttps://bank.demo.taler.net</string>
<string name="balance_scope_exchange">Exchange: %1$s</string>
@@ -172,8 +174,6 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card
<string name="send_peer_title">Send money to another wallet</string>
<string name="send_peer_create_button">Send funds now</string>
<string name="send_peer_payment_instruction">Let the payee scan this QR code to receive:</string>
- <string name="send_peer_payment_amount_received">Amount received</string>
- <string name="send_peer_payment_amount_sent">Amount sent</string>
<string name="send_peer_expiration_period">Expires in</string>
<string name="send_peer_expiration_1d">1 day</string>
<string name="send_peer_expiration_7d">7 days</string>