fix inclusion of separator in language popup keys

This commit is contained in:
Helium314 2024-02-14 11:21:47 +01:00
parent b4a223ae67
commit daa20a1c2c

View file

@ -130,13 +130,13 @@ class LocaleKeyboardInfos(dataStream: InputStream?, locale: Locale) {
val priorityMarkerIndex = split.indexOf("%") val priorityMarkerIndex = split.indexOf("%")
if (priorityMarkerIndex > 0) { if (priorityMarkerIndex > 0) {
val existingPriorityPopupKeys = priorityPopupKeys[key] val existingPriorityPopupKeys = priorityPopupKeys[key]
priorityPopupKeys[key] = if (existingPriorityPopupKeys == null) val newPriorityPopupKeys = split.subList(1, priorityMarkerIndex)
split.subList(1, priorityMarkerIndex) priorityPopupKeys[key] = if (existingPriorityPopupKeys == null) newPriorityPopupKeys
else existingPriorityPopupKeys + split.subList(1, priorityMarkerIndex) else existingPriorityPopupKeys + newPriorityPopupKeys
val existingPopupKeys = popupKeys[key] val existingPopupKeys = popupKeys[key]
popupKeys[key] = if (existingPopupKeys == null) val newPopupKeys = split.subList(priorityMarkerIndex + 1, split.size)
split.subList(priorityMarkerIndex, split.size) popupKeys[key] = if (existingPopupKeys == null) newPopupKeys
else existingPopupKeys + split.subList(priorityMarkerIndex, split.size) else existingPopupKeys + newPopupKeys
} else { } else {
// a but more special treatment, this should not occur together with priority marker (but technically could) // a but more special treatment, this should not occur together with priority marker (but technically could)
val existingPopupKeys = popupKeys[key] val existingPopupKeys = popupKeys[key]