Use spanish translations & fix token scan (#271)

* fix cashu token scan * use spanish translations
cashubtc · Nov 22, 2023 · 930309a · 930309a
1 parent 2fb0cf8
commit 930309a
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 15 deletions.
diff --git a/assets/translations/de.json b/assets/translations/de.json
@@ -78,6 +78,7 @@
 		"disclaimer": "Haftungsausschluss",
 		"ecashPayment": "Ecash Zahlung",
 		"english": "Englisch",
+		"spanish": "Spanisch",
 		"swahili": "Suaheli",
 		"enutsRandD": "eNuts Telegram",
 		"estimatedFees": "Geschätzte Gebühr",

diff --git a/assets/translations/en.json b/assets/translations/en.json
@@ -79,6 +79,7 @@
 		"ecashPayment": "Ecash payment",
 		"english": "English",
 		"swahili": "Swahili",
+		"spanish": "Spanish",
 		"enutsRandD": "eNuts Telegram",
 		"estimatedFees": "Estimated fees",
 		"estimateFee": "Estimate fee",

diff --git a/assets/translations/es.json b/assets/translations/es.json
@@ -9,7 +9,7 @@
 		"noResults": "Sin resultados"
 	},
 	"auth": {
-		"confirmAction": "Por favor, confirma la acción.",
+		"confirmAction": "Por favor, confirma esta acción.",
 		"createPin": "Crear PIN",
 		"editPin": "Editar PIN",
 		"pinMismatch": "¡PIN incorrecto!",
@@ -78,7 +78,8 @@
 		"disclaimer": "Advertencia",
 		"ecashPayment": "Pagar Ecash",
 		"english": "Inglés",
-		"swahili": "Swahili",
+		"spanish": "Español",
+		"swahili": "Suajili",
 		"enutsRandD": "Telegram eNuts",
 		"estimatedFees": "Comisión estimada",
 		"estimateFee": "Estimar comisión",
@@ -134,9 +135,9 @@
 		"scan": "Escanear",
 		"enutsBeta": "eNuts es un programa en fase beta",
 		"seconds": "segundos",
-		"selectAmount": "Selecciona cantidad",
+		"selectAmount": "Seleccionar cantidad",
 		"selected": "Seleccionado",
-		"selectMint": "Selecciona una ceca desde la que enviar",
+		"selectMint": "Seleccionar una ceca desde la que enviar",
 		"sendEcash": "Enviar Ecash",
 		"share": "Compartir",
 		"smthWrong": "Algo falló",

diff --git a/assets/translations/fr.json b/assets/translations/fr.json
@@ -78,6 +78,7 @@
 		"disclaimer": "Clause de non-responsabilité",
 		"ecashPayment": "Paiement Ecash",
 		"english": "Anglais",
+		"spanish": "Espagnol",
 		"swahili": "Swahili",
 		"enutsRandD": "eNuts Telegram",
 		"estimatedFees": "Frais estimés",

diff --git a/assets/translations/sw.json b/assets/translations/sw.json
@@ -78,6 +78,7 @@
 		"disclaimer": "Taarifa ya kutumia",
 		"ecashPayment": "Malipo ya Ecash",
 		"english": "Kiingereza",
+		"spanish": "Kihispania",
 		"swahili": "Kiswahili",
 		"enutsRandD": "eNuts Telegram",
 		"estimatedFees": "Ada zilizokadiriwa",

diff --git a/src/i18n.ts b/src/i18n.ts
@@ -1,6 +1,7 @@
 
 import de from '@assets/translations/de.json'
 import en from '@assets/translations/en.json'
+import es from '@assets/translations/es.json'
 import fr from '@assets/translations/fr.json'
 import sw from '@assets/translations/sw.json'
 import { l } from '@log'
@@ -27,7 +28,7 @@ export enum NS {
 
 export const defaultNS = NS.common
 export const resources = {
-	en, de, fr, sw
+	en, de, fr, sw, es
 } as const
 
 /**

diff --git a/src/model/i18n.ts b/src/model/i18n.ts
@@ -2,11 +2,12 @@ const _tlLangNames = [
 	'english',
 	'german',
 	'french',
-	'swahili'
+	'swahili',
+	'spanish',
 ] as const
 export type TTlLangNames = typeof _tlLangNames[number]
 
-const _translationLangCodes = ['de', 'en', 'fr', 'sw'] as const
+const _translationLangCodes = ['de', 'en', 'fr', 'sw', 'es'] as const
 export type TranslationLangCodes = typeof _translationLangCodes[number]
 export const translationLangCodes:Readonly<string[]> = [..._translationLangCodes]
 

diff --git a/src/screens/QRScan/index.tsx b/src/screens/QRScan/index.tsx
@@ -87,14 +87,13 @@ export default function QRScanPage({ navigation, route }: TQRScanPageProps) {
 		const bcType = isIOS ? 'org.iso.QRCode' : +QRType
 		// early return if barcode is not a QR
 		if (type !== bcType) {
-			openPromptAutoClose({ msg: t('notQrCode') })
-			return
+			return openPromptAutoClose({ msg: t('notQrCode') })
 		}
 		// handle cashu token claim
-		if (isCashuToken(data)) {
-			setToken(data)
-			void handleCashuToken(data)
-			return
+		const cashuToken = isCashuToken(data)
+		if (cashuToken) {
+			setToken(cashuToken)
+			return handleCashuToken(cashuToken)
 		}
 		// handle nostr
 		if (isNProfile(data)) {
@@ -119,8 +118,7 @@ export default function QRScanPage({ navigation, route }: TQRScanPageProps) {
 			const invoice = extractStrFromURL(data) || data
 			const { amount, timeLeft } = decodeLnInvoice(invoice)
 			if (timeLeft <= 0) {
-				openPromptAutoClose({ msg: t('invoiceExpired') })
-				return
+				return openPromptAutoClose({ msg: t('invoiceExpired') })
 			}
 			navigation.navigate('qr processing', { ln: { invoice, mint, balance, amount } })
 		} catch (e) {

diff --git a/src/screens/Settings/General/Language.tsx b/src/screens/Settings/General/Language.tsx
@@ -17,6 +17,7 @@ const langs: ILangsOpt[] = [
 	{ name: 'german', code: 'de' },
 	{ name: 'french', code: 'fr' },
 	{ name: 'swahili', code: 'sw' },
+	{ name: 'spanish', code: 'es' },
 ]
 
 export default function LanguageSettings({ navigation }: TLanguageSettingsPageProps) {