[taler-taler-ios] 49/204: wording

[gnunet]

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 a6c69cd54c5810025884bd7a689ba0bd47d97712
Author: Marc Stibane <marc@taler.net>
AuthorDate: Sat Oct 12 17:08:48 2024 +0200

    wording
---
 TalerWallet1/Views/Actions/ActionsSheet.swift            | 12 ++++++------
 TalerWallet1/Views/Balances/BalancesSectionView.swift    |  2 +-
 TalerWallet1/Views/Banking/ExchangeListView.swift        | 13 +++++++------
 TalerWallet1/Views/Banking/ExchangeSectionView.swift     |  2 +-
 TalerWallet1/Views/Banking/ManualWithdraw.swift          |  2 +-
 TalerWallet1/Views/HelperViews/ToSButtonView.swift       |  6 +++---
 TalerWallet1/Views/Main/WalletEmptyView.swift            |  9 +++++----
 TalerWallet1/Views/Transactions/ManualDetailsV.swift     |  2 +-
 TalerWallet1/Views/Transactions/ManualDetailsWireV.swift |  4 ++--
 9 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/TalerWallet1/Views/Actions/ActionsSheet.swift 
b/TalerWallet1/Views/Actions/ActionsSheet.swift
index a6cf0de..e7c13ab 100644
--- a/TalerWallet1/Views/Actions/ActionsSheet.swift
+++ b/TalerWallet1/Views/Actions/ActionsSheet.swift
@@ -51,12 +51,12 @@ struct ActionsSheet: View {
                 .padding(.bottom, 10)
 
             if hasKudos && !hideSpendingHint {
-                if !minimalistic && showSpendingHint {
-                    Text("You can spend your \(DEMOCURRENCY) in the Demo shop, 
or send them to another wallet.")
-                        .talerFont(.body)
-                        .multilineTextAlignment(.leading)
-                        .fixedSize(horizontal: false, vertical: true)          
 // must set this otherwise fixedInnerHeight doesn't work
-                }
+                Text(minimalistic ? "Spend your \(DEMOCURRENCY) in the Demo 
shop"
+                                  : "You can spend your \(DEMOCURRENCY) in the 
Demo shop, or send them to another wallet.")
+                    .talerFont(.body)
+                    .multilineTextAlignment(.leading)
+                    .fixedSize(horizontal: false, vertical: true)           // 
must set this otherwise fixedInnerHeight won't work
+
                 let title = String(localized: "LinkTitle_DEMOSHOP", 
defaultValue: "Spend demo money")
                 let action = {
                     hideSpendingHint = true
diff --git a/TalerWallet1/Views/Balances/BalancesSectionView.swift 
b/TalerWallet1/Views/Balances/BalancesSectionView.swift
index a8dff02..e43ec4a 100644
--- a/TalerWallet1/Views/Balances/BalancesSectionView.swift
+++ b/TalerWallet1/Views/Balances/BalancesSectionView.swift
@@ -112,7 +112,7 @@ extension BalancesSectionView: View {
 
         Section {
             if scopeInfo.type == .exchange {
-                let baseURL = scopeInfo.url?.trimURL ?? String(localized: 
"Unknown Payment Provider", comment: "exchange url")
+                let baseURL = scopeInfo.url?.trimURL ?? String(localized: 
"Unknown payment provider", comment: "exchange url")
                 Text(baseURL)
                     .talerFont(.subheadline)
                     .foregroundColor(.secondary)
diff --git a/TalerWallet1/Views/Banking/ExchangeListView.swift 
b/TalerWallet1/Views/Banking/ExchangeListView.swift
index e766ecb..90cdd26 100644
--- a/TalerWallet1/Views/Banking/ExchangeListView.swift
+++ b/TalerWallet1/Views/Banking/ExchangeListView.swift
@@ -33,18 +33,18 @@ struct ExchangeListView: View {
     }
 
     var body: some View {
-        let a11yLabelStr = String(localized: "Add Payment Service", comment: 
"VoiceOver for the + button")
+        let a11yLabelStr = String(localized: "Add payment service", comment: 
"VoiceOver for the + button")
         let plusButton = PlusButton(accessibilityLabelStr: a11yLabelStr) {
             showAlert = true
         }
-        let addTitleStr = String(localized: "Add Payment Service", 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("Address of Payment Service", text: $newExchange)
+                    TextField("Address of the 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)
@@ -108,14 +108,15 @@ extension ExchangeListCommonV: View {
 
         let emptyList = List {
             Section {
-                Text("There are no Payment Services yet.")
+                Text("There are no payment services yet.")
                     .talerFont(.title3)
             }
             Section {
-                Text("Use the Add button to add a service.")
+                let plus = Image(systemName: "plus")
+                Text("Use the \(plus) button to add a service.")
                     .talerFont(.body)
                     .listRowSeparator(.hidden)
-                Text("You can also scan a withdrawal QR code from your bank on 
the Balances tab to automatically add a payment service.")
+                Text("You can also scan a withdrawal QR code from your bank in 
the Action menu to automatically add a payment service.")
                     .talerFont(.body)
             }
         }
diff --git a/TalerWallet1/Views/Banking/ExchangeSectionView.swift 
b/TalerWallet1/Views/Banking/ExchangeSectionView.swift
index d05a629..d92febe 100755
--- a/TalerWallet1/Views/Banking/ExchangeSectionView.swift
+++ b/TalerWallet1/Views/Banking/ExchangeSectionView.swift
@@ -108,7 +108,7 @@ struct ExchangeSectionView: View {
                 .listRowSeparator(.hidden)
             }
 
-            let buttonTitle = String(localized: "Exchange.Delete", 
defaultValue: "Delete Payment Provider", comment: "Action button")
+            let buttonTitle = String(localized: "Exchange.Delete", 
defaultValue: "Delete payment provider", comment: "Action button")
             let warningText1 = String(localized: "Are you sure you want to 
delete this payment provider?")
             let warningText2 = String(localized: "This payment provider is in 
use. Delete anyway?")
             WarningButton(warningText: warningText1,
diff --git a/TalerWallet1/Views/Banking/ManualWithdraw.swift 
b/TalerWallet1/Views/Banking/ManualWithdraw.swift
index b7e2599..0d211e9 100644
--- a/TalerWallet1/Views/Banking/ManualWithdraw.swift
+++ b/TalerWallet1/Views/Banking/ManualWithdraw.swift
@@ -41,7 +41,7 @@ struct ManualWithdraw: View {
 #endif
         let baseURL = exchange?.exchangeBaseUrl
                    ?? scopeInfo?.url
-                   ?? String(localized: "Unknown Payment Service")
+                   ?? String(localized: "Unknown payment service")
 
       Group {
         if let exchange {
diff --git a/TalerWallet1/Views/HelperViews/ToSButtonView.swift 
b/TalerWallet1/Views/HelperViews/ToSButtonView.swift
index 015ad20..3d5467c 100644
--- a/TalerWallet1/Views/HelperViews/ToSButtonView.swift
+++ b/TalerWallet1/Views/HelperViews/ToSButtonView.swift
@@ -18,9 +18,9 @@ struct ToSButtonView: View {
     @AppStorage("minimalistic") var minimalistic: Bool = false
 
     var body: some View {
-        let hint = minimalistic ? String(localized: "You must accept the 
Payment Service's Terms of Service first.")
-                          : p2p ? String(localized: "You must accept the 
Payment Service Provider's Terms of Service first before you can receive 
electronic cash in your wallet.", comment: "P2P Receive")
-                                : String(localized: "You must accept the 
Payment Service Provider's Terms of Service first before you can use it to 
withdraw electronic cash to your wallet.")
+        let hint = minimalistic ? String(localized: "You must accept the 
payment provider's terms of service first.")
+                          : p2p ? String(localized: "You must accept the 
payment provider's terms of service first before you can receive electronic 
cash in your wallet.", comment: "P2P Receive")
+                                : String(localized: "You must accept the 
payment provider's terms of service first before you can use it to withdraw 
electronic cash to your wallet.")
         Text(hint)
             .talerFont(.body)
             .multilineTextAlignment(.leading)
diff --git a/TalerWallet1/Views/Main/WalletEmptyView.swift 
b/TalerWallet1/Views/Main/WalletEmptyView.swift
index 6b153b6..9d2710a 100644
--- a/TalerWallet1/Views/Main/WalletEmptyView.swift
+++ b/TalerWallet1/Views/Main/WalletEmptyView.swift
@@ -23,19 +23,20 @@ struct WalletEmptyView: View {
     var body: some View {
         List {
             Section {
-                Text("There is no digital cash in your wallet.")
+                Text("There is no digital cash in your wallet yet.")
                     .talerFont(.title3)
             }
             Section {
-                Text("Use the QR code scan button to start a withdrawal if 
your bank already supports Taler payments.")
+                let qrButton = Image(systemName: "qrcode.viewfinder")
+                let settings = Image(systemName: "gear")
+                Text("Use «\(qrButton) Scan QR codes» in the Actions menu to 
start a withdrawal if your bank already supports Taler payments.", comment: "« 
􀎻 » 'qrcode.viewfinder'")
                     .talerFont(.body)
                     .listRowSeparator(.hidden)
-                Text("You can also add a payment service manually in the 
Settings.")
+                Text("You can also add a payment service manually in the 
\(settings) Settings tab.", comment: "« 􀍟 » 'gear'")
                     .talerFont(.body)
             }
             Section {
                 Text("Demo: get digital cash to experience how to pay with the 
money of the future.")
-//                Text("You can register an account in the demo bank, then 
withdraw some digital cash to experience how to pay with the money of the 
future.")
                     .talerFont(.body)
                     .listRowSeparator(.hidden)
                 let title = String(localized: "LinkTitle_Test_Money", 
defaultValue: "Get demo money")
diff --git a/TalerWallet1/Views/Transactions/ManualDetailsV.swift 
b/TalerWallet1/Views/Transactions/ManualDetailsV.swift
index 660aa86..8e9c3d7 100644
--- a/TalerWallet1/Views/Transactions/ManualDetailsV.swift
+++ b/TalerWallet1/Views/Transactions/ManualDetailsV.swift
@@ -147,7 +147,7 @@ struct ManualDetailsV: View {
                     let obtainStr = common.amountEffective.formatted(specs: 
specs, isNegative: false)
 //            let _ = print(amountStr, " | ", obtainStr)
                     if !minimalistic {
-                        Text("The Payment Service Provider is waiting for your 
wire-transfer.")
+                        Text("The payment service provider is waiting for your 
wire-transfer.")
                             .bold()
                             .multilineTextAlignment(.leading)
                             .listRowSeparator(.hidden)
diff --git a/TalerWallet1/Views/Transactions/ManualDetailsWireV.swift 
b/TalerWallet1/Views/Transactions/ManualDetailsWireV.swift
index 6c36b80..69bacc8 100644
--- a/TalerWallet1/Views/Transactions/ManualDetailsWireV.swift
+++ b/TalerWallet1/Views/Transactions/ManualDetailsWireV.swift
@@ -22,8 +22,8 @@ struct TransferRestrictionsV: View {
         VStack(alignment: .leading) {
             let amountNBS = amountStr.nbs
             let obtainNBS = obtainStr.nbs
-            Text(minimalistic ? "Transfer \(amountNBS) to the Payment Service."
-                 : "You need to transfer \(amountNBS) from your regular bank 
account to the Payment Service Provider to receive \(obtainNBS) as electronic 
cash in this wallet.")
+            Text(minimalistic ? "Transfer \(amountNBS) to the payment service."
+                 : "You need to transfer \(amountNBS) from your regular bank 
account to the payment service provider to receive \(obtainNBS) as electronic 
cash in this wallet.")
                 .talerFont(.body)
                 .multilineTextAlignment(.leading)
             if let restrictions {

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.