luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-05-14 05:52:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename langauge_key_texts to locale_key_texts

Browse source
This commit is contained in:
Helium314 2024-05-02 16:20:49 +02:00
parent da3a7dd854
commit 691ae017bc
81 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/LocaleKeyboardInfos.kt
View file

@ -238,9 +238,9 @@ fun addLocaleKeyTextsToParams(context: Context, params: KeyboardParams, popupKey
private fun createLocaleKeyTexts(context: Context, params: KeyboardParams, popupKeysSetting: Int): LocaleKeyboardInfos {
val lkt = LocaleKeyboardInfos(getStreamForLocale(params.mId.locale, context), params.mId.locale)
if (popupKeysSetting == POPUP_KEYS_MORE)
lkt.addFile(context.assets.open("$LANGUAGE_TEXTS_FOLDER/all_popup_keys.txt"))
lkt.addFile(context.assets.open("$LOCALE_TEXTS_FOLDER/all_popup_keys.txt"))
else if (popupKeysSetting == POPUP_KEYS_ALL)
lkt.addFile(context.assets.open("$LANGUAGE_TEXTS_FOLDER/more_popup_keys.txt"))
lkt.addFile(context.assets.open("$LOCALE_TEXTS_FOLDER/more_popup_keys.txt"))
params.mSecondaryLocales.forEach { locale ->
if (locale == params.mId.locale) return@forEach
lkt.addFile(getStreamForLocale(locale, context))
@ -250,11 +250,11 @@ private fun createLocaleKeyTexts(context: Context, params: KeyboardParams, popup
private fun getStreamForLocale(locale: Locale, context: Context) =
try {
if (locale.toLanguageTag() == SubtypeLocaleUtils.NO_LANGUAGE) context.assets.open("$LANGUAGE_TEXTS_FOLDER/more_popup_keys.txt")
else context.assets.open("$LANGUAGE_TEXTS_FOLDER/${locale.toLanguageTag()}.txt")
if (locale.toLanguageTag() == SubtypeLocaleUtils.NO_LANGUAGE) context.assets.open("$LOCALE_TEXTS_FOLDER/more_popup_keys.txt")
else context.assets.open("$LOCALE_TEXTS_FOLDER/${locale.toLanguageTag()}.txt")
} catch (_: Exception) {
try {
context.assets.open("$LANGUAGE_TEXTS_FOLDER/${locale.language}.txt")
context.assets.open("$LOCALE_TEXTS_FOLDER/${locale.language}.txt")
} catch (_: Exception) {
null
}
@ -335,4 +335,4 @@ const val POPUP_KEYS_ALL = 2
const val POPUP_KEYS_MORE = 1
const val POPUP_KEYS_NORMAL = 0
const val LANGUAGE_TEXTS_FOLDER = "language_key_texts"
private const val LOCALE_TEXTS_FOLDER = "locale_key_texts"