lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix OWM Czech language support

Browse Source
This commit is contained in:
MM20 2023-07-12 18:48:19 +02:00
parent 3759a99510
commit 248744fee9
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
data/weather/src/main/java/de/mm20/launcher2/weather/openweathermap/OpenWeatherMapProvider.kt
View File

@ -2,6 +2,7 @@ package de.mm20.launcher2.weather.openweathermap
import android.content.Context import android.content.Context
import android.content.SharedPreferences import android.content.SharedPreferences
import android.util.Log
import androidx.core.content.edit import androidx.core.content.edit
import de.mm20.launcher2.crashreporter.CrashReporter import de.mm20.launcher2.crashreporter.CrashReporter
import de.mm20.launcher2.weather.* import de.mm20.launcher2.weather.*
@ -29,7 +30,7 @@ class OpenWeatherMapProvider(override val context: Context) :
} }
override suspend fun lookupLocation(query: String): List<OpenWeatherMapLocation> { override suspend fun lookupLocation(query: String): List<OpenWeatherMapLocation> {
val lang = Locale.getDefault().language val lang = getLanguageCode()
val response = try { val response = try {
openWeatherMapService.currentWeather( openWeatherMapService.currentWeather(
@ -69,7 +70,7 @@ class OpenWeatherMapProvider(override val context: Context) :
lon: Double? = null, lon: Double? = null,
location: OpenWeatherMapLocation? = null location: OpenWeatherMapLocation? = null
): WeatherUpdateResult<OpenWeatherMapLocation>? { ): WeatherUpdateResult<OpenWeatherMapLocation>? {
val lang = Locale.getDefault().language val lang = getLanguageCode()
val currentWeather = try { val currentWeather = try {
openWeatherMapService.currentWeather( openWeatherMapService.currentWeather(
@ -164,6 +165,14 @@ class OpenWeatherMapProvider(override val context: Context) :
) )
} }
private fun getLanguageCode(): String {
val lang = Locale.getDefault().language
// OWM incorrectly expects Czech to be "cz" instead of "cs"
// see https://openweathermap.org/current#multi
if (lang == "cs") return "cz"
return lang
}
private fun getApiKey(): String? { private fun getApiKey(): String? {
val resId = getApiKeyResId() val resId = getApiKeyResId()
if (resId != 0) return context.getString(resId) if (resId != 0) return context.getString(resId)