From 66c5f5055888888bb16a7c041681d796ea50bbee Mon Sep 17 00:00:00 2001 From: Ellen Poe Date: Tue, 2 Dec 2025 12:29:56 -0800 Subject: [PATCH] fix: don't append the locale's country when using it for formatting --- .../java/earth/maps/cardinal/data/AddressFormatter.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cardinal-android/app/src/main/java/earth/maps/cardinal/data/AddressFormatter.kt b/cardinal-android/app/src/main/java/earth/maps/cardinal/data/AddressFormatter.kt index cbdcb54..8935340 100644 --- a/cardinal-android/app/src/main/java/earth/maps/cardinal/data/AddressFormatter.kt +++ b/cardinal-android/app/src/main/java/earth/maps/cardinal/data/AddressFormatter.kt @@ -27,12 +27,18 @@ import javax.inject.Singleton @Singleton class AddressFormatter @Inject constructor() { - private val formatter = AndroidAddressFormatter(true, true, false) + private val countryFormatter = AndroidAddressFormatter(true, true, false) + private val noCountryFormatter = AndroidAddressFormatter(true, false, false) fun format(address: Address): String? { try { val locale = Locale.getDefault() val fallbackCountryCode = locale.country.uppercase() + val formatter = if (address.countryCode != null) { + countryFormatter + } else { + noCountryFormatter + } return formatter.format( Gson().toJson( mapOf( -- GitLab