Whether politics are involved or not, this is a move from one insufficient solution (mapping keyboard layouts to expressed nationality) to another insufficient

Whether politics are involved or not, this is a move from one insufficient solution (mapping keyboard layouts to expressed nationality) to another insufficient solution (mapping keyboard layouts to two-character language codes). You really need both; there are layout/locale variations within the same language across countries (e.g. en-*: en-US, en-UK, etc.) and within the same country across languages (e.g. *-CA: en-CA, fr-CA). A naïve solution would be superimposing a two-letter language code on a flag, but if avoiding flag-related politics is part of the calculus here, maybe there's a better approach.