From a1455bbb1c60e909072bf04e082eaec76b32bf3a Mon Sep 17 00:00:00 2001 From: Tamim Hossain <132823494+CodeWithTamim@users.noreply.github.com> Date: Sat, 3 Aug 2024 08:38:00 +0600 Subject: [PATCH] Updated getLocale function to use appropriate Locale constants (#3413) Updated getLocale function to use appropriate Locale constants --- .../src/main/kotlin/com/v2ray/ang/util/Utils.kt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt index c45cdf28..fa935ab6 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt @@ -403,18 +403,21 @@ object Utils { } } - fun getLocale(): Locale = - when (settingsStorage?.decodeString(AppConfig.PREF_LANGUAGE) ?: "auto") { - "auto" -> getSysLocale() - "en" -> Locale("en") - "zh-rCN" -> Locale("zh", "CN") - "zh-rTW" -> Locale("zh", "TW") + fun getLocale(): Locale { + val lang = settingsStorage?.decodeString(AppConfig.PREF_LANGUAGE) ?: "auto" + return when (lang) { + "auto" -> getSysLocale() + "en" -> Locale.ENGLISH + "zh-rCN" -> Locale.CHINA + "zh-rTW" -> Locale.TRADITIONAL_CHINESE "vi" -> Locale("vi") "ru" -> Locale("ru") "fa" -> Locale("fa") "bn" -> Locale("bn") else -> getSysLocale() } + } + private fun getSysLocale(): Locale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { LocaleList.getDefault()[0]