瀏覽代碼

Base: Rename some keymaps to use xx-xx format where appropriate

- en.json -> en-us.json
- gb.json -> en-gb.json
- ptbr.json -> pt-br.json
- ptpt.json -> pt-pt.json
Linus Groh 4 年之前
父節點
當前提交
ee41d6e154

+ 0 - 0
Base/res/keymaps/gb.json → Base/res/keymaps/en-gb.json


+ 0 - 0
Base/res/keymaps/en.json → Base/res/keymaps/en-us.json


+ 0 - 0
Base/res/keymaps/ptbr.json → Base/res/keymaps/pt-br.json


+ 0 - 0
Base/res/keymaps/ptpt.json → Base/res/keymaps/pt-pt.json


+ 2 - 2
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
 ```

+ 1 - 1
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)
 {
 }
 

+ 1 - 1
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;
     }