mirror/Anki-Android
0
0
Fork 0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 03:52:15 +02:00
Code

nf: Rename constant

Browse Source
This commit is contained in:
Brayan Oliveira 2023-05-07 14:19:09 -03:00 committed by Mike Hardy
parent 5069ad604b
commit 4528c5d483
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AnkiDroid/src/main/java/com/ichi2/anki/preferences/GeneralSettingsFragment.kt
View File

@ -87,12 +87,12 @@ class GeneralSettingsFragment : SettingsFragment() {
val systemLocale = getSystemLocale()
requirePreference<ListPreference>(R.string.pref_language_key).apply {
entries = arrayOf(getStringByLocale(R.string.language_system, systemLocale), *sortedLanguages.keys.toTypedArray())
entryValues = arrayOf(LanguageUtil.DEFAULT_LANGUAGE_TAG, *sortedLanguages.values.toTypedArray())
entryValues = arrayOf(LanguageUtil.SYSTEM_LANGUAGE_TAG, *sortedLanguages.values.toTypedArray())
setOnPreferenceChangeListener { selectedLanguage ->
LanguageUtil.setDefaultBackendLanguages(selectedLanguage as String)
runBlocking { CollectionManager.discardBackend() }
val localeCode = if (selectedLanguage != LanguageUtil.DEFAULT_LANGUAGE_TAG) {
val localeCode = if (selectedLanguage != LanguageUtil.SYSTEM_LANGUAGE_TAG) {
selectedLanguage
} else {
null

7
AnkiDroid/src/main/java/com/ichi2/utils/LanguageUtil.kt
View File

@ -30,8 +30,7 @@ import java.util.*
* Utility call for proving language related functionality.
*/
object LanguageUtil {
/** locale value of the currently selected locale of the app */
const val DEFAULT_LANGUAGE_TAG = ""
const val SYSTEM_LANGUAGE_TAG = ""
/** A list of all languages supported by AnkiDroid
* Please modify LanguageUtilsTest if changing
@ -207,8 +206,8 @@ object LanguageUtil {
fun getSystemLocale(): Locale = getLocaleCompat(Resources.getSystem())!!
/** If locale is not provided, the current locale will be used. */
fun setDefaultBackendLanguages(languageTag: String = DEFAULT_LANGUAGE_TAG) {
val locale = if (languageTag == DEFAULT_LANGUAGE_TAG) {
fun setDefaultBackendLanguages(languageTag: String = SYSTEM_LANGUAGE_TAG) {
val locale = if (languageTag == SYSTEM_LANGUAGE_TAG) {
Locale.getDefault()
} else {
Locale.forLanguageTag(languageTag)