From c5a043f55f653271716867ba8561b4daf13c94bc Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 8 Sep 2024 14:36:31 -0500 Subject: [PATCH 1/2] readme: remote bdk-swift 1.0 --- README.md | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 8c4a694e..2f135689 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)](https://github.com/reez/BDKSwiftExampleWallet/blob/main/LICENSE) -An example iOS app using [Bitcoin Dev Kit](https://github.com/bitcoindevkit) 1.0 +An example iOS app using [Bitcoin Dev Kit](https://github.com/bitcoindevkit) via [language bindings](https://github.com/bitcoindevkit/bdk-ffi). Screenshot @@ -10,13 +10,7 @@ An example iOS app using [Bitcoin Dev Kit](https://github.com/bitcoindevkit) 1.0 ### BDK 1.0 -The `main` branch of BDK Swift Example Wallet uses a local package of bdk-swift, built using a [build script in bdk-ffi](https://github.com/bitcoindevkit/bdk-ffi/blob/master/bdk-swift/build-xcframework.sh). - -*This is temporary as we gear up for the 1.0 beta of bdk-swift, which is currently in [alpha](https://github.com/bitcoindevkit/bdk-swift/releases), and allows for those migrating to 1.0 to keep up with the latest and greatest.* - -### BDK Pre 1.0 - -The `pre-v1` branch of BDK Swift Example Wallet uses a remote package of bdk-swift. +The `main` branch of BDK Swift Example Wallet uses [bdk-swift](https://github.com/bitcoindevkit/bdk-swift) 1.0+. ## Functionality From 9dc565e2010e1695537885a46460df5139e038a0 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 8 Sep 2024 14:45:11 -0500 Subject: [PATCH 2/2] localization --- .../Resources/Localizable.xcstrings | 256 ++++++++++-------- 1 file changed, 150 insertions(+), 106 deletions(-) diff --git a/BDKSwiftExampleWallet/Resources/Localizable.xcstrings b/BDKSwiftExampleWallet/Resources/Localizable.xcstrings index 12545d55..dd156e83 100644 --- a/BDKSwiftExampleWallet/Resources/Localizable.xcstrings +++ b/BDKSwiftExampleWallet/Resources/Localizable.xcstrings @@ -52,7 +52,14 @@ } }, "?" : { - + "localizations" : { + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "?" + } + } + } }, "..." : { "localizations" : { @@ -65,7 +72,14 @@ } }, "/" : { - + "localizations" : { + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "/" + } + } + } }, "%@ • %@" : { "localizations" : { @@ -74,6 +88,12 @@ "state" : "new", "value" : "%1$@ • %2$@" } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "%1$@ • %2$@" + } } } }, @@ -88,7 +108,14 @@ } }, "%@ sats fee" : { - + "localizations" : { + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@ frais de sats" + } + } + } }, "%lld Output%@" : { "localizations" : { @@ -97,6 +124,12 @@ "state" : "new", "value" : "%1$lld Output%2$@" } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "%1$lld Sortir %2$@" + } } } }, @@ -107,88 +140,71 @@ "state" : "new", "value" : "%1$lld Transaction%2$@" } - } - } - }, - "%llu" : { - - }, - "%llu sats" : { - - }, - "%llu sats fee" : { - "extractionState" : "stale", - "localizations" : { + }, "fr" : { "stringUnit" : { "state" : "translated", - "value" : "%lluFrais de sat " + "value" : "%1$lld Transaction%2$@" } } } }, - "+ %llu sats" : { + "%llu" : { "localizations" : { "fr" : { "stringUnit" : { "state" : "translated", - "value" : "+ %llu sats" + "value" : "%llu" } } } }, - "12 Word Seed Phrase (Optional)" : { + "%llu sats" : { "localizations" : { "fr" : { "stringUnit" : { "state" : "translated", - "value" : "Phrase de semence de 12 mots (facultatif)" + "value" : "%llu sats" } } } }, - "100% open-source & open-design" : { - "extractionState" : "stale", + "+ %llu sats" : { "localizations" : { "fr" : { "stringUnit" : { "state" : "translated", - "value" : "100% open-source et open-design" + "value" : "+ %llu sats" } } } }, - "A bitcoin wallet powered by Bitcoin Dev Kit" : { - - }, - "A simple bitcoin wallet." : { - "extractionState" : "stale", + "12 Word Seed Phrase (Optional)" : { "localizations" : { "fr" : { "stringUnit" : { "state" : "translated", - "value" : "Un portefeuille bitcoin simple." + "value" : "Phrase de semence de 12 mots (facultatif)" } } } }, - "Activity" : { + "A bitcoin wallet powered by Bitcoin Dev Kit" : { "localizations" : { "fr" : { "stringUnit" : { "state" : "translated", - "value" : "Activité" + "value" : "Un portefeuille Bitcoin alimenté par Bitcoin Dev Kit" } } } }, - "Address" : { - "extractionState" : "stale", + "Activity" : { "localizations" : { "fr" : { "stringUnit" : { "state" : "translated", - "value" : "Adresse" + "value" : "Activité" } } } @@ -224,15 +240,11 @@ } }, "BDK Wallet" : { - - }, - "Bitcoin Wallet" : { - "extractionState" : "stale", "localizations" : { "fr" : { "stringUnit" : { "state" : "translated", - "value" : "Portefeuille de Bitcoins" + "value" : "BDK Wallet" } } } @@ -257,17 +269,6 @@ } } }, - "Choose your Network." : { - "extractionState" : "stale", - "localizations" : { - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Choisissez votre réseau." - } - } - } - }, "confirmed" : { "localizations" : { "fr" : { @@ -278,17 +279,6 @@ } } }, - "Confirmed" : { - "extractionState" : "stale", - "localizations" : { - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Confirmé" - } - } - } - }, "Copy" : { "localizations" : { "fr" : { @@ -330,21 +320,24 @@ } }, "Destructive Zone" : { - - }, - "Enter address to send BTC to" : { - "extractionState" : "stale", "localizations" : { "fr" : { "stringUnit" : { "state" : "translated", - "value" : "Entrez l'adresse à laquelle envoyer le BTC" + "value" : "Zone destructrice" } } } }, "Error" : { - + "localizations" : { + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Erreur" + } + } + } }, "Esplora Server" : { "localizations" : { @@ -387,13 +380,34 @@ } }, "Full Scan" : { - + "localizations" : { + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Analyse complète" + } + } + } }, "HomeView Error" : { - + "localizations" : { + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Erreur de HomeView" + } + } + } }, "Navigation Title" : { - + "localizations" : { + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Titre de navigation" + } + } + } }, "Network" : { "localizations" : { @@ -434,12 +448,16 @@ } } } - }, - "No Outputs" : { - }, "No seed available" : { - + "localizations" : { + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Aucune graine disponible" + } + } + } }, "No Transactions" : { "localizations" : { @@ -451,6 +469,16 @@ } } }, + "No Unspent" : { + "localizations" : { + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Aucun non dépensé" + } + } + } + }, "OK" : { "localizations" : { "fr" : { @@ -470,30 +498,23 @@ } } } - }, - "Outputs" : { - }, "Paste Address" : { - - }, - "Receive" : { "localizations" : { "fr" : { "stringUnit" : { "state" : "translated", - "value" : "Recevoir" + "value" : "Coller l'adresse" } } } }, - "Receive Address" : { - "extractionState" : "stale", + "Receive" : { "localizations" : { "fr" : { "stringUnit" : { "state" : "translated", - "value" : "Adresse de réception" + "value" : "Recevoir" } } } @@ -570,7 +591,14 @@ } }, "Show All" : { - + "localizations" : { + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Tout afficher" + } + } + } }, "Show Seed" : { "localizations" : { @@ -613,17 +641,6 @@ } } }, - "TabView Error" : { - "extractionState" : "stale", - "localizations" : { - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Erreur de TabView" - } - } - } - }, "Testnet" : { "localizations" : { "fr" : { @@ -675,7 +692,14 @@ } }, "Transaction Details Error" : { - + "localizations" : { + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Erreur dans les détails de la transaction" + } + } + } }, "Transactions" : { "extractionState" : "manual", @@ -698,11 +722,35 @@ } } }, + "Unspent" : { + "localizations" : { + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Non dépensé" + } + } + } + }, "Vout: %u" : { - + "localizations" : { + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Vout: %u" + } + } + } }, "Wallet" : { - + "localizations" : { + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Wallet" + } + } + } }, "Wallet Error" : { "localizations" : { @@ -715,25 +763,21 @@ } }, "Wallet Transaction Error" : { - - }, - "Yes" : { "localizations" : { "fr" : { "stringUnit" : { "state" : "translated", - "value" : "Oui" + "value" : "Erreur de transaction du portefeuille" } } } }, - "Your wallet, your coins" : { - "extractionState" : "stale", + "Yes" : { "localizations" : { "fr" : { "stringUnit" : { "state" : "translated", - "value" : "Votre portefeuille, vos pièces" + "value" : "Oui" } } }