From b0e7d44e8441942e396e55547e795d1bc57216f5 Mon Sep 17 00:00:00 2001 From: Niklas Baudy Date: Fri, 2 Aug 2024 11:30:42 +0200 Subject: [PATCH] Technical: Update multiplatform-locale to 0.8.0 (#212) --- gradle/libs.versions.toml | 2 +- .../de/belabs/appstatistics/inappproducts/InAppProducts.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b118910..0aaee6e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ kotlinx-datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.6.0" kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.7.1" } ktor-client-core-jvm = { module = "io.ktor:ktor-client-core-jvm", version.ref = "ktor" } ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" } -multiplatform-locale = { module = "com.vanniktech:multiplatform-locale", version = "0.7.0" } +multiplatform-locale = { module = "com.vanniktech:multiplatform-locale", version = "0.8.0" } plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } plugin-kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" } plugin-shadowjar = { module = "com.github.johnrengelman:shadow", version = "8.1.1" } diff --git a/inapp-products/src/main/kotlin/de/belabs/appstatistics/inappproducts/InAppProducts.kt b/inapp-products/src/main/kotlin/de/belabs/appstatistics/inappproducts/InAppProducts.kt index d0fb433..8443aa7 100644 --- a/inapp-products/src/main/kotlin/de/belabs/appstatistics/inappproducts/InAppProducts.kt +++ b/inapp-products/src/main/kotlin/de/belabs/appstatistics/inappproducts/InAppProducts.kt @@ -298,11 +298,11 @@ internal class InAppProducts : CoreCommand() { .forEach { (locale, localisedInAppProducts) -> val language = locale.language val languageCode = language.legacyCode ?: language.code - val country = locale.country + val territory = locale.territory val directory = stringsDirectory.resolve( when { - language == Language.ENGLISH && country == Country.USA -> "values" - language.defaultCountry != country && country != null -> "values-$languageCode-r${country.code}" + language == Language.ENGLISH && territory == Country.USA -> "values" + language.defaultCountry != territory && territory != null -> "values-$languageCode-r${territory.code}" else -> "values-$languageCode" }, )