[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] 01/02: [wallet] Change 'Subject' to 'Purpose' for
From: |
gnunet |
Subject: |
[taler-taler-android] 01/02: [wallet] Change 'Subject' to 'Purpose' for pay-push and pay-pull |
Date: |
Tue, 03 Jan 2023 14:01:20 +0100 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
commit 8643037f06c25be1508ef6027ef4d49e03beb620
Author: Torsten Grote <t@grobox.de>
AuthorDate: Tue Jan 3 09:52:43 2023 -0300
[wallet] Change 'Subject' to 'Purpose' for pay-push and pay-pull
#7470
---
.../src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt | 2 +-
.../src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt | 2 +-
wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt | 2 +-
wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt | 2 +-
wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt | 2 +-
wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt | 2 +-
wallet/src/main/res/values/strings.xml | 1 +
7 files changed, 7 insertions(+), 6 deletions(-)
diff --git
a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt
b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt
index d2091ee..5faea07 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt
@@ -76,7 +76,7 @@ fun OutgoingPullIntroComposable(
isError = subject.isBlank(),
label = {
Text(
- stringResource(R.string.withdraw_manual_ready_subject),
+ stringResource(R.string.send_peer_purpose),
color = if (subject.isBlank()) {
colorResource(R.color.red)
} else Color.Unspecified,
diff --git
a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt
b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt
index 1964ebd..915d002 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt
@@ -78,7 +78,7 @@ fun OutgoingPushIntroComposable(
isError = subject.isBlank(),
label = {
Text(
- stringResource(R.string.withdraw_manual_ready_subject),
+ stringResource(R.string.send_peer_purpose),
color = if (subject.isBlank()) {
colorResource(R.color.red)
} else Color.Unspecified,
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 82a16be..02b3774 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt
@@ -58,7 +58,7 @@ fun ColumnScope.TransactionPeerPullCreditComposable(t:
TransactionPeerPullCredit
)
}
TransactionInfoComposable(
- label = stringResource(id = R.string.withdraw_manual_ready_subject),
+ label = stringResource(id = R.string.send_peer_purpose),
info = t.info.summary ?: "",
)
if (t.pending) {
diff --git
a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt
b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt
index fc14ec1..d09a659 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt
@@ -51,7 +51,7 @@ fun TransactionPeerPullDebitComposable(t:
TransactionPeerPullDebit) {
)
}
TransactionInfoComposable(
- label = stringResource(id = R.string.withdraw_manual_ready_subject),
+ label = stringResource(id = R.string.send_peer_purpose),
info = t.info.summary ?: "",
)
}
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 ae8e7ac..e918c42 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt
@@ -51,7 +51,7 @@ fun TransactionPeerPushCreditComposable(t:
TransactionPeerPushCredit) {
)
}
TransactionInfoComposable(
- label = stringResource(id = R.string.withdraw_manual_ready_subject),
+ label = stringResource(id = R.string.send_peer_purpose),
info = t.info.summary ?: "",
)
}
diff --git
a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt
b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt
index 2eb1c86..f068fb8 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt
@@ -58,7 +58,7 @@ fun ColumnScope.TransactionPeerPushDebitComposable(t:
TransactionPeerPushDebit)
)
}
TransactionInfoComposable(
- label = stringResource(id = R.string.withdraw_manual_ready_subject),
+ label = stringResource(id = R.string.send_peer_purpose),
info = t.info.summary ?: "",
)
QrCodeUriComposable(
diff --git a/wallet/src/main/res/values/strings.xml
b/wallet/src/main/res/values/strings.xml
index b34bc24..472959d 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -143,6 +143,7 @@ GNU Taler is immune against many types of fraud, such as
phishing of credit card
<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_purpose">Purpose</string>
<string name="pay_peer_title">Pay invoice</string>
<string name="pay_peer_intro">Do you want to pay this invoice?</string>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.