From c1f358ff3f28b23cf20d83964454e76eb4f84174 Mon Sep 17 00:00:00 2001 From: ozgur <6615094+ozgur00@users.noreply.github.com> Date: Thu, 21 Mar 2024 15:13:28 +0300 Subject: [PATCH] Fix address lookup localization issues COAND-872 --- RELEASE_NOTES.md | 68 +------------------ card/src/main/res/values/styles.xml | 3 +- .../internal/ui/view/AddressLookupView.kt | 32 ++++++--- .../ui/core/internal/util/ViewExtensions.kt | 9 +++ .../main/res/layout/address_lookup_view.xml | 2 +- .../main/res/template/values/strings.xml.tt | 1 + ui-core/src/main/res/values-ar/strings.xml | 1 + .../src/main/res/values-cs-rCZ/strings.xml | 5 +- .../src/main/res/values-da-rDK/strings.xml | 5 +- .../src/main/res/values-de-rDE/strings.xml | 7 +- .../src/main/res/values-el-rGR/strings.xml | 3 +- .../src/main/res/values-es-rES/strings.xml | 1 + .../src/main/res/values-fi-rFI/strings.xml | 1 + .../src/main/res/values-fr-rFR/strings.xml | 3 +- .../src/main/res/values-hr-rHR/strings.xml | 5 +- .../src/main/res/values-hu-rHU/strings.xml | 1 + .../src/main/res/values-it-rIT/strings.xml | 1 + .../src/main/res/values-ja-rJP/strings.xml | 1 + .../src/main/res/values-ko-rKR/strings.xml | 1 + .../src/main/res/values-nb-rNO/strings.xml | 5 +- .../src/main/res/values-nl-rNL/strings.xml | 5 +- .../src/main/res/values-pl-rPL/strings.xml | 3 +- .../src/main/res/values-pt-rBR/strings.xml | 5 +- .../src/main/res/values-pt-rPT/strings.xml | 1 + .../src/main/res/values-ro-rRO/strings.xml | 1 + .../src/main/res/values-ru-rRU/strings.xml | 5 +- .../src/main/res/values-sk-rSK/strings.xml | 1 + .../src/main/res/values-sl-rSI/strings.xml | 3 +- .../src/main/res/values-sv-rSE/strings.xml | 3 +- .../src/main/res/values-zh-rCN/strings.xml | 1 + .../src/main/res/values-zh-rTW/strings.xml | 1 + ui-core/src/main/res/values/strings.xml | 5 +- ui-core/src/main/res/values/styles.xml | 3 +- 33 files changed, 88 insertions(+), 104 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index eb45949724..f9e67c6bff 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -8,71 +8,5 @@ [//]: # (## Deprecated) [//]: # ( - Configurations public constructor are deprecated, please use each Configuration's builder to make a Configuration object) -## New -- A new way to create a configuration using DSL to be more declarative and concise: -```Kotlin -CheckoutConfiguration( - environment = environment, - clientKey = clientKey, - shopperLocale = shopperLocale, - amount = amount, -) { - dropIn { - setEnableRemovingStoredPaymentMethods(true) - } - - card { - setHolderNameRequired(true) - setShopperReference("...") - } - - adyen3DS2 { - setThreeDSRequestorAppURL("...") - } -} -``` - -- For the Card Component, you can use the new [Address Lookup functionality](docs/ADDRESS_LOOKUP.md). -- For voucher actions: when the `url` or `downloadUrl` is not included, the shopper has the option to select **Save as image** and save the voucher to the device's `Downloads` folder. -- You can now set your own `AdyenLogger` instance with `AdyenLogger.setLogger`. This gives the ability to intercept logs and handle them in your own way. -- [Instructions](example-app/README.md) to use the testing app in the repository. You can follow `How to migrate` section [here](https://github.com/Adyen/adyen-android/pull/1505). -- Payment methods: - - Multibanco. Payment method type: **multibanco**. - - Pay Easy. Payment method type: **econtext_atm**. - - Convenience Stores Japan. Payment method type: **econtext_stores** - - Online Banking Japan. Payment method type: **econtext_online**. - - Seven-Eleven: Payment method type: **econtext_seven_eleven** - ## Fixed -- When building `minifyEnabled` without the `kotlin-parcelize` plugin in your project, the build should no longer crash. -- When handling actions, you no longer get the `IllegalArgumentException: Unsupported delegate type` error that causes a crash. - -## Deprecated -- When creating a configuration, the `Builder` constructors with a `Context` is deprecated. You can now omit the `context` parameter. -- `PermissionException`. Handle permissions through `ActionComponentCallback`, `SessionComponentCallback`, or `ComponentCallback` callbacks instead. -- The styles for vouchers have been changed: - - | Previous (v5.2.0 or earlier) | Now (v5.3.0) | - |---------------------------------------------|-----------------------------------------------| - | `AdyenCheckout.Voucher.Description.Bacs` | `AdyenCheckout.Voucher.Simple.Description` | - | `AdyenCheckout.Voucher.Description.Boleto` | `AdyenCheckout.Voucher.Full.Description` | - | `AdyenCheckout.Voucher.ExpirationDateLabel` | `AdyenCheckout.Voucher.InformationFieldLabel` | - | `AdyenCheckout.Voucher.ExpirationDate` | `AdyenCheckout.Voucher.InformationFieldValue` | - | `AdyenCheckout.Voucher.ButtonCopyCode` | `AdyenCheckout.Voucher.Button.CopyCode` | - | `AdyenCheckout.Voucher.ButtonDownloadPdf` | `AdyenCheckout.Voucher.Button.DownloadPdf` | -- Logger.LogLevel has been deprecated. - - | Previous (v5.2.0 or earlier) | Now (v5.3.0) | - |------------------------------------------|-------------------------------------------------| - | `Logger.LogLevel` | `AdyenLogLevel` | - | `AdyenLogger.setLogLevel(logLevel: Int)` | `AdyenLogger.setLogLevel(level: AdyenLogLevel)` | - -## Changed -- When creating a configuration, the `shopperLocale` parameter is now optional. - - Sessions flow: when you don't set it, the shopper locale is set to the value included in the `/sessions` request. - - Advanced flow: when you don't set it, the shopper local is set to the primary user locale on the device. -- For Drop-in, all actions now start in expanded mode. -- For the Google Pay Component, you no longer need to manually import the `3ds2` module to handle transactions that require Native 3D Secure 2 challenge. -- If you use `DropInServiceResult.Error` without specifying an error message, the default has changed from `Error sending payment. Please try again.` to `An unknown error occurred`. -- For the Sessions flow: - - When starting Drop-in (with `DropIn.startPayment`) or creating a Component (with `YourComponent.PROVIDER.get`), the `configuration` parameter is now optional. - - When using `CheckoutSessionProvider.createSession` to create a `CheckoutSession`, you can pass only `environment` and `clientKey` instead of the whole configuration. - - Removing stored payment methods is now handled internally. You no longer need to override the `onRemoveStoredPaymentMethod` function. +- Localization issues in address lookup functionality. diff --git a/card/src/main/res/values/styles.xml b/card/src/main/res/values/styles.xml index 47c7083969..7487d90388 100644 --- a/card/src/main/res/values/styles.xml +++ b/card/src/main/res/values/styles.xml @@ -102,8 +102,7 @@ match_parent @dimen/standard_margin @dimen/input_height - Search Address - @string/checkout_address_lookup_hint + @string/checkout_address_lookup_hint ?android:attr/textColor diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/AddressLookupView.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/AddressLookupView.kt index 8a90c56623..6011c1bff6 100644 --- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/AddressLookupView.kt +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/ui/view/AddressLookupView.kt @@ -25,6 +25,7 @@ import com.adyen.checkout.ui.core.internal.ui.AddressLookupDelegate import com.adyen.checkout.ui.core.internal.ui.ComponentView import com.adyen.checkout.ui.core.internal.ui.model.AddressLookupState import com.adyen.checkout.ui.core.internal.util.formatStringWithHyperlink +import com.adyen.checkout.ui.core.internal.util.setLocalizedQueryHintFromStyle import com.adyen.checkout.ui.core.internal.util.setLocalizedTextFromStyle import com.adyen.checkout.ui.core.internal.util.showKeyboard import kotlinx.coroutines.CoroutineScope @@ -98,7 +99,10 @@ class AddressLookupView @JvmOverloads constructor( } private fun initLocalizedStrings(localizedContext: Context) { - binding.addressFormInput.initLocalizedContext(localizedContext) + binding.textInputLayoutAddressLookupQuerySearch.setLocalizedQueryHintFromStyle( + styleResId = R.style.AdyenCheckout_AddressLookup_Query, + localizedContext = localizedContext, + ) binding.textViewInitialDisclaimer.setLocalizedTextFromStyle( styleResId = R.style.AdyenCheckout_AddressLookup_InitialDisclaimer_Title, @@ -119,6 +123,18 @@ class AddressLookupView @JvmOverloads constructor( localizedContext = localizedContext, formatHyperLink = true, ) + + binding.buttonManualEntry.setLocalizedTextFromStyle( + styleResId = R.style.AdyenCheckout_AddressLookup_Button_Manual, + localizedContext = localizedContext, + ) + + binding.buttonSubmitAddress.setLocalizedTextFromStyle( + styleResId = R.style.AdyenCheckout_AddressLookup_Button_Submit, + localizedContext = localizedContext, + ) + + binding.addressFormInput.initLocalizedContext(localizedContext) } private fun initAddressLookupQuery() { @@ -169,7 +185,7 @@ class AddressLookupView @JvmOverloads constructor( } private fun initSubmitAddressButton() { - binding.submitAddressButton.setOnClickListener { + binding.buttonSubmitAddress.setOnClickListener { addressLookupDelegate.submitAddress() } } @@ -195,7 +211,7 @@ class AddressLookupView @JvmOverloads constructor( binding.progressBar.isVisible = false binding.buttonManualEntry.isVisible = false binding.divider.isVisible = false - binding.submitAddressButton.isVisible = false + binding.buttonSubmitAddress.isVisible = false binding.textViewManualEntryError.text = localizedContext.getString(R.string.checkout_address_lookup_empty_description, addressLookupState.query) .formatStringWithHyperlink("#") @@ -211,7 +227,7 @@ class AddressLookupView @JvmOverloads constructor( binding.progressBar.isVisible = false binding.buttonManualEntry.isVisible = false binding.divider.isVisible = false - binding.submitAddressButton.isVisible = false + binding.buttonSubmitAddress.isVisible = false } private fun handleLoadingState() { @@ -224,7 +240,7 @@ class AddressLookupView @JvmOverloads constructor( binding.progressBar.isVisible = true binding.buttonManualEntry.isVisible = false binding.divider.isVisible = false - binding.submitAddressButton.isVisible = false + binding.buttonSubmitAddress.isVisible = false } private fun handleFormState(addressLookupState: AddressLookupState.Form) { @@ -237,7 +253,7 @@ class AddressLookupView @JvmOverloads constructor( binding.progressBar.isVisible = false binding.buttonManualEntry.isVisible = false binding.divider.isVisible = false - binding.submitAddressButton.isVisible = true + binding.buttonSubmitAddress.isVisible = true addressLookupDelegate.addressDelegate.updateAddressInputData { if (addressLookupState.selectedAddress == null) { this.resetAll() @@ -257,7 +273,7 @@ class AddressLookupView @JvmOverloads constructor( binding.progressBar.isVisible = false binding.buttonManualEntry.isVisible = true binding.divider.isVisible = true - binding.submitAddressButton.isVisible = false + binding.buttonSubmitAddress.isVisible = false setAddressOptions(addressLookupState.options) } @@ -271,7 +287,7 @@ class AddressLookupView @JvmOverloads constructor( binding.progressBar.isVisible = false binding.buttonManualEntry.isVisible = false binding.divider.isVisible = false - binding.submitAddressButton.isVisible = true + binding.buttonSubmitAddress.isVisible = true highlightValidationErrors() } diff --git a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ViewExtensions.kt b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ViewExtensions.kt index 25359a37ec..afc91c705e 100644 --- a/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ViewExtensions.kt +++ b/ui-core/src/main/java/com/adyen/checkout/ui/core/internal/util/ViewExtensions.kt @@ -7,6 +7,7 @@ import android.text.style.URLSpan import android.view.View import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT +import android.widget.SearchView import android.widget.TextView import androidx.annotation.RestrictTo import androidx.annotation.StyleRes @@ -47,6 +48,14 @@ fun TextView.setLocalizedTextFromStyle( typedArray.recycle() } +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +fun SearchView.setLocalizedQueryHintFromStyle(@StyleRes styleResId: Int, localizedContext: Context) { + val attrs = intArrayOf(android.R.attr.queryHint) + val typedArray = localizedContext.obtainStyledAttributes(styleResId, attrs) + queryHint = typedArray.getString(0) + typedArray.recycle() +} + internal fun String.formatStringWithHyperlink(replacementToken: String = "%#"): CharSequence { // check if the string contains the replacement token twice val counter = this.split(replacementToken).size - 1 diff --git a/ui-core/src/main/res/layout/address_lookup_view.xml b/ui-core/src/main/res/layout/address_lookup_view.xml index f2415d540c..9653a6af54 100644 --- a/ui-core/src/main/res/layout/address_lookup_view.xml +++ b/ui-core/src/main/res/layout/address_lookup_view.xml @@ -105,7 +105,7 @@ tools:visibility="visible" /> diff --git a/ui-core/src/main/res/template/values/strings.xml.tt b/ui-core/src/main/res/template/values/strings.xml.tt index 77ad2b84ea..a36705d017 100644 --- a/ui-core/src/main/res/template/values/strings.xml.tt +++ b/ui-core/src/main/res/template/values/strings.xml.tt @@ -53,6 +53,7 @@ %%address.lookup.search.empty.title.noResults%% %%address.lookup.search.empty.subtitle.noResults%% %%address.enterManually%% + %%address.lookup.submit%% %1$s (%2$s) diff --git a/ui-core/src/main/res/values-ar/strings.xml b/ui-core/src/main/res/values-ar/strings.xml index 63908fa686..29c36247bd 100644 --- a/ui-core/src/main/res/values-ar/strings.xml +++ b/ui-core/src/main/res/values-ar/strings.xml @@ -53,5 +53,6 @@ لم يتم العثور على نتائج لم يتطابق \'%s\' مع أي شيء، حاول مرة أخرى أو استخدم #إدخال العنوان يدويًا# أدخل العنوان يدويًا + استخدم هذا العنوان \ No newline at end of file diff --git a/ui-core/src/main/res/values-cs-rCZ/strings.xml b/ui-core/src/main/res/values-cs-rCZ/strings.xml index 09a8459d97..c38348c57c 100644 --- a/ui-core/src/main/res/values-cs-rCZ/strings.xml +++ b/ui-core/src/main/res/values-cs-rCZ/strings.xml @@ -47,11 +47,12 @@ Provincie nebo teritorium Město (nepovinné) - Vyhledat vaši adresu - Nedaří se vám vyhledat vaši adresu? + Vyhledat svou adresu + Nemůžete najít svou adresu? Vždy můžete #zadat svou adresu ručně# Nebyly nalezeny žádné výsledky „%s“ se s ničím neshoduje, zkuste to znovu nebo použijte #ruční zadání adresy# Zadejte adresu ručně + Použijte tuto adresu \ No newline at end of file diff --git a/ui-core/src/main/res/values-da-rDK/strings.xml b/ui-core/src/main/res/values-da-rDK/strings.xml index b660174f7a..32d5fe0038 100644 --- a/ui-core/src/main/res/values-da-rDK/strings.xml +++ b/ui-core/src/main/res/values-da-rDK/strings.xml @@ -47,11 +47,12 @@ Provins eller territorium (valgfrit) By (valgfrit) - Søg på din adresse - Kan du ikke søge på din adresse? + Søg efter din adresse + Kan du ikke søge efter din adresse? Du kan altid #indtaste din adresse manuelt# Ingen resultater fundet Fandt ikke noget match for \'%s\'. Prøv igen eller #indtast adresse manuelt#. Indtast adresse manuelt + Brug denne adresse \ No newline at end of file diff --git a/ui-core/src/main/res/values-de-rDE/strings.xml b/ui-core/src/main/res/values-de-rDE/strings.xml index 1bf464a966..50cf511ac9 100644 --- a/ui-core/src/main/res/values-de-rDE/strings.xml +++ b/ui-core/src/main/res/values-de-rDE/strings.xml @@ -47,11 +47,12 @@ Provinz oder Territorium (optional) Ort (optional) - Suchen Sie Ihre Adresse - Sie können Ihre Adresse nicht suchen? + Suchen Sie nach Ihrer Adresse + Sie können nicht nach Ihrer Adresse suchen? Sie können Ihre Adresse jederzeit manuell #eingeben# Keine Ergebnisse gefunden \'%s\' stimmt nicht mit irgendetwas überein, versuchen Sie es erneut oder verwenden Sie #manual address entry# Geben Sie die Adresse manuell ein + Diese Adresse verwenden - \ No newline at end of file + diff --git a/ui-core/src/main/res/values-el-rGR/strings.xml b/ui-core/src/main/res/values-el-rGR/strings.xml index 15c478aee2..07a0503a77 100644 --- a/ui-core/src/main/res/values-el-rGR/strings.xml +++ b/ui-core/src/main/res/values-el-rGR/strings.xml @@ -48,10 +48,11 @@ Πόλη / Δήμος (προαιρετικό) Αναζητήστε τη διεύθυνσή σας - Δεν μπορείτε να κάνετε αναζήτηση της διεύθυνσής σας; + Δεν μπορείτε να αναζητήσετε τη διεύθυνσή σας; Μπορείτε πάντα να #εισαγάγετε τη διεύθυνσή σας μη αυτόματα# Δεν βρέθηκαν αποτελέσματα Το \'%s\' δεν ταιριάζει με τίποτα. Προσπαθήστε ξανά ή χρησιμοποιήστε #μη αυτόματη εισαγωγή διεύθυνσης# Εισαγάγετε τη διεύθυνση μη αυτόματα + Χρησιμοποιήστε αυτήν τη διεύθυνση \ No newline at end of file diff --git a/ui-core/src/main/res/values-es-rES/strings.xml b/ui-core/src/main/res/values-es-rES/strings.xml index 5c05259d94..189cbb4d2d 100644 --- a/ui-core/src/main/res/values-es-rES/strings.xml +++ b/ui-core/src/main/res/values-es-rES/strings.xml @@ -53,5 +53,6 @@ No se han encontrado resultados "%s" no ha coincidido con nada, inténtelo de nuevo o #introduzca su dirección manualmente# Introduzca la dirección manualmente + Usar esta dirección \ No newline at end of file diff --git a/ui-core/src/main/res/values-fi-rFI/strings.xml b/ui-core/src/main/res/values-fi-rFI/strings.xml index 6f439a7bde..b336f5b5bc 100644 --- a/ui-core/src/main/res/values-fi-rFI/strings.xml +++ b/ui-core/src/main/res/values-fi-rFI/strings.xml @@ -53,5 +53,6 @@ Tuloksia ei löytynyt \'%s\' ei tuottanut tuloksia. Yritä uudelleen tai käytä #manuaalista osoitteen syöttöä# Syötä osoite manuaalisesti + Käytä tätä osoitetta \ No newline at end of file diff --git a/ui-core/src/main/res/values-fr-rFR/strings.xml b/ui-core/src/main/res/values-fr-rFR/strings.xml index d4453af6aa..6b39c805c3 100644 --- a/ui-core/src/main/res/values-fr-rFR/strings.xml +++ b/ui-core/src/main/res/values-fr-rFR/strings.xml @@ -47,11 +47,12 @@ Province ou territoire (facultatif) Ville (facultatif) - Rechercher votre adresse + Recherchez votre adresse Vous ne pouvez pas rechercher votre adresse ? Vous pouvez toujours #saisir votre adresse manuellement# Aucun résultat trouvé Aucune correspondance pour \'%s\', réessayez ou #saisissez votre adresse manuellement# Saisissez l\'adresse manuellement + Utiliser cette adresse \ No newline at end of file diff --git a/ui-core/src/main/res/values-hr-rHR/strings.xml b/ui-core/src/main/res/values-hr-rHR/strings.xml index 909d3a3e8e..62e0f17962 100644 --- a/ui-core/src/main/res/values-hr-rHR/strings.xml +++ b/ui-core/src/main/res/values-hr-rHR/strings.xml @@ -47,11 +47,12 @@ Pokrajina ili teritorij (neobavezno) Grad (neobavezno) - Pretraživanje vaše adrese - Ne možete pretražiti svoju adresu? + Potraži svoju adresu + Ne možeš potražiti svoju adresu? Uvijek možete #ručno unijeti svoju adresu# Nisu pronađeni rezultati \'%s\' nije se podudarao s ničime, pokušajte ponovno ili upotrijebite #ručni unos adrese# Ručno unesite adresu + Koristi ovu adresu diff --git a/ui-core/src/main/res/values-hu-rHU/strings.xml b/ui-core/src/main/res/values-hu-rHU/strings.xml index e43e78baeb..3af44abe0f 100644 --- a/ui-core/src/main/res/values-hu-rHU/strings.xml +++ b/ui-core/src/main/res/values-hu-rHU/strings.xml @@ -53,5 +53,6 @@ Nincs találat A keresett „%s„ kifejezésre nincs találat, próbálkozzon újra, vagy #írja be manuálisan a címet# Manuálisan írjon be egy címet + Használja ezt a címet \ No newline at end of file diff --git a/ui-core/src/main/res/values-it-rIT/strings.xml b/ui-core/src/main/res/values-it-rIT/strings.xml index d12342c91a..f71fb9fdc0 100644 --- a/ui-core/src/main/res/values-it-rIT/strings.xml +++ b/ui-core/src/main/res/values-it-rIT/strings.xml @@ -53,5 +53,6 @@ Nessun risultato trovato %s non corrisponde a nulla, riprova o usa #inserimento indirizzo manuale# Inserisci l\'indirizzo manualmente + Usa questo indirizzo \ No newline at end of file diff --git a/ui-core/src/main/res/values-ja-rJP/strings.xml b/ui-core/src/main/res/values-ja-rJP/strings.xml index 92badc3037..7183bb2aaa 100644 --- a/ui-core/src/main/res/values-ja-rJP/strings.xml +++ b/ui-core/src/main/res/values-ja-rJP/strings.xml @@ -53,5 +53,6 @@ 結果が見つかりませんでした 「%s」との一致はありませんでした。もう一度試すか、#手動でアドレスを入力#してください 住所を手動で入力してください + この住所を使用する \ No newline at end of file diff --git a/ui-core/src/main/res/values-ko-rKR/strings.xml b/ui-core/src/main/res/values-ko-rKR/strings.xml index d1c1173b00..60d1d4437a 100644 --- a/ui-core/src/main/res/values-ko-rKR/strings.xml +++ b/ui-core/src/main/res/values-ko-rKR/strings.xml @@ -53,5 +53,6 @@ 결과를 찾을 수 없습니다. \'%s\'와(과) 일치하는 항목이 없습니다. 다시 시도하거나 #수동 주소 입력#을 사용하세요. 수동으로 주소 입력 + 이 주소 사용 \ No newline at end of file diff --git a/ui-core/src/main/res/values-nb-rNO/strings.xml b/ui-core/src/main/res/values-nb-rNO/strings.xml index e10a4f070f..ace064b24b 100644 --- a/ui-core/src/main/res/values-nb-rNO/strings.xml +++ b/ui-core/src/main/res/values-nb-rNO/strings.xml @@ -47,11 +47,12 @@ Provins eller territorium (valgfritt) By (valgfritt) - Søk på adressen din - Kan du ikke søke på adressen din? + Søk etter adressen din + Kan du ikke søke etter adressen din? Du kan alltids #skrive inn adressen din manuelt# Fant ingen resultater Fikk ingen treff på «%s». Prøv igjen eller #skriv inn adressen manuelt# Skriv inn adressen manuelt + Bruk denne adressen \ No newline at end of file diff --git a/ui-core/src/main/res/values-nl-rNL/strings.xml b/ui-core/src/main/res/values-nl-rNL/strings.xml index b7e9e9c45f..c9fbb25dec 100644 --- a/ui-core/src/main/res/values-nl-rNL/strings.xml +++ b/ui-core/src/main/res/values-nl-rNL/strings.xml @@ -47,11 +47,12 @@ Provincie of territorium (optioneel) Stad (optioneel) - Zoek uw adres - Werd uw adres niet gevonden? + Zoeken naar uw adres + Kunt u niet zoeken naar uw adres? U kunt #uw adres handmatig invoeren# Geen resultaten gevonden Geen resulaten gevonden voor \'%s\', probeer het opnieuw of gebruik #adres handmatig invoeren# Voer het adres handmatig in + Dit adres gebruiken \ No newline at end of file diff --git a/ui-core/src/main/res/values-pl-rPL/strings.xml b/ui-core/src/main/res/values-pl-rPL/strings.xml index 4d2498491b..05b97cec49 100644 --- a/ui-core/src/main/res/values-pl-rPL/strings.xml +++ b/ui-core/src/main/res/values-pl-rPL/strings.xml @@ -47,11 +47,12 @@ Region lub terytorium (opcjonalnie) Miejscowość (opcjonalnie) - Znajdź swój adres + Wyszukaj swój adres Nie możesz znaleźć swojego adresu? Zawsze możesz #wprowadzić swój adres ręcznie# Nie znaleziono żadnych wyników Nie znaleziono żadnych dopasowań dla \'%s\', spróbuj ponownie lub #wprowadź adres ręcznie# Wprowadź adres ręcznie + Użyj tego adresu \ No newline at end of file diff --git a/ui-core/src/main/res/values-pt-rBR/strings.xml b/ui-core/src/main/res/values-pt-rBR/strings.xml index f02c5e1293..eababec81d 100644 --- a/ui-core/src/main/res/values-pt-rBR/strings.xml +++ b/ui-core/src/main/res/values-pt-rBR/strings.xml @@ -47,11 +47,12 @@ Província ou território (opcional) Cidade (opcional) - Pesquise seu endereço - Não consegue pesquisar seu endereço? + Procure seu endereço + Não consegue encontrar seu endereço? Você pode #inserir seu endereço manualmente# Nenhum resultado encontrado A pesquisa de \'%s\' não obteve resultados. Tente novamente ou use #inserir endereço manualmente# Inserir endereço manualmente + Usar este endereço \ No newline at end of file diff --git a/ui-core/src/main/res/values-pt-rPT/strings.xml b/ui-core/src/main/res/values-pt-rPT/strings.xml index 94ab3600e1..110e10a076 100644 --- a/ui-core/src/main/res/values-pt-rPT/strings.xml +++ b/ui-core/src/main/res/values-pt-rPT/strings.xml @@ -53,5 +53,6 @@ Nenhum resultado encontrado \'%s\' não devolveu resultados, tente novamente ou use #inserção manual do endereço# Introduza o endereço manualmente + Utilize este endereço \ No newline at end of file diff --git a/ui-core/src/main/res/values-ro-rRO/strings.xml b/ui-core/src/main/res/values-ro-rRO/strings.xml index dba0530e42..852b0b2c11 100644 --- a/ui-core/src/main/res/values-ro-rRO/strings.xml +++ b/ui-core/src/main/res/values-ro-rRO/strings.xml @@ -53,5 +53,6 @@ Nu s-au găsit rezultate \'%s\' nu s-a potrivit cu nimic, încercați din nou sau folosiți #completarea manuală a adresei# Introduceți adresa manual + Folosiți această adresă \ No newline at end of file diff --git a/ui-core/src/main/res/values-ru-rRU/strings.xml b/ui-core/src/main/res/values-ru-rRU/strings.xml index 67bd41cad0..2cbda30d55 100644 --- a/ui-core/src/main/res/values-ru-rRU/strings.xml +++ b/ui-core/src/main/res/values-ru-rRU/strings.xml @@ -47,11 +47,12 @@ Область или территория (необязательно) Город (необязательно) - Поиск по адресу - Не можете найти адрес? + Найдите свой адрес + Не удается найти адрес? Можно #ввести адрес вручную# Результаты не найдены Не найдено соответствий «%s». Повторите попытку или используйте #ручной ввод адреса# Ввести адрес вручную + Используйте этот адрес \ No newline at end of file diff --git a/ui-core/src/main/res/values-sk-rSK/strings.xml b/ui-core/src/main/res/values-sk-rSK/strings.xml index 050278a086..c6f80e1df9 100644 --- a/ui-core/src/main/res/values-sk-rSK/strings.xml +++ b/ui-core/src/main/res/values-sk-rSK/strings.xml @@ -53,5 +53,6 @@ Nenašli sa žiadne výsledky \'%s\' sa s ničím nezhoduje, skúste to znova alebo použite #ručné zadanie adresy# Manuálne zadajte adresu + Použite túto adresu \ No newline at end of file diff --git a/ui-core/src/main/res/values-sl-rSI/strings.xml b/ui-core/src/main/res/values-sl-rSI/strings.xml index 08e70eab2b..9700bb2e5c 100644 --- a/ui-core/src/main/res/values-sl-rSI/strings.xml +++ b/ui-core/src/main/res/values-sl-rSI/strings.xml @@ -48,10 +48,11 @@ Mesto (neobvezno) Poiščite svoj naslov - Ne morete iskati svojega naslova? + Ne morete poiskati svojega naslova? Vedno lahko #ročno vnesete svoj naslov# Nobenega rezultata ni bilo mogoče najti »%s« se ni ujemalo z ničemer, poskusite znova ali uporabite #ročni vnos naslova# Naslov vnesite ročno + Uporabite ta naslov \ No newline at end of file diff --git a/ui-core/src/main/res/values-sv-rSE/strings.xml b/ui-core/src/main/res/values-sv-rSE/strings.xml index a4f0c72998..5e64df2f3b 100644 --- a/ui-core/src/main/res/values-sv-rSE/strings.xml +++ b/ui-core/src/main/res/values-sv-rSE/strings.xml @@ -47,11 +47,12 @@ Provins eller territorium (valfritt) Ort (valfritt) - Sök upp din adress + Sök efter din adress Kan du inte söka efter din adress? Du kan alltid #ange din adress manuellt# Inga resultat hittades Det finns inga matchningar för ”%s”. Försök igen eller använd #manuell adressinmatning# Ange adress manuellt + Använd denna adress \ No newline at end of file diff --git a/ui-core/src/main/res/values-zh-rCN/strings.xml b/ui-core/src/main/res/values-zh-rCN/strings.xml index 75a804d24e..70be5b9068 100644 --- a/ui-core/src/main/res/values-zh-rCN/strings.xml +++ b/ui-core/src/main/res/values-zh-rCN/strings.xml @@ -53,5 +53,6 @@ 未找到任何结果 “%s”无匹配内容，请重试或者使用#手动地址条目# 手动输入地址 + 使用此地址 \ No newline at end of file diff --git a/ui-core/src/main/res/values-zh-rTW/strings.xml b/ui-core/src/main/res/values-zh-rTW/strings.xml index 6ded3ae838..1aa118699b 100644 --- a/ui-core/src/main/res/values-zh-rTW/strings.xml +++ b/ui-core/src/main/res/values-zh-rTW/strings.xml @@ -53,5 +53,6 @@ 找不到任何結果 「%s」不符合任何搜尋內容，請再試一次或#手動輸入地址# 手動輸入地址 + 使用此地址 \ No newline at end of file diff --git a/ui-core/src/main/res/values/strings.xml b/ui-core/src/main/res/values/strings.xml index 1e5fc2976b..ebd8d3f7b0 100644 --- a/ui-core/src/main/res/values/strings.xml +++ b/ui-core/src/main/res/values/strings.xml @@ -47,12 +47,13 @@ Province or Territory (optional) City / Town (optional) - Search your address - Can\'t search your address? + Search for your address + Can\'t search for your address? You can always #enter your address manually# No results found \'%s\' did not match with anything, try again or use #manual address entry# Enter address manually + Use this address %1$s (%2$s) diff --git a/ui-core/src/main/res/values/styles.xml b/ui-core/src/main/res/values/styles.xml index 2983b1e897..9fd356d652 100644 --- a/ui-core/src/main/res/values/styles.xml +++ b/ui-core/src/main/res/values/styles.xml @@ -326,7 +326,6 @@ @string/checkout_address_form_billing_address_title -