From 4bdfd7cb64cef89672a7e6cf97a3e16ec5d33d91 Mon Sep 17 00:00:00 2001 From: Martin Vidner Date: Thu, 20 Apr 2023 15:49:54 +0200 Subject: [PATCH] Cleanup: use "ru" keymap for Russian, not "ruwin_alt-UTF-8" (bsc#1194609) ruwin_alt-UTF-8 was introduced in 2008 in response to https://bugzilla.suse.com/show_bug.cgi?id=432862 because the previous keymap did not use Unicode. "ru" does use Unicode, and it has a dual latin-cyrillic layout (AltGr for single characters, Ctrl-Shift for layout switching) In /usr/share/systemd/kbd-model-map the Russian keymap is a kbd-model-map.legacy SUSE patch over upstream, and as Franck Bui was reviewing this patch for upstreaming, we found that an entry for Russian is still needed, but a default "ru" keymap has a better chance than a specific one. --- dropping_kbd_legacy.md | 2 +- keyboard/src/lib/y2keyboard/keyboards.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dropping_kbd_legacy.md b/dropping_kbd_legacy.md index ad0bfa9e..306b3754 100644 --- a/dropping_kbd_legacy.md +++ b/dropping_kbd_legacy.md @@ -67,7 +67,7 @@ once, so removing kbd-legacy would break these languages als in X11. | Legacy keyboard map | Selected replacement | Other options | Note | | -------------------- | -------------------- | ------------- | --------- | | gr | ? | | Greek | -| ruwin_alt-UTF-8 | ? | | Russian | +| ru | ? | | Russian | | tj_alt-UTF8 | ? | | Tajik | | ua-utf | ? | | Ukrainian | diff --git a/keyboard/src/lib/y2keyboard/keyboards.rb b/keyboard/src/lib/y2keyboard/keyboards.rb index faff45e3..838bdb82 100644 --- a/keyboard/src/lib/y2keyboard/keyboards.rb +++ b/keyboard/src/lib/y2keyboard/keyboards.rb @@ -226,7 +226,7 @@ def self.always_present_keyboards }, { "description" => _("Russian"), "alias" => "russian", - "code" => "ruwin_alt-UTF-8", # not_in_xkb + "code" => "ru", # not_in_xkb "suggested_for_lang" => ["ru", "ru_RU.KOI8-R"] }, { "description" => _("Serbian"),