diff options
| author | Franck Bui <fbui@suse.com> | 2021-05-19 10:18:21 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2021-05-19 21:34:40 +0200 |
| commit | 0495728429096a405b1d2cf1fa283a90c30ebaa9 (patch) | |
| tree | 09d12bc8c2ccc81a76b3c6319e30b03ffc80ea73 /src/locale | |
| parent | 834f3ba1a0a6ac8ea4607d380feeeba9d2edd43d (diff) | |
| download | systemd-0495728429096a405b1d2cf1fa283a90c30ebaa9.tar.gz | |
kbd-model-map: add mapping 'es-dvorak'
And update test-keymap-util accordingly.
While at it, make sure to use tabs everywhere.
Diffstat (limited to 'src/locale')
| -rw-r--r-- | src/locale/kbd-model-map | 5 | ||||
| -rw-r--r-- | src/locale/test-keymap-util.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/locale/kbd-model-map b/src/locale/kbd-model-map index 8fa984f83b..81d55853ca 100644 --- a/src/locale/kbd-model-map +++ b/src/locale/kbd-model-map @@ -1,4 +1,4 @@ -# Generated from system-config-keyboard's model list +# Originally generated from system-config-keyboard's model list. # consolelayout xlayout xmodel xvariant xoptions sg ch pc105 de_nodeadkeys terminate:ctrl_alt_bksp nl nl pc105 - terminate:ctrl_alt_bksp @@ -63,6 +63,7 @@ by by,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll il il pc105 - terminate:ctrl_alt_bksp kazakh kz,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll lt.baltic lt pc105 - terminate:ctrl_alt_bksp -lt.l4 lt pc105 - terminate:ctrl_alt_bksp +lt.l4 lt pc105 - terminate:ctrl_alt_bksp lt lt pc105 - terminate:ctrl_alt_bksp khmer kh,us pc105 - terminate:ctrl_alt_bksp +es-dvorak es microsoftpro dvorak terminate:ctrl_alt_bksp diff --git a/src/locale/test-keymap-util.c b/src/locale/test-keymap-util.c index bded122399..6f60aba38c 100644 --- a/src/locale/test-keymap-util.c +++ b/src/locale/test-keymap-util.c @@ -93,9 +93,9 @@ static void test_vconsole_convert_to_x11(void) { log_info("/* test with known variant, new mapping (es:dvorak) */"); assert_se(free_and_strdup(&c.vc_keymap, "es-dvorak") >= 0); - assert_se(vconsole_convert_to_x11(&c) == 0); // FIXME + assert_se(vconsole_convert_to_x11(&c) == 1); assert_se(streq(c.x11_layout, "es")); - assert_se(c.x11_variant == NULL); // FIXME: "dvorak" + assert_se(streq(c.x11_variant, "dvorak")); log_info("/* test with old mapping (fr:latin9) */"); assert_se(free_and_strdup(&c.vc_keymap, "fr-latin9") >= 0); |