diff options
| -rw-r--r-- | Base/res/keymaps/en-gb.json (renamed from Base/res/keymaps/gb.json) | 0 | ||||
| -rw-r--r-- | Base/res/keymaps/en-us.json (renamed from Base/res/keymaps/en.json) | 0 | ||||
| -rw-r--r-- | Base/res/keymaps/pt-br.json (renamed from Base/res/keymaps/ptbr.json) | 0 | ||||
| -rw-r--r-- | Base/res/keymaps/pt-pt.json (renamed from Base/res/keymaps/ptpt.json) | 0 | ||||
| -rw-r--r-- | Base/usr/share/man/man1/keymap.md | 4 | ||||
| -rw-r--r-- | Kernel/Devices/KeyboardDevice.cpp | 2 | ||||
| -rw-r--r-- | Userland/Utilities/keymap.cpp | 2 |
7 files changed, 4 insertions, 4 deletions
diff --git a/Base/res/keymaps/gb.json b/Base/res/keymaps/en-gb.json index e8afb3bc60..e8afb3bc60 100644 --- a/Base/res/keymaps/gb.json +++ b/Base/res/keymaps/en-gb.json diff --git a/Base/res/keymaps/en.json b/Base/res/keymaps/en-us.json index 3f39bdb447..3f39bdb447 100644 --- a/Base/res/keymaps/en.json +++ b/Base/res/keymaps/en-us.json diff --git a/Base/res/keymaps/ptbr.json b/Base/res/keymaps/pt-br.json index b833afb0df..b833afb0df 100644 --- a/Base/res/keymaps/ptbr.json +++ b/Base/res/keymaps/pt-br.json diff --git a/Base/res/keymaps/ptpt.json b/Base/res/keymaps/pt-pt.json index 05a52fe569..05a52fe569 100644 --- a/Base/res/keymaps/ptpt.json +++ b/Base/res/keymaps/pt-pt.json diff --git a/Base/usr/share/man/man1/keymap.md b/Base/usr/share/man/man1/keymap.md index b75a1438d3..7f9c04f14b 100644 --- a/Base/usr/share/man/man1/keymap.md +++ b/Base/usr/share/man/man1/keymap.md @@ -18,11 +18,11 @@ Loading by name will search for keyboard layout files in `/res/keymaps/*.json`. Load a keyboard layout by name: ```sh -# keymap en +# keymap en-us ``` Load a keyboard layout using a file: ```sh -# keymap /res/keymaps/en.json +# keymap /res/keymaps/en-us.json # keymap ./map.json ``` diff --git a/Kernel/Devices/KeyboardDevice.cpp b/Kernel/Devices/KeyboardDevice.cpp index eef7e8f59b..e6c737e01b 100644 --- a/Kernel/Devices/KeyboardDevice.cpp +++ b/Kernel/Devices/KeyboardDevice.cpp @@ -404,7 +404,7 @@ KeyboardDevice::KeyboardDevice() : IRQHandler(IRQ_KEYBOARD) , CharacterDevice(85, 1) , m_controller(I8042Controller::the()) - , m_character_map("en", DEFAULT_CHARACTER_MAP) + , m_character_map("en-us", DEFAULT_CHARACTER_MAP) { } diff --git a/Userland/Utilities/keymap.cpp b/Userland/Utilities/keymap.cpp index 1f67810a36..024ca5eaa1 100644 --- a/Userland/Utilities/keymap.cpp +++ b/Userland/Utilities/keymap.cpp @@ -73,7 +73,7 @@ int main(int argc, char** argv) auto character_map = Keyboard::CharacterMap::load_from_file(path); if (!character_map.has_value()) { warnln("Cannot read keymap {}", path); - warnln("Hint: Must be either a keymap name (e.g. 'en') or a full path."); + warnln("Hint: Must be either a keymap name (e.g. 'en-us') or a full path."); return 1; } |