commit 936e8d4ec64b6170d19bb86b99ce73043211e1dd
parent 741d7e0be9a03ed277e2bf93242605aeea97c7f3
Author: Marc Stibane <marc@taler.net>
Date: Mon, 24 Jul 2023 16:29:33 +0200
Warnings and hints no longer use "coins"
Diffstat:
6 files changed, 19 insertions(+), 36 deletions(-)
diff --git a/TalerWallet1/Helper/AgePicker.swift b/TalerWallet1/Helper/AgePicker.swift
@@ -30,7 +30,7 @@ struct AgePicker: View {
if ageMenuList.count > 1 {
VStack {
HStack {
- Text("If this wallet belongs to a child or teenager, the generated coins should be age-restricted:")
+ Text("If this wallet belongs to a child or teenager, the generated electronic cash should be age-restricted:")
.multilineTextAlignment(.leading)
.font(.footnote)
Spacer()
diff --git a/TalerWallet1/Views/Balances/BalancesSectionView.swift b/TalerWallet1/Views/Balances/BalancesSectionView.swift
@@ -82,7 +82,7 @@ struct BalancesSectionView: View {
Section {
if "KUDOS" == currency && !balance.available.isZero {
- Text("You can spend these KUDOS in the [Demo Shop](https://shop.demo.taler.net), or send coins to another wallet.")
+ Text("You can spend these KUDOS in the [Demo Shop](https://shop.demo.taler.net), or send them to another wallet.")
.multilineTextAlignment(.leading)
}
HStack(spacing: 0) {
diff --git a/TalerWallet1/Views/Exchange/QuiteSomeCoins.swift b/TalerWallet1/Views/Exchange/QuiteSomeCoins.swift
@@ -54,42 +54,25 @@ struct QuiteSomeCoins: View {
let amountEffective: Amount?
var body: some View {
- if shouldShowFee {
- Text(someCoins.invalid ? "Invalid amount"
- : someCoins.tooMany ? "Too many coins for a single withdrawal"
- : someCoins.hasFee ? "- \(someCoins.fee) withdrawal fee"
- : "No withdrawal fee")
- .foregroundColor((someCoins.invalid || someCoins.tooMany || someCoins.hasFee) ? .red : .primary)
- .padding(4)
- }
if !someCoins.invalid {
- HStack {
- let coins: String = someCoins.unknown ? String(localized: "Some", comment: "unknown number of coins")
- : "\(someCoins.numCoins)"
- Text(coins)
- .foregroundColor(someCoins.quiteSome ? .red : .primary)
- Text(someCoins.tooMany ? "coins" : "coins to obtain:")
- .foregroundColor(someCoins.tooMany ? .red : .primary)
-
- Spacer()
- if !someCoins.tooMany {
- let effective = amountEffective ?? Amount(currency: currency, value: 0)
- Text(effective.readableDescription)
- }
- } // xx coins to obtain: YYY currency
-// .font(.title3)
- .padding(.top)
-
if !someCoins.tooMany {
if someCoins.manyCoins {
- Text(someCoins.quiteSome ? "Warning: It will take quite some time\nto generate this many coins!"
- : "Warning: It will take some time\nto generate this many coins.")
+ Text(someCoins.quiteSome ? "Warning: It will take quite some time to encrypt this amount!"
+ : "Warning: It will take some time to encrypt this amount.")
.multilineTextAlignment(.leading)
- .padding(.top, 6)
+ .padding(.vertical, 6)
.foregroundColor(someCoins.quiteSome ? .red : .primary)
} // warnings
}
}
+ if shouldShowFee {
+ Text(someCoins.invalid ? "Amount too small!"
+ : someCoins.tooMany ? "Amount too big for a single withdrawal!"
+ : someCoins.hasFee ? "- \(someCoins.fee) fee"
+ : "No withdrawal fee")
+ .foregroundColor((someCoins.invalid || someCoins.tooMany || someCoins.hasFee) ? .red : .primary)
+// .padding(4)
+ }
}
}
// MARK: -
diff --git a/TalerWallet1/Views/Main/WalletEmptyView.swift b/TalerWallet1/Views/Main/WalletEmptyView.swift
@@ -24,7 +24,7 @@ struct WalletEmptyView: View {
Link(DEMOBANK, destination: URL(string: DEMOBANK)!)
}
Section {
- Text("Just register a test account, then withdraw some coins.")
+ Text("Just register a test account, then withdraw some electronic cash.")
}
}
.listStyle(myListStyle.style).anyView
diff --git a/TalerWallet1/Views/Settings/SettingsView.swift b/TalerWallet1/Views/Settings/SettingsView.swift
@@ -206,7 +206,7 @@ struct SettingsView: View {
.disabled(true)
}
SettingsItem(name: String(localized: "Reset Wallet"),
- description: String(localized: "Throw away all your coins")) {
+ description: String(localized: "Throw away all your money")) {
Button("Reset") {
showResetAlert = true
}
@@ -249,7 +249,7 @@ struct SettingsView: View {
isPresented: $showResetAlert,
actions: { dismissAlertButton
resetButton },
- message: { Text("Are you sure you want to throw away all your coins?\nThis cannot be reverted, all money will be gone.") })
+ message: { Text("Are you sure you want to reset your wallet?\nThis cannot be reverted, all money will be lost.") })
#if !DEBUG
.onReceive(
diff --git a/TalerWallet1/Views/Transactions/ThreeAmounts.swift b/TalerWallet1/Views/Transactions/ThreeAmounts.swift
@@ -19,9 +19,9 @@ struct ThreeAmountsSheet: View {
let incoming = common.incoming()
let pending = (common.txState.major == TransactionMajorState.pending)
- let defaultBottomTitle = incoming ? (pending ? String(localized: "Pending coins to obtain:")
- : String(localized: "Obtained coins:") )
- : String(localized: "Paid coins:")
+ let defaultBottomTitle = incoming ? (pending ? String(localized: "Pending amount to obtain:")
+ : String(localized: "Obtained amount:") )
+ : String(localized: "Paid amount:")
ThreeAmountsView(topTitle: topTitle, topAmount: raw, fee: fee,
bottomTitle: bottomTitle ?? defaultBottomTitle, bottomAmount: effective,
large: large, pending: pending, incoming: incoming,
