From 2e8760abe538ad67beea4acfc4defa49c43f91bd Mon Sep 17 00:00:00 2001
From: David Kaspar <david.kaspar@gmail.com>
Date: Sun, 30 Jul 2023 17:44:18 +0100
Subject: [PATCH] Replaced hard coded text with resource strings Added new
 translations for cs/de/se Corrected "occurred"

---
 .../amethyst/ui/actions/RelaySelectionDialog.kt            | 2 +-
 .../vitorpamplona/amethyst/ui/components/CashuRedeem.kt    | 4 ++--
 .../amethyst/ui/screen/loggedIn/ProfileScreen.kt           | 4 ++--
 app/src/main/res/values-cs/strings.xml                     | 7 ++++++-
 app/src/main/res/values-de/strings.xml                     | 7 ++++++-
 app/src/main/res/values-sv-rSE/strings.xml                 | 7 ++++++-
 app/src/main/res/values/strings.xml                        | 7 ++++++-
 7 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/RelaySelectionDialog.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/RelaySelectionDialog.kt
index 79f546610..46fe688d0 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/RelaySelectionDialog.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/RelaySelectionDialog.kt
@@ -120,7 +120,7 @@ fun RelaySelectionDialog(
                             val selectedRelays = relays.filter { it.isSelected }
                             if (selectedRelays.isEmpty()) {
                                 scope.launch {
-                                    Toast.makeText(context, "Select a relay to continue", Toast.LENGTH_SHORT).show()
+                                    Toast.makeText(context, context.getString(R.string.select_a_relay_to_continue), Toast.LENGTH_SHORT).show()
                                 }
                                 return@PostButton
                             }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt
index 34661474a..9405b7903 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt
@@ -149,7 +149,7 @@ fun CashuPreview(token: CashuToken, accountViewModel: AccountViewModel) {
                             scope.launch {
                                 Toast.makeText(
                                     context,
-                                    "No Lightning Address set",
+                                    context.getString(R.string.no_lightning_address_set),
                                     Toast.LENGTH_SHORT
                                 ).show()
                             }
@@ -180,7 +180,7 @@ fun CashuPreview(token: CashuToken, accountViewModel: AccountViewModel) {
                             var orignaltoken = token.token
                             clipboardManager.setText(AnnotatedString("$orignaltoken"))
                             scope.launch {
-                                Toast.makeText(context, "Copied token to clipboard", Toast.LENGTH_SHORT).show()
+                                Toast.makeText(context, context.getString(R.string.copied_token_to_clipboard), Toast.LENGTH_SHORT).show()
                             }
                         }
                     },
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt
index aac3c8cb7..bf34dba7f 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt
@@ -1015,7 +1015,7 @@ fun DisplayLNAddress(
                                     scope.launch {
                                         Toast.makeText(
                                             context,
-                                            "Payment Successful", // Turn this into a UI animation
+                                            context.getString(R.string.payment_successful), // Turn this into a UI animation
                                             Toast.LENGTH_LONG
                                         ).show()
                                     }
@@ -1025,7 +1025,7 @@ fun DisplayLNAddress(
                                             context,
                                             response.error?.message
                                                 ?: response.error?.code?.toString()
-                                                ?: "Error parsing error message",
+                                                ?: context.getString(R.string.error_parsing_error_message),
                                             Toast.LENGTH_LONG
                                         ).show()
                                     }
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index f52ee3695..a5aa1b489 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -47,6 +47,8 @@
     <string name="and">" a "</string>
     <string name="in_channel">"v kanálu "</string>
     <string name="profile_banner">Banner profilu</string>
+    <string name="payment_successful">Platba úspěšná</string>
+    <string name="error_parsing_error_message">Chyba při zpracování chybové zprávy</string>
     <string name="following">" Sleduje"</string>
     <string name="followers">" Sledující"</string>
     <string name="profile">Profil</string>
@@ -412,7 +414,7 @@
     <string name="sats_to_complete">Zapraiser na %1$s. Do cíle zbývá %2$s sats</string>
     <string name="read_from_relay">Číst z Relay</string>
     <string name="write_to_relay">Zapisovat do Relay</string>
-    <string name="an_error_ocurred_trying_to_get_relay_information">Při pokusu o získání informací z Relay se vyskytla chyba z %1$s</string>
+    <string name="an_error_occurred_trying_to_get_relay_information">Při pokusu o získání informací z Relay se vyskytla chyba z %1$s</string>
     <string name="owner">Vlastník</string>
     <string name="version">Verze</string>
     <string name="software">Software</string>
@@ -437,6 +439,8 @@
     <string name="payment">Platba</string>
     <string name="cashu">Cashu Token</string>
     <string name="cashu_redeem">Vyměnit</string>
+    <string name="no_lightning_address_set">Není nastavena žádná Lightning adresa</string>
+    <string name="copied_token_to_clipboard">Token zkopírován do schránky</string>
 
     <string name="live_stream_live_tag">ŽIVĚ</string>
     <string name="live_stream_offline_tag">OFFLINE</string>
@@ -487,6 +491,7 @@
     <string name="nip05_checking">Kontrola adresy Nostr</string>
     <string name="select_deselect_all">Vybrat/Zrušit vše</string>
     <string name="default_relays">Výchozí</string>
+    <string name="select_a_relay_to_continue">Vyberte relé pro pokračování</string>
 
     <string name="zap_forward_title">Přeposílat Zapy na:</string>
     <string name="zap_forward_explainer">Podporující klienti budou přeposílat Zapy na níže uvedenou LN adresu nebo uživatelský profil místo vaší</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e93d76a56..e8462631e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -47,6 +47,8 @@
     <string name="and">" und "</string>
     <string name="in_channel">"im Kanal "</string>
     <string name="profile_banner">Profilbanner</string>
+    <string name="payment_successful">Zahlung erfolgreich</string>
+    <string name="error_parsing_error_message">Fehler beim Parsen der Fehlermeldung</string>
     <string name="following">" Folgen"</string>
     <string name="followers">" Anhänger"</string>
     <string name="profile">Profil</string>
@@ -421,7 +423,7 @@ anz der Bedingungen ist erforderlich</string>
     <string name="sats_to_complete">Zapraiser bei %1$s. %2$s Sats bis zum Ziel</string>
     <string name="read_from_relay">Von Relay lesen</string>
     <string name="write_to_relay">In Relay schreiben</string>
-    <string name="an_error_ocurred_trying_to_get_relay_information">Ein Fehler ist beim Abrufen von Relay-Informationen von %1$s aufgetreten</string>
+    <string name="an_error_occurred_trying_to_get_relay_information">Ein Fehler ist beim Abrufen von Relay-Informationen von %1$s aufgetreten</string>
     <string name="owner">Inhaber</string>
     <string name="version">Version</string>
     <string name="software">Software</string>
@@ -446,6 +448,8 @@ anz der Bedingungen ist erforderlich</string>
     <string name="payment">Zahlung</string>
     <string name="cashu">Cashu-Token</string>
     <string name="cashu_redeem">Einlösen</string>
+    <string name="no_lightning_address_set">Keine Lightning-Adresse festgelegt</string>
+    <string name="copied_token_to_clipboard">Token in die Zwischenablage kopiert</string>
 
     <string name="live_stream_live_tag">LIVE</string>
     <string name="live_stream_offline_tag">OFFLINE</string>
@@ -496,6 +500,7 @@ anz der Bedingungen ist erforderlich</string>
     <string name="nip05_checking">Nostr-Adresse wird überprüft</string>
     <string name="select_deselect_all">Alle auswählen/abwählen</string>
     <string name="default_relays">Standard</string>
+    <string name="select_a_relay_to_continue">Wählen Sie ein Relais aus, um fortzufahren</string>
 
     <string name="zap_forward_title">Weiterleiten von Zaps an:</string>
     <string name="zap_forward_explainer">Unterstützende Clients leiten Zaps an die LNAddress oder das Benutzerprofil unten weiter, anstatt an Ihre eigene Adresse</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 5493a183a..16820baec 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -46,6 +46,8 @@
     <string name="and">" och "</string>
     <string name="in_channel">"i kanalen "</string>
     <string name="profile_banner">Profil Banner</string>
+    <string name="payment_successful">Betalning lyckades</string>
+    <string name="error_parsing_error_message">Fel vid tolkning av felmeddelande</string>
     <string name="following">" Följer"</string>
     <string name="followers">" Följare"</string>
     <string name="profile">Profil</string>
@@ -409,7 +411,7 @@
     <string name="sats_to_complete">Zapraiser på %1$s. %2$s sats kvar till målet</string>
     <string name="read_from_relay">Läs från Relay</string>
     <string name="write_to_relay">Skriv till Relay</string>
-    <string name="an_error_ocurred_trying_to_get_relay_information">Ett fel inträffade vid försök att hämta information från Relay %1$s</string>
+    <string name="an_error_occurred_trying_to_get_relay_information">Ett fel inträffade vid försök att hämta information från Relay %1$s</string>
     <string name="owner">Ägare</string>
     <string name="version">Version</string>
     <string name="software">Programvara</string>
@@ -434,6 +436,8 @@
     <string name="payment">Betalning</string>
     <string name="cashu">Cashu Token</string>
     <string name="cashu_redeem">Inlösen</string>
+    <string name="no_lightning_address_set">Ingen Lightning-adress angiven</string>
+    <string name="copied_token_to_clipboard">Kopierade token till urklipp</string>
 
     <string name="live_stream_live_tag">LIVE</string>
     <string name="live_stream_offline_tag">OFFLINE</string>
@@ -484,6 +488,7 @@
     <string name="nip05_checking">Kontrollerar Nostr-adress</string>
     <string name="select_deselect_all">Välj/Avmarkera alla</string>
     <string name="default_relays">Standard</string>
+    <string name="select_a_relay_to_continue">Välj ett relä för att fortsätta</string>
 
     <string name="zap_forward_title">Vidarebefordra Zaps till:</string>
     <string name="zap_forward_explainer">Stödjande klienter kommer att vidarebefordra Zaps till LNAddress eller användarprofilen nedan istället för din egen</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 64d45e820..f5ae18cbe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -48,6 +48,8 @@
     <string name="and">" and "</string>
     <string name="in_channel">"in channel "</string>
     <string name="profile_banner">Profile Banner</string>
+    <string name="payment_successful">Payment Successful</string>
+    <string name="error_parsing_error_message">Error parsing error message</string>
     <string name="following">" Following"</string>
     <string name="followers">" Followers"</string>
     <string name="profile">Profile</string>
@@ -433,7 +435,7 @@
     <string name="sats_to_complete">Zapraiser at %1$s. %2$s sats to goal</string>
     <string name="read_from_relay">Read from Relay</string>
     <string name="write_to_relay">Write to Relay</string>
-    <string name="an_error_ocurred_trying_to_get_relay_information">An error ocurred trying to get relay information from %1$s</string>
+    <string name="an_error_occurred_trying_to_get_relay_information">An error occurred trying to get relay information from %1$s</string>
     <string name="owner">Owner</string>
     <string name="version">Version</string>
     <string name="software">Software</string>
@@ -458,6 +460,8 @@
     <string name="payment">Payment</string>
     <string name="cashu">Cashu Token</string>
     <string name="cashu_redeem">Redeem</string>
+    <string name="no_lightning_address_set">No Lightning Address set</string>
+    <string name="copied_token_to_clipboard">Copied token to clipboard</string>
 
     <string name="live_stream_live_tag">LIVE</string>
     <string name="live_stream_offline_tag">OFFLINE</string>
@@ -508,6 +512,7 @@
     <string name="nip05_checking">Checking Nostr address</string>
     <string name="select_deselect_all">Select/Deselect all</string>
     <string name="default_relays">Default</string>
+    <string name="select_a_relay_to_continue">Select a relay to continue</string>
 
     <string name="zap_forward_title">Forward Zaps to:</string>
     <string name="zap_forward_explainer">Supporting clients will forward zaps to the LNAddress or User Profile below instead of yours</string>