From 210c705954e4286d0b9835888499834c00d35e0e Mon Sep 17 00:00:00 2001 From: Sergey Mihailov Date: Nov 11 2020 08:44:41 +0000 Subject: [PATCH 1/2] Update l10n/fedora-live-workstation-ru_RU.ks add keyboard layout in X11 --- diff --git a/l10n/fedora-live-workstation-ru_RU.ks b/l10n/fedora-live-workstation-ru_RU.ks index cfc7656..c0e9f09 100644 --- a/l10n/fedora-live-workstation-ru_RU.ks +++ b/l10n/fedora-live-workstation-ru_RU.ks @@ -1,7 +1,10 @@ # fedora-live-workstation-ru_RU.ks # +# Description: +# - Russian Fedora Live Spin with the Gnome Desktop Environment +# # Maintainer(s): -# Sergey Mihailov +# - Sergey Mihailov %include ../fedora-live-workstation.ks @@ -11,9 +14,25 @@ timezone Europe/Moscow %packages langpacks-ru -hunspell-ru # exclude input methods -m17n* -scim* +-iok +%end + +%post +# add keyboard layout in X11 +cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF" +# Written by systemd-localed(8), read by systemd-localed and Xorg. It's +# probably wise not to edit this file manually. Use localectl(1) to +# instruct systemd-localed to update it. +Section "InputClass" + Identifier "system-keyboard" + MatchIsKeyboard "on" + Option "XkbLayout" "us,ru" + Option "XkbVariant" "," + Option "XkbOptions" "grp:alt_shift_toggle" +EndSection +EOF %end From 9622997f4d2ea5e2ec2ffe6b1c613e97ac61b761 Mon Sep 17 00:00:00 2001 From: Sergey Mihailov Date: Nov 11 2020 10:12:23 +0000 Subject: [PATCH 2/2] add keyboard layout in X11 Signed-off-by: Sergey Mihailov --- diff --git a/l10n/fedora-live-games-ru_RU.ks b/l10n/fedora-live-games-ru_RU.ks new file mode 100644 index 0000000..aacfc85 --- /dev/null +++ b/l10n/fedora-live-games-ru_RU.ks @@ -0,0 +1,38 @@ +# fedora-live-games-ru_RU.ks +# +# Description: +# - Russian Fedora Live Spin with the game Desktop Environment +# +# Maintainer(s): +# - Sergey Mihailov + +%include ../fedora-live-games.ks + +lang ru_RU.UTF-8 +keyboard ru +timezone Europe/Moscow + +%packages +langpacks-ru + +# exclude input methods +-m17n* +-scim* +-iok +%end + +%post +# add keyboard layout in X11 +cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF" +# Written by systemd-localed(8), read by systemd-localed and Xorg. It's +# probably wise not to edit this file manually. Use localectl(1) to +# instruct systemd-localed to update it. +Section "InputClass" + Identifier "system-keyboard" + MatchIsKeyboard "on" + Option "XkbLayout" "us,ru" + Option "XkbVariant" "," + Option "XkbOptions" "grp:alt_shift_toggle" +EndSection +EOF +%end diff --git a/l10n/fedora-live-kde-ru_RU.ks b/l10n/fedora-live-kde-ru_RU.ks new file mode 100644 index 0000000..51e3b8a --- /dev/null +++ b/l10n/fedora-live-kde-ru_RU.ks @@ -0,0 +1,38 @@ +# fedora-live-kde-ru_RU.ks +# +# Description: +# - Russian Fedora Live Spin with the K Desktop Environment (KDE), default 1.4 GB version +# +# Maintainer(s): +# - Sergey Mihailov + +%include ../fedora-live-kde.ks + +lang ru_RU.UTF-8 +keyboard ru +timezone Europe/Moscow + +%packages +langpacks-ru + +# exclude input methods +-m17n* +-scim* +-iok +%end + +%post +# add keyboard layout in X11 +cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF" +# Written by systemd-localed(8), read by systemd-localed and Xorg. It's +# probably wise not to edit this file manually. Use localectl(1) to +# instruct systemd-localed to update it. +Section "InputClass" + Identifier "system-keyboard" + MatchIsKeyboard "on" + Option "XkbLayout" "us,ru" + Option "XkbVariant" "," + Option "XkbOptions" "grp:alt_shift_toggle" +EndSection +EOF +%end diff --git a/l10n/fedora-live-lxde-ru_RU.ks b/l10n/fedora-live-lxde-ru_RU.ks new file mode 100644 index 0000000..876d374 --- /dev/null +++ b/l10n/fedora-live-lxde-ru_RU.ks @@ -0,0 +1,39 @@ +# fedora-live-lxde-ru_RU.ks +# +# Description: +# - Russian Fedora Live Spin with the light-weight LXDE Desktop Environment +# +# Maintainer(s): +# - Sergey Mihailov + +%include ../fedora-live-lxde.ks + +lang ru_RU.UTF-8 +keyboard ru +timezone Europe/Moscow + +%packages +langpacks-ru + +# exclude input methods +-ibus* +-m17n* +-scim* +-iok +%end + +%post +# add keyboard layout in X11 +cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF" +# Written by systemd-localed(8), read by systemd-localed and Xorg. It's +# probably wise not to edit this file manually. Use localectl(1) to +# instruct systemd-localed to update it. +Section "InputClass" + Identifier "system-keyboard" + MatchIsKeyboard "on" + Option "XkbLayout" "us,ru" + Option "XkbVariant" "," + Option "XkbOptions" "grp:alt_shift_toggle" +EndSection +EOF +%end diff --git a/l10n/fedora-live-xfce-ru_RU.ks b/l10n/fedora-live-xfce-ru_RU.ks new file mode 100644 index 0000000..bbf5c2a --- /dev/null +++ b/l10n/fedora-live-xfce-ru_RU.ks @@ -0,0 +1,38 @@ +# fedora-live-xfce-ru_RU.ks +# +# Description: +# - Russian Fedora Live Spin with the Xfce Desktop Environment +# +# Maintainer(s): +# - Sergey Mihailov + +%include ../fedora-live-xfce.ks + +lang ru_RU.UTF-8 +keyboard ru +timezone Europe/Moscow + +%packages +langpacks-ru + +# exclude input methods +-m17n* +-scim* +-iok +%end + +%post +# add keyboard layout in X11 +cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF" +# Written by systemd-localed(8), read by systemd-localed and Xorg. It's +# probably wise not to edit this file manually. Use localectl(1) to +# instruct systemd-localed to update it. +Section "InputClass" + Identifier "system-keyboard" + MatchIsKeyboard "on" + Option "XkbLayout" "us,ru" + Option "XkbVariant" "," + Option "XkbOptions" "grp:alt_shift_toggle" +EndSection +EOF +%end diff --git a/l10n/fedora-livecd-kde-ru_RU.ks b/l10n/fedora-livecd-kde-ru_RU.ks deleted file mode 100644 index f708017..0000000 --- a/l10n/fedora-livecd-kde-ru_RU.ks +++ /dev/null @@ -1,19 +0,0 @@ -# fedora-livecd-kde-ru_RU.ks -# -# Maintainer(s): -# - Sergey Mihailov - -%include ../fedora-livecd-kde.ks - -lang ru_RU.UTF-8 -keyboard ru -timezone Europe/Moscow - -%packages -langpacks-ru -hunspell-ru - -# exclude input methods --m17n* --scim* -%end diff --git a/l10n/fedora-livecd-lxde-ru_RU.ks b/l10n/fedora-livecd-lxde-ru_RU.ks deleted file mode 100644 index 8cd9e91..0000000 --- a/l10n/fedora-livecd-lxde-ru_RU.ks +++ /dev/null @@ -1,23 +0,0 @@ -# fedora-livecd-lxde-ru_RU.ks -# -# Description: -# - German Fedora Live Spin with the light-weight LXDE Desktop Environment -# -# Maintainer(s): -# - Sergey Mihailov - -%include ../fedora-livecd-lxde.ks - -lang ru_RU.UTF-8 -keyboard ru -timezone Europe/Moscow - -%packages -langpacks-ru -hunspell-ru - -# exclude input methods --ibus* --m17n* --scim* -%end diff --git a/l10n/fedora-livecd-xfce-ru_RU.ks b/l10n/fedora-livecd-xfce-ru_RU.ks deleted file mode 100644 index 15cebb2..0000000 --- a/l10n/fedora-livecd-xfce-ru_RU.ks +++ /dev/null @@ -1,19 +0,0 @@ -# fedora-livecd-xfce-ru_RU.ks -# -# Maintainer(s): -# - Sergey Mihailov - -%include ../fedora-live-xfce.ks - -lang ru_RU.UTF-8 -keyboard ru -timezone Europe/Moscow - -%packages -langpacks-ru -hunspell-ru - -# exclude input methods --m17n* --scim* -%end diff --git a/l10n/fedora-livedvd-electronic-lab-ru_RU.ks b/l10n/fedora-livedvd-electronic-lab-ru_RU.ks deleted file mode 100644 index e192e90..0000000 --- a/l10n/fedora-livedvd-electronic-lab-ru_RU.ks +++ /dev/null @@ -1,19 +0,0 @@ -# fedora-livecd-electronic-lab-ru_RU.ks -# -# Maintainer(s): -# - Sergey Mihailov - -%include ../fedora-livedvd-electronic-lab.ks - -lang ru_RU.UTF-8 -keyboard ru -timezone Europe/Moscow - -%packages -langpacks-ru -hunspell-ru - -# exclude input methods --m17n* --scim* -%end diff --git a/l10n/fedora-livedvd-games-ru_RU.ks b/l10n/fedora-livedvd-games-ru_RU.ks deleted file mode 100644 index 080bf16..0000000 --- a/l10n/fedora-livedvd-games-ru_RU.ks +++ /dev/null @@ -1,19 +0,0 @@ -# fedora-livedvd-games-ru_RU.ks -# -# Maintainer(s): -# - Sergey Mihailov - -%include ../fedora-livedvd-games.ks - -lang ru_RU.UTF-8 -keyboard ru -timezone Europe/Moscow - -%packages -langpacks-ru -hunspell-ru - -# exclude input methods --m17n* --scim* -%end