commit 67763273c03434e9dc3ba9228cad2a66a40567d5
parent 6978983d2dba375d4e80ab8cd1cf627ba3251d24
Author: Marc Stibane <marc@taler.net>
Date: Fri, 9 Feb 2024 11:50:49 +0100
Wording
Diffstat:
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/TalerWallet1/Views/Banking/ExchangeListView.swift b/TalerWallet1/Views/Banking/ExchangeListView.swift
@@ -31,25 +31,25 @@ struct ExchangeListView: View {
}
var body: some View {
- let accessibilityLabelStr = String(localized: "Add Exchange", comment: "accessibilityLabel for the + button")
+ let accessibilityLabelStr = String(localized: "Add Payment Service", comment: "accessibilityLabel for the + button")
let plusButton = PlusButton(accessibilityLabelStr: accessibilityLabelStr) {
showAlert = true
}
- let addTitleStr = String(localized: "Add Exchange", comment: "title of the addExchange alert")
+ let addTitleStr = String(localized: "Add Payment Service", comment: "title of the addExchange alert")
let addButtonStr = String(localized: "Add", comment: "button in the addExchange alert")
if #available(iOS 16.0, *) {
ExchangeListCommonV(symLog: symLog, stack: stack.push(), balances: $balances)
.navigationTitle(navTitle)
.navigationBarItems(trailing: plusButton)
.alert(addTitleStr, isPresented: $showAlert) {
- TextField("Exchange address", text: $newExchange)
+ TextField("Address of Payment Service", text: $newExchange)
// .textFieldStyle(.roundedBorder) Yikes: when adding style the alert will stop showing the textfield! Don't do this.
Button(addButtonStr) {
addExchange(newExchange)
}
Button("Cancel", role: .cancel) { }
} message: {
- Text("Please enter the exchange URL")
+ Text("Please enter the URL")
}
} else { // iOS 15 cannot have a textfield in an alert, so we must
ExchangeListCommonV(symLog: symLog, stack: stack.push(), balances: $balances)
@@ -109,7 +109,7 @@ extension ExchangeListCommonV: View {
}
.overlay {
if exchanges.isEmpty {
- Text("No Exchanges yet...")
+ Text("No Payment Services yet...")
.accessibilityFont(.body)
}
}
diff --git a/TalerWallet1/Views/Banking/ManualWithdraw.swift b/TalerWallet1/Views/Banking/ManualWithdraw.swift
@@ -57,7 +57,7 @@ struct ManualWithdraw: View {
CurrencyInputView(amount: $amountToTransfer,
available: nil,
title: minimalistic ? String(localized: "Amount:")
- : String(localized: "Amount to withdraw:"),
+ : String(localized: "Amount to withdraw:"),
shortcutAction: nil)
.padding(.top)
QuiteSomeCoins(someCoins: someCoins,
@@ -100,7 +100,7 @@ struct ManualWithdraw: View {
if let exc = await model.getExchangeByUrl(url: exchangeBaseUrl) {
exchange = exc
} else {
- // TODO: Error "Can't get Exchange Info"
+ // TODO: Error "Can't get Exchange / Payment Service Provider Info"
}
}
if !amountToTransfer.isZero {
diff --git a/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift b/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
@@ -24,7 +24,11 @@ struct QRCodeDetailView: View {
var body: some View {
if talerURI.count > 10 {
Section {
- Text("Either", comment: "Either (copy/share the payment link to the ...)")
+ let either = incoming ? String(localized: "Either (payer)", defaultValue: "Either",
+ comment: "Either (copy/share the payment link to the payer)")
+ : String(localized: "Either (payee)", defaultValue: "Either",
+ comment: "Either (copy/share the payment link to the payee)")
+ Text(either)
.multilineTextAlignment(.leading)
.accessibilityFont(.title3)
// .padding(.vertical)
@@ -35,10 +39,9 @@ struct QRCodeDetailView: View {
// .padding(.bottom)
.listRowSeparator(.hidden)
- let otherParty = incoming ? String(localized: "payer", comment: "the payment link to the (otherParty), or")
- : String(localized: "payee", comment: "the payment link to the (otherParty), or")
- Text("the payment link to the \(otherParty), or",
- comment: "(Either copy/share the payment link) to the (payer/payee), or")
+ let otherParty = incoming ? String(localized: "the payment link to the payer, or")
+ : String(localized: "the payment link to the payee, or")
+ Text(otherParty)
.multilineTextAlignment(.leading)
.accessibilityFont(.title3)
.listRowSeparator(.hidden)
