[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 140/204: wording
From: |
gnunet |
Subject: |
[taler-taler-ios] 140/204: wording |
Date: |
Thu, 05 Dec 2024 23:51:48 +0100 |
This is an automated email from the git hooks/post-receive script.
marc-stibane pushed a commit to branch master
in repository taler-ios.
commit eb07572d543644af5c17d59deefe7658ddbf2adb
Author: Marc Stibane <marc@taler.net>
AuthorDate: Mon Nov 18 16:36:45 2024 +0100
wording
---
TalerWallet1/Model/Transaction.swift | 16 ++++++++--------
TalerWallet1/Views/Actions/Peer2peer/P2PReadyV.swift | 2 +-
TalerWallet1/Views/HelperViews/QRCodeDetailView.swift | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/TalerWallet1/Model/Transaction.swift
b/TalerWallet1/Model/Transaction.swift
index a1e7e38..46518cc 100644
--- a/TalerWallet1/Model/Transaction.swift
+++ b/TalerWallet1/Model/Transaction.swift
@@ -344,9 +344,9 @@ struct TransactionCommon: Decodable, Sendable {
case .scanPushCredit: return String(localized: "Receive Money",
comment: "TransactionType,
scan to receive coins sent from another wallet")
case .peerPullCredit: return String(localized: "Request Money",
// Invoice?
- comment: "TransactionType,
send invoice to another wallet")
+ comment: "TransactionType,
send private 'invoice' to another wallet")
case .scanPullDebit: return String(localized: "Pay Request",
// Pay Invoice is the same as Payment
- comment: "TransactionType,
scan invoice to pay to another wallet")
+ comment: "TransactionType,
scan private 'invoice' to pay to another wallet")
case .recoup: return String(localized: "Recoup",
comment: "TransactionType")
case .denomLoss: return String(localized: "Money lost",
@@ -355,14 +355,14 @@ struct TransactionCommon: Decodable, Sendable {
}
func localizedTypePast(_ type: TransactionType) -> String {
switch type {
- case .peerPushDebit: return String(localized: "Sent Money",
+ case .peerPushDebit: return String(localized: "Money Sent",
comment: "TransactionType,
sent coins to another wallet")
- case .scanPushCredit: return String(localized: "Received Money",
+ case .scanPushCredit: return String(localized: "Money Received",
comment: "TransactionType,
received coins sent from another wallet")
- case .peerPullCredit: return String(localized: "Requested Money",
// Invoice?
- comment: "TransactionType,
sent invoice to another wallet")
- case .scanPullDebit: return String(localized: "Paid Request",
// Pay Invoice is the same as Payment
- comment: "TransactionType,
paid invoice from another wallet")
+ case .peerPullCredit: return String(localized: "Money Requested",
// Invoice?
+ comment: "TransactionType,
sent private 'invoice' to another wallet")
+ case .scanPullDebit: return String(localized: "Request Paid",
// Pay Invoice is the same as Payment
+ comment: "TransactionType,
paid private 'invoice' from another wallet")
default: return localizedType(type)
}
}
diff --git a/TalerWallet1/Views/Actions/Peer2peer/P2PReadyV.swift
b/TalerWallet1/Views/Actions/Peer2peer/P2PReadyV.swift
index a7cce5e..94edf36 100644
--- a/TalerWallet1/Views/Actions/Peer2peer/P2PReadyV.swift
+++ b/TalerWallet1/Views/Actions/Peer2peer/P2PReadyV.swift
@@ -28,7 +28,7 @@ struct P2PReadyV: View {
#endif
@AppStorage("myListStyle") var myListStyle: MyListStyle = .automatic
- let navTitle = String(localized: "P2P Ready")
+ let navTitle = String(localized: "Ready")
@State private var transactionId: String? = nil
@MainActor
diff --git a/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
b/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
index 0135c5b..39dceb5 100644
--- a/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
+++ b/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
@@ -60,13 +60,13 @@ struct QRCodeDetailView: View {
defaultValue:
"Requesting \(amountStr)",
comment:
"e.g. '5,3 €'")
: String(localized:
"(payer) 1",
- defaultValue:
"Let the payer scan this QR code to pay \(amountStr).",
+ defaultValue:
"To receive \(amountStr), have the payer scan this QR code.",
comment:
"e.g. '5,3 €'"))
: (minimalistic ? String(localized:
"(payee) 1 mini",
defaultValue:
"Sending \(amountStr)",
comment:
"e.g. '$ 7.41'")
: String(localized:
"(payee) 1",
- defaultValue:
"Let the payee scan this QR code to receive \(amountStr).",
+ defaultValue:
"Sending \(amountStr) - let the payee scan this QR code to receive the
payment.",
comment:
"e.g. '$ 7.41'"))
Text(scanLong)
.multilineTextAlignment(.leading)
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] 125/204: Button visible, (continued)
- [taler-taler-ios] 125/204: Button visible, gnunet, 2024/12/05
- [taler-taler-ios] 127/204: Remove "Amount too small", gnunet, 2024/12/05
- [taler-taler-ios] 130/204: Sheet logic, gnunet, 2024/12/05
- [taler-taler-ios] 117/204: Transactions, gnunet, 2024/12/05
- [taler-taler-ios] 133/204: addGlobalCurrency, gnunet, 2024/12/05
- [taler-taler-ios] 132/204: don't reload after delete, gnunet, 2024/12/05
- [taler-taler-ios] 134/204: use addGlobalCurrency, gnunet, 2024/12/05
- [taler-taler-ios] 145/204: baseURL, gnunet, 2024/12/05
- [taler-taler-ios] 151/204: cleanup, gnunet, 2024/12/05
- [taler-taler-ios] 158/204: Logging, gnunet, 2024/12/05
- [taler-taler-ios] 140/204: wording,
gnunet <=
- [taler-taler-ios] 154/204: show product images, gnunet, 2024/12/05
- [taler-taler-ios] 160/204: cleanup, gnunet, 2024/12/05
- [taler-taler-ios] 163/204: fix deposit, gnunet, 2024/12/05
- [taler-taler-ios] 165/204: get rid of P2P, gnunet, 2024/12/05
- [taler-taler-ios] 144/204: scope from balance, gnunet, 2024/12/05
- [taler-taler-ios] 135/204: Colors, gnunet, 2024/12/05
- [taler-taler-ios] 137/204: restrictScope, gnunet, 2024/12/05
- [taler-taler-ios] 139/204: cleanup, gnunet, 2024/12/05
- [taler-taler-ios] 143/204: prepare split, gnunet, 2024/12/05
- [taler-taler-ios] 141/204: cleanup, gnunet, 2024/12/05