From a3d9ebf84af5bed206aeca4402326f175b113643 Mon Sep 17 00:00:00 2001 From: Vitalii Vanziak <114916876+vitalii-vanziak-cko@users.noreply.github.com> Date: Mon, 9 Dec 2024 19:19:28 +0200 Subject: [PATCH] feat(ad-hoc): Barcode localizations (#247) --- sdk/src/main/res/values-ar/strings.xml | 4 ++++ sdk/src/main/res/values-fr/strings.xml | 4 ++++ sdk/src/main/res/values-pl/strings.xml | 4 ++++ sdk/src/main/res/values-pt/strings.xml | 4 ++++ sdk/src/main/res/values/strings.xml | 8 ++++---- .../sdk/ui/napm/NativeAlternativePaymentViewModel.kt | 11 +++++++---- .../napm/PONativeAlternativePaymentConfiguration.kt | 3 +-- .../ui/shared/configuration/POBarcodeConfiguration.kt | 2 -- 8 files changed, 28 insertions(+), 12 deletions(-) diff --git a/sdk/src/main/res/values-ar/strings.xml b/sdk/src/main/res/values-ar/strings.xml index 69465d09..832a99ca 100644 --- a/sdk/src/main/res/values-ar/strings.xml +++ b/sdk/src/main/res/values-ar/strings.xml @@ -18,6 +18,10 @@ الدفع إلغاء لقد دفعت + احفظ رمز %s + فشل حفظ الصورة + لم نتمكن من حفظ الصورة. يرجى التحقق من أذوناتك أو محاولة التقاط لقطة شاشة كبديل. + فهمت name@example.com أدخل رقم الهاتف نجاح! تمت الموافقة على الدفع diff --git a/sdk/src/main/res/values-fr/strings.xml b/sdk/src/main/res/values-fr/strings.xml index a72e2268..ce36959b 100644 --- a/sdk/src/main/res/values-fr/strings.xml +++ b/sdk/src/main/res/values-fr/strings.xml @@ -18,6 +18,10 @@ Payer Annuler J\'ai payé + Enregistrer le code %s + Échec de l\'enregistrement de l\'image + Nous n\'avons pas pu enregistrer l\'image. Veuillez vérifier vos permissions ou alternativement prendre une capture d\'écran. + Compris nom@exemple.fr Entrez votre numéro de téléphone Succès !\nPaiement confirmé. diff --git a/sdk/src/main/res/values-pl/strings.xml b/sdk/src/main/res/values-pl/strings.xml index 09e3d222..42c08035 100644 --- a/sdk/src/main/res/values-pl/strings.xml +++ b/sdk/src/main/res/values-pl/strings.xml @@ -18,6 +18,10 @@ Zapłać Anuluj Płatność wykonana + Zapisz kod %s + Nie udało się zapisać obrazu + Sprawdź uprawnienia systemu lub zrób zrzut ekranu. + Rozumiem imię@przykład.pl Twój numer telefonu Sukces!\nPłatność przyjęta. diff --git a/sdk/src/main/res/values-pt/strings.xml b/sdk/src/main/res/values-pt/strings.xml index 0de51394..2adabbfd 100644 --- a/sdk/src/main/res/values-pt/strings.xml +++ b/sdk/src/main/res/values-pt/strings.xml @@ -18,6 +18,10 @@ Pagar Cancelar Já paguei + Guardar código %s + Falha na gravação da imagem + Não conseguimos gravar a imagem. Por favor, verifique as suas permissões ou tire uma captura do ecrā como alternativa. + Compreendi nome@exemplo.pt Insira o seu número de telemóvel Successo!\nPagamento aprovado. diff --git a/sdk/src/main/res/values/strings.xml b/sdk/src/main/res/values/strings.xml index 3936ed3d..0656094f 100644 --- a/sdk/src/main/res/values/strings.xml +++ b/sdk/src/main/res/values/strings.xml @@ -18,10 +18,10 @@ Pay Cancel I\'ve paid - Save QR Code to Photos - Image Save Failed - We couldn\'t save the image. Please check your permissions or try taking a screenshot as an alternative. - Got it + Save %s code + Image save failed + We couldn\'t save the image. Please check your permissions or try taking a screenshot as an alternative. + Got it name@example.com Enter phone number Success!\nPayment approved. diff --git a/ui/src/main/kotlin/com/processout/sdk/ui/napm/NativeAlternativePaymentViewModel.kt b/ui/src/main/kotlin/com/processout/sdk/ui/napm/NativeAlternativePaymentViewModel.kt index 8dd1c830..465b1004 100644 --- a/ui/src/main/kotlin/com/processout/sdk/ui/napm/NativeAlternativePaymentViewModel.kt +++ b/ui/src/main/kotlin/com/processout/sdk/ui/napm/NativeAlternativePaymentViewModel.kt @@ -183,7 +183,10 @@ internal class NativeAlternativePaymentViewModel private constructor( POActionState( id = it.actionId, text = options.barcode.saveActionText - ?: app.getString(R.string.po_native_apm_save_qr_code_button_text), + ?: app.getString( + R.string.po_native_apm_save_barcode_button_text_format, + it.type.rawType.uppercase() + ), primary = false ) }, @@ -384,10 +387,10 @@ internal class NativeAlternativePaymentViewModel private constructor( options.barcode.saveErrorConfirmation?.let { ConfirmationDialogState( id = barcode.confirmErrorActionId, - title = it.title ?: app.getString(R.string.po_native_apm_save_image_error_title), - message = it.message ?: app.getString(R.string.po_native_apm_save_image_error_message), + title = it.title ?: app.getString(R.string.po_native_apm_save_barcode_error_title), + message = it.message ?: app.getString(R.string.po_native_apm_save_barcode_error_message), confirmActionText = it.confirmActionText - ?: app.getString(R.string.po_native_apm_save_image_error_confirm), + ?: app.getString(R.string.po_native_apm_save_barcode_error_confirm), dismissActionText = it.dismissActionText ) } diff --git a/ui/src/main/kotlin/com/processout/sdk/ui/napm/PONativeAlternativePaymentConfiguration.kt b/ui/src/main/kotlin/com/processout/sdk/ui/napm/PONativeAlternativePaymentConfiguration.kt index dba829a0..a76e65e1 100644 --- a/ui/src/main/kotlin/com/processout/sdk/ui/napm/PONativeAlternativePaymentConfiguration.kt +++ b/ui/src/main/kotlin/com/processout/sdk/ui/napm/PONativeAlternativePaymentConfiguration.kt @@ -3,7 +3,6 @@ package com.processout.sdk.ui.napm import android.os.Parcelable import androidx.annotation.ColorRes import androidx.annotation.DrawableRes -import com.processout.sdk.core.annotation.ProcessOutInternalApi import com.processout.sdk.ui.core.style.* import com.processout.sdk.ui.shared.configuration.POActionConfirmationConfiguration import com.processout.sdk.ui.shared.configuration.POBarcodeConfiguration @@ -47,7 +46,7 @@ data class PONativeAlternativePaymentConfiguration( val secondaryAction: SecondaryAction? = null, val cancellation: CancellationConfiguration = CancellationConfiguration(), val paymentConfirmation: PaymentConfirmationConfiguration = PaymentConfirmationConfiguration(), - @ProcessOutInternalApi val barcode: POBarcodeConfiguration = POBarcodeConfiguration(), + val barcode: POBarcodeConfiguration = POBarcodeConfiguration(), val inlineSingleSelectValuesLimit: Int = 5, val skipSuccessScreen: Boolean = false, val successMessage: String? = null diff --git a/ui/src/main/kotlin/com/processout/sdk/ui/shared/configuration/POBarcodeConfiguration.kt b/ui/src/main/kotlin/com/processout/sdk/ui/shared/configuration/POBarcodeConfiguration.kt index 33ecfe2e..0d2da691 100644 --- a/ui/src/main/kotlin/com/processout/sdk/ui/shared/configuration/POBarcodeConfiguration.kt +++ b/ui/src/main/kotlin/com/processout/sdk/ui/shared/configuration/POBarcodeConfiguration.kt @@ -1,7 +1,6 @@ package com.processout.sdk.ui.shared.configuration import android.os.Parcelable -import com.processout.sdk.core.annotation.ProcessOutInternalApi import kotlinx.parcelize.Parcelize /** @@ -10,7 +9,6 @@ import kotlinx.parcelize.Parcelize * @param[saveActionText] Text on the button that saves barcode. * @param[saveErrorConfirmation] Requests user confirmation (e.g. dialog) when saving barcode has failed. Use _null_ to disable. */ -@ProcessOutInternalApi @Parcelize data class POBarcodeConfiguration( val saveActionText: String? = null,