diff --git a/app/src/main/assets/language_key_texts/af.txt b/app/src/main/assets/locale_key_texts/af.txt similarity index 100% rename from app/src/main/assets/language_key_texts/af.txt rename to app/src/main/assets/locale_key_texts/af.txt diff --git a/app/src/main/assets/language_key_texts/all_popup_keys.txt b/app/src/main/assets/locale_key_texts/all_popup_keys.txt similarity index 100% rename from app/src/main/assets/language_key_texts/all_popup_keys.txt rename to app/src/main/assets/locale_key_texts/all_popup_keys.txt diff --git a/app/src/main/assets/language_key_texts/ar.txt b/app/src/main/assets/locale_key_texts/ar.txt similarity index 100% rename from app/src/main/assets/language_key_texts/ar.txt rename to app/src/main/assets/locale_key_texts/ar.txt diff --git a/app/src/main/assets/language_key_texts/az.txt b/app/src/main/assets/locale_key_texts/az.txt similarity index 100% rename from app/src/main/assets/language_key_texts/az.txt rename to app/src/main/assets/locale_key_texts/az.txt diff --git a/app/src/main/assets/language_key_texts/be.txt b/app/src/main/assets/locale_key_texts/be.txt similarity index 100% rename from app/src/main/assets/language_key_texts/be.txt rename to app/src/main/assets/locale_key_texts/be.txt diff --git a/app/src/main/assets/language_key_texts/bg.txt b/app/src/main/assets/locale_key_texts/bg.txt similarity index 100% rename from app/src/main/assets/language_key_texts/bg.txt rename to app/src/main/assets/locale_key_texts/bg.txt diff --git a/app/src/main/assets/language_key_texts/bn-BD.txt b/app/src/main/assets/locale_key_texts/bn-BD.txt similarity index 100% rename from app/src/main/assets/language_key_texts/bn-BD.txt rename to app/src/main/assets/locale_key_texts/bn-BD.txt diff --git a/app/src/main/assets/language_key_texts/bn-IN.txt b/app/src/main/assets/locale_key_texts/bn-IN.txt similarity index 100% rename from app/src/main/assets/language_key_texts/bn-IN.txt rename to app/src/main/assets/locale_key_texts/bn-IN.txt diff --git a/app/src/main/assets/language_key_texts/ca.txt b/app/src/main/assets/locale_key_texts/ca.txt similarity index 100% rename from app/src/main/assets/language_key_texts/ca.txt rename to app/src/main/assets/locale_key_texts/ca.txt diff --git a/app/src/main/assets/language_key_texts/cs.txt b/app/src/main/assets/locale_key_texts/cs.txt similarity index 100% rename from app/src/main/assets/language_key_texts/cs.txt rename to app/src/main/assets/locale_key_texts/cs.txt diff --git a/app/src/main/assets/language_key_texts/cv.txt b/app/src/main/assets/locale_key_texts/cv.txt similarity index 100% rename from app/src/main/assets/language_key_texts/cv.txt rename to app/src/main/assets/locale_key_texts/cv.txt diff --git a/app/src/main/assets/language_key_texts/da.txt b/app/src/main/assets/locale_key_texts/da.txt similarity index 100% rename from app/src/main/assets/language_key_texts/da.txt rename to app/src/main/assets/locale_key_texts/da.txt diff --git a/app/src/main/assets/language_key_texts/de-CH.txt b/app/src/main/assets/locale_key_texts/de-CH.txt similarity index 100% rename from app/src/main/assets/language_key_texts/de-CH.txt rename to app/src/main/assets/locale_key_texts/de-CH.txt diff --git a/app/src/main/assets/language_key_texts/de-DE.txt b/app/src/main/assets/locale_key_texts/de-DE.txt similarity index 100% rename from app/src/main/assets/language_key_texts/de-DE.txt rename to app/src/main/assets/locale_key_texts/de-DE.txt diff --git a/app/src/main/assets/language_key_texts/de.txt b/app/src/main/assets/locale_key_texts/de.txt similarity index 100% rename from app/src/main/assets/language_key_texts/de.txt rename to app/src/main/assets/locale_key_texts/de.txt diff --git a/app/src/main/assets/language_key_texts/el.txt b/app/src/main/assets/locale_key_texts/el.txt similarity index 100% rename from app/src/main/assets/language_key_texts/el.txt rename to app/src/main/assets/locale_key_texts/el.txt diff --git a/app/src/main/assets/language_key_texts/en.txt b/app/src/main/assets/locale_key_texts/en.txt similarity index 100% rename from app/src/main/assets/language_key_texts/en.txt rename to app/src/main/assets/locale_key_texts/en.txt diff --git a/app/src/main/assets/language_key_texts/eo.txt b/app/src/main/assets/locale_key_texts/eo.txt similarity index 100% rename from app/src/main/assets/language_key_texts/eo.txt rename to app/src/main/assets/locale_key_texts/eo.txt diff --git a/app/src/main/assets/language_key_texts/es.txt b/app/src/main/assets/locale_key_texts/es.txt similarity index 100% rename from app/src/main/assets/language_key_texts/es.txt rename to app/src/main/assets/locale_key_texts/es.txt diff --git a/app/src/main/assets/language_key_texts/et.txt b/app/src/main/assets/locale_key_texts/et.txt similarity index 100% rename from app/src/main/assets/language_key_texts/et.txt rename to app/src/main/assets/locale_key_texts/et.txt diff --git a/app/src/main/assets/language_key_texts/eu.txt b/app/src/main/assets/locale_key_texts/eu.txt similarity index 100% rename from app/src/main/assets/language_key_texts/eu.txt rename to app/src/main/assets/locale_key_texts/eu.txt diff --git a/app/src/main/assets/language_key_texts/fa.txt b/app/src/main/assets/locale_key_texts/fa.txt similarity index 100% rename from app/src/main/assets/language_key_texts/fa.txt rename to app/src/main/assets/locale_key_texts/fa.txt diff --git a/app/src/main/assets/language_key_texts/fi.txt b/app/src/main/assets/locale_key_texts/fi.txt similarity index 100% rename from app/src/main/assets/language_key_texts/fi.txt rename to app/src/main/assets/locale_key_texts/fi.txt diff --git a/app/src/main/assets/language_key_texts/fr.txt b/app/src/main/assets/locale_key_texts/fr.txt similarity index 100% rename from app/src/main/assets/language_key_texts/fr.txt rename to app/src/main/assets/locale_key_texts/fr.txt diff --git a/app/src/main/assets/language_key_texts/gl.txt b/app/src/main/assets/locale_key_texts/gl.txt similarity index 100% rename from app/src/main/assets/language_key_texts/gl.txt rename to app/src/main/assets/locale_key_texts/gl.txt diff --git a/app/src/main/assets/language_key_texts/gu.txt b/app/src/main/assets/locale_key_texts/gu.txt similarity index 100% rename from app/src/main/assets/language_key_texts/gu.txt rename to app/src/main/assets/locale_key_texts/gu.txt diff --git a/app/src/main/assets/language_key_texts/hi-Latn.txt b/app/src/main/assets/locale_key_texts/hi-Latn.txt similarity index 100% rename from app/src/main/assets/language_key_texts/hi-Latn.txt rename to app/src/main/assets/locale_key_texts/hi-Latn.txt diff --git a/app/src/main/assets/language_key_texts/hi.txt b/app/src/main/assets/locale_key_texts/hi.txt similarity index 100% rename from app/src/main/assets/language_key_texts/hi.txt rename to app/src/main/assets/locale_key_texts/hi.txt diff --git a/app/src/main/assets/language_key_texts/hr.txt b/app/src/main/assets/locale_key_texts/hr.txt similarity index 100% rename from app/src/main/assets/language_key_texts/hr.txt rename to app/src/main/assets/locale_key_texts/hr.txt diff --git a/app/src/main/assets/language_key_texts/hu.txt b/app/src/main/assets/locale_key_texts/hu.txt similarity index 100% rename from app/src/main/assets/language_key_texts/hu.txt rename to app/src/main/assets/locale_key_texts/hu.txt diff --git a/app/src/main/assets/language_key_texts/hy.txt b/app/src/main/assets/locale_key_texts/hy.txt similarity index 100% rename from app/src/main/assets/language_key_texts/hy.txt rename to app/src/main/assets/locale_key_texts/hy.txt diff --git a/app/src/main/assets/language_key_texts/is.txt b/app/src/main/assets/locale_key_texts/is.txt similarity index 100% rename from app/src/main/assets/language_key_texts/is.txt rename to app/src/main/assets/locale_key_texts/is.txt diff --git a/app/src/main/assets/language_key_texts/it.txt b/app/src/main/assets/locale_key_texts/it.txt similarity index 100% rename from app/src/main/assets/language_key_texts/it.txt rename to app/src/main/assets/locale_key_texts/it.txt diff --git a/app/src/main/assets/language_key_texts/iw.txt b/app/src/main/assets/locale_key_texts/iw.txt similarity index 100% rename from app/src/main/assets/language_key_texts/iw.txt rename to app/src/main/assets/locale_key_texts/iw.txt diff --git a/app/src/main/assets/language_key_texts/ka.txt b/app/src/main/assets/locale_key_texts/ka.txt similarity index 100% rename from app/src/main/assets/language_key_texts/ka.txt rename to app/src/main/assets/locale_key_texts/ka.txt diff --git a/app/src/main/assets/language_key_texts/kab.txt b/app/src/main/assets/locale_key_texts/kab.txt similarity index 100% rename from app/src/main/assets/language_key_texts/kab.txt rename to app/src/main/assets/locale_key_texts/kab.txt diff --git a/app/src/main/assets/language_key_texts/kk.txt b/app/src/main/assets/locale_key_texts/kk.txt similarity index 100% rename from app/src/main/assets/language_key_texts/kk.txt rename to app/src/main/assets/locale_key_texts/kk.txt diff --git a/app/src/main/assets/language_key_texts/km.txt b/app/src/main/assets/locale_key_texts/km.txt similarity index 100% rename from app/src/main/assets/language_key_texts/km.txt rename to app/src/main/assets/locale_key_texts/km.txt diff --git a/app/src/main/assets/language_key_texts/kn.txt b/app/src/main/assets/locale_key_texts/kn.txt similarity index 100% rename from app/src/main/assets/language_key_texts/kn.txt rename to app/src/main/assets/locale_key_texts/kn.txt diff --git a/app/src/main/assets/language_key_texts/ko.txt b/app/src/main/assets/locale_key_texts/ko.txt similarity index 100% rename from app/src/main/assets/language_key_texts/ko.txt rename to app/src/main/assets/locale_key_texts/ko.txt diff --git a/app/src/main/assets/language_key_texts/ky.txt b/app/src/main/assets/locale_key_texts/ky.txt similarity index 100% rename from app/src/main/assets/language_key_texts/ky.txt rename to app/src/main/assets/locale_key_texts/ky.txt diff --git a/app/src/main/assets/language_key_texts/lo.txt b/app/src/main/assets/locale_key_texts/lo.txt similarity index 100% rename from app/src/main/assets/language_key_texts/lo.txt rename to app/src/main/assets/locale_key_texts/lo.txt diff --git a/app/src/main/assets/language_key_texts/lt.txt b/app/src/main/assets/locale_key_texts/lt.txt similarity index 100% rename from app/src/main/assets/language_key_texts/lt.txt rename to app/src/main/assets/locale_key_texts/lt.txt diff --git a/app/src/main/assets/language_key_texts/lv.txt b/app/src/main/assets/locale_key_texts/lv.txt similarity index 100% rename from app/src/main/assets/language_key_texts/lv.txt rename to app/src/main/assets/locale_key_texts/lv.txt diff --git a/app/src/main/assets/language_key_texts/mhr.txt b/app/src/main/assets/locale_key_texts/mhr.txt similarity index 100% rename from app/src/main/assets/language_key_texts/mhr.txt rename to app/src/main/assets/locale_key_texts/mhr.txt diff --git a/app/src/main/assets/language_key_texts/mk.txt b/app/src/main/assets/locale_key_texts/mk.txt similarity index 100% rename from app/src/main/assets/language_key_texts/mk.txt rename to app/src/main/assets/locale_key_texts/mk.txt diff --git a/app/src/main/assets/language_key_texts/ml.txt b/app/src/main/assets/locale_key_texts/ml.txt similarity index 100% rename from app/src/main/assets/language_key_texts/ml.txt rename to app/src/main/assets/locale_key_texts/ml.txt diff --git a/app/src/main/assets/language_key_texts/mn.txt b/app/src/main/assets/locale_key_texts/mn.txt similarity index 100% rename from app/src/main/assets/language_key_texts/mn.txt rename to app/src/main/assets/locale_key_texts/mn.txt diff --git a/app/src/main/assets/language_key_texts/more_popup_keys.txt b/app/src/main/assets/locale_key_texts/more_popup_keys.txt similarity index 100% rename from app/src/main/assets/language_key_texts/more_popup_keys.txt rename to app/src/main/assets/locale_key_texts/more_popup_keys.txt diff --git a/app/src/main/assets/language_key_texts/mr.txt b/app/src/main/assets/locale_key_texts/mr.txt similarity index 100% rename from app/src/main/assets/language_key_texts/mr.txt rename to app/src/main/assets/locale_key_texts/mr.txt diff --git a/app/src/main/assets/language_key_texts/my.txt b/app/src/main/assets/locale_key_texts/my.txt similarity index 100% rename from app/src/main/assets/language_key_texts/my.txt rename to app/src/main/assets/locale_key_texts/my.txt diff --git a/app/src/main/assets/language_key_texts/nb.txt b/app/src/main/assets/locale_key_texts/nb.txt similarity index 100% rename from app/src/main/assets/language_key_texts/nb.txt rename to app/src/main/assets/locale_key_texts/nb.txt diff --git a/app/src/main/assets/language_key_texts/ne.txt b/app/src/main/assets/locale_key_texts/ne.txt similarity index 100% rename from app/src/main/assets/language_key_texts/ne.txt rename to app/src/main/assets/locale_key_texts/ne.txt diff --git a/app/src/main/assets/language_key_texts/nl.txt b/app/src/main/assets/locale_key_texts/nl.txt similarity index 100% rename from app/src/main/assets/language_key_texts/nl.txt rename to app/src/main/assets/locale_key_texts/nl.txt diff --git a/app/src/main/assets/language_key_texts/pl.txt b/app/src/main/assets/locale_key_texts/pl.txt similarity index 100% rename from app/src/main/assets/language_key_texts/pl.txt rename to app/src/main/assets/locale_key_texts/pl.txt diff --git a/app/src/main/assets/language_key_texts/pms.txt b/app/src/main/assets/locale_key_texts/pms.txt similarity index 100% rename from app/src/main/assets/language_key_texts/pms.txt rename to app/src/main/assets/locale_key_texts/pms.txt diff --git a/app/src/main/assets/language_key_texts/pt.txt b/app/src/main/assets/locale_key_texts/pt.txt similarity index 100% rename from app/src/main/assets/language_key_texts/pt.txt rename to app/src/main/assets/locale_key_texts/pt.txt diff --git a/app/src/main/assets/language_key_texts/rm.txt b/app/src/main/assets/locale_key_texts/rm.txt similarity index 100% rename from app/src/main/assets/language_key_texts/rm.txt rename to app/src/main/assets/locale_key_texts/rm.txt diff --git a/app/src/main/assets/language_key_texts/ro.txt b/app/src/main/assets/locale_key_texts/ro.txt similarity index 100% rename from app/src/main/assets/language_key_texts/ro.txt rename to app/src/main/assets/locale_key_texts/ro.txt diff --git a/app/src/main/assets/language_key_texts/ru.txt b/app/src/main/assets/locale_key_texts/ru.txt similarity index 100% rename from app/src/main/assets/language_key_texts/ru.txt rename to app/src/main/assets/locale_key_texts/ru.txt diff --git a/app/src/main/assets/language_key_texts/si.txt b/app/src/main/assets/locale_key_texts/si.txt similarity index 100% rename from app/src/main/assets/language_key_texts/si.txt rename to app/src/main/assets/locale_key_texts/si.txt diff --git a/app/src/main/assets/language_key_texts/sk.txt b/app/src/main/assets/locale_key_texts/sk.txt similarity index 100% rename from app/src/main/assets/language_key_texts/sk.txt rename to app/src/main/assets/locale_key_texts/sk.txt diff --git a/app/src/main/assets/language_key_texts/sl.txt b/app/src/main/assets/locale_key_texts/sl.txt similarity index 100% rename from app/src/main/assets/language_key_texts/sl.txt rename to app/src/main/assets/locale_key_texts/sl.txt diff --git a/app/src/main/assets/language_key_texts/sr-Latn.txt b/app/src/main/assets/locale_key_texts/sr-Latn.txt similarity index 100% rename from app/src/main/assets/language_key_texts/sr-Latn.txt rename to app/src/main/assets/locale_key_texts/sr-Latn.txt diff --git a/app/src/main/assets/language_key_texts/sr.txt b/app/src/main/assets/locale_key_texts/sr.txt similarity index 100% rename from app/src/main/assets/language_key_texts/sr.txt rename to app/src/main/assets/locale_key_texts/sr.txt diff --git a/app/src/main/assets/language_key_texts/sv.txt b/app/src/main/assets/locale_key_texts/sv.txt similarity index 100% rename from app/src/main/assets/language_key_texts/sv.txt rename to app/src/main/assets/locale_key_texts/sv.txt diff --git a/app/src/main/assets/language_key_texts/sw.txt b/app/src/main/assets/locale_key_texts/sw.txt similarity index 100% rename from app/src/main/assets/language_key_texts/sw.txt rename to app/src/main/assets/locale_key_texts/sw.txt diff --git a/app/src/main/assets/language_key_texts/ta.txt b/app/src/main/assets/locale_key_texts/ta.txt similarity index 100% rename from app/src/main/assets/language_key_texts/ta.txt rename to app/src/main/assets/locale_key_texts/ta.txt diff --git a/app/src/main/assets/language_key_texts/te.txt b/app/src/main/assets/locale_key_texts/te.txt similarity index 100% rename from app/src/main/assets/language_key_texts/te.txt rename to app/src/main/assets/locale_key_texts/te.txt diff --git a/app/src/main/assets/language_key_texts/th.txt b/app/src/main/assets/locale_key_texts/th.txt similarity index 100% rename from app/src/main/assets/language_key_texts/th.txt rename to app/src/main/assets/locale_key_texts/th.txt diff --git a/app/src/main/assets/language_key_texts/tl.txt b/app/src/main/assets/locale_key_texts/tl.txt similarity index 100% rename from app/src/main/assets/language_key_texts/tl.txt rename to app/src/main/assets/locale_key_texts/tl.txt diff --git a/app/src/main/assets/language_key_texts/tr.txt b/app/src/main/assets/locale_key_texts/tr.txt similarity index 100% rename from app/src/main/assets/language_key_texts/tr.txt rename to app/src/main/assets/locale_key_texts/tr.txt diff --git a/app/src/main/assets/language_key_texts/uk.txt b/app/src/main/assets/locale_key_texts/uk.txt similarity index 100% rename from app/src/main/assets/language_key_texts/uk.txt rename to app/src/main/assets/locale_key_texts/uk.txt diff --git a/app/src/main/assets/language_key_texts/ur.txt b/app/src/main/assets/locale_key_texts/ur.txt similarity index 100% rename from app/src/main/assets/language_key_texts/ur.txt rename to app/src/main/assets/locale_key_texts/ur.txt diff --git a/app/src/main/assets/language_key_texts/uz.txt b/app/src/main/assets/locale_key_texts/uz.txt similarity index 100% rename from app/src/main/assets/language_key_texts/uz.txt rename to app/src/main/assets/locale_key_texts/uz.txt diff --git a/app/src/main/assets/language_key_texts/vi.txt b/app/src/main/assets/locale_key_texts/vi.txt similarity index 100% rename from app/src/main/assets/language_key_texts/vi.txt rename to app/src/main/assets/locale_key_texts/vi.txt diff --git a/app/src/main/assets/language_key_texts/xdq.txt b/app/src/main/assets/locale_key_texts/xdq.txt similarity index 100% rename from app/src/main/assets/language_key_texts/xdq.txt rename to app/src/main/assets/locale_key_texts/xdq.txt diff --git a/app/src/main/assets/language_key_texts/zu.txt b/app/src/main/assets/locale_key_texts/zu.txt similarity index 100% rename from app/src/main/assets/language_key_texts/zu.txt rename to app/src/main/assets/locale_key_texts/zu.txt diff --git a/app/src/main/assets/language_key_texts/zz.txt b/app/src/main/assets/locale_key_texts/zz.txt similarity index 100% rename from app/src/main/assets/language_key_texts/zz.txt rename to app/src/main/assets/locale_key_texts/zz.txt diff --git a/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/LocaleKeyboardInfos.kt b/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/LocaleKeyboardInfos.kt index ddb61891..04a406a6 100644 --- a/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/LocaleKeyboardInfos.kt +++ b/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/LocaleKeyboardInfos.kt @@ -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" diff --git a/layouts.md b/layouts.md index dc641d09..beb8c19c 100644 --- a/layouts.md +++ b/layouts.md @@ -54,7 +54,7 @@ Some special key labels will be implemented, most are already working in the (cu * `KeyboardLayoutSet` in `android:imeSubtypeExtraValue` must be set to the name of your layout file (without file ending) * `android:subtypeId` must be set to a value that is unique in this file (please use the same length as for other layouts) * If you add a layout to an existing language, add a string with the layout name to use instead of `subtype_generic`. The new string should be added to default [`strings.xml`](/app/src/main/res/values/strings.xml), and optionally to other languages. `%s` will be replaced with the language. -* If you add a new language, you might want to provide a [language_key_texts](/app/src/main/assets/language_key_texts) file +* If you add a new language, you might want to provide a [locale_key_texts](/app/src/main/assets/locale_key_texts) file * `[popup_keys]` section contains popup keys that are similar to the letter (like `a` and `ä` or `य` and `य़`) * Such forms should _not_ be in the layout. They will apply to all layouts of that language, even custom ones. * The popup keys will be added to the "_Language_" popup key group (relevant for setting popup key order).