rpms
/
anaconda
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sets default language to Russian and updates translations

Browse Source 
Other changes:

  - refactored product config file
  - enabled the security module back
al changed/i9/anaconda-34.25.1.14-1.el9.inferit.2
Eugene Zamriy 2 years ago
parent 23a0c6c303
commit 0ea2dff56c
Signed by: ezamriy
GPG Key ID: 7EBF95C7DCFA496C
9 changed files with 138 additions and 61 deletions
Show Stats Download Patch File Download Diff File

8
SOURCES/0001-Disable-subscription.patch
Unescape View File

@ -1,7 +1,7 @@
From 73155661b46fdf9a594a81f7b17503e8556e2f6b Mon Sep 17 00:00:00 2001 From 43beb494917313ac14162bdbdebec5e4c0535ab2 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru> From: Eugene Zamriy <eugene@zamriy.info>
Date: Wed, 29 Mar 2023 22:57:50 +0300 Date: Fri, 14 Apr 2023 12:53:14 +0300
Subject: [PATCH 1/7] Disable subscription Subject: [PATCH 1/8] Disable subscription
--- ---
pyanaconda/ui/gui/spokes/subscription.py | 4 ++++ pyanaconda/ui/gui/spokes/subscription.py | 4 ++++

8
SOURCES/0002-Hide-CDN-source-button.patch
Unescape View File

@ -1,7 +1,7 @@
From 25eee641eba7207fd9ea96435ed85396f5f4c23b Mon Sep 17 00:00:00 2001 From fb69814d80916e845f75e846e1f7fc62b0f6be4e Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru> From: Eugene Zamriy <eugene@zamriy.info>
Date: Wed, 29 Mar 2023 23:09:28 +0300 Date: Fri, 14 Apr 2023 12:54:58 +0300
Subject: [PATCH 2/7] Hide CDN source button Subject: [PATCH 2/8] Hide CDN source button
--- ---
pyanaconda/ui/gui/spokes/installation_source.py | 2 ++ pyanaconda/ui/gui/spokes/installation_source.py | 2 ++

8
SOURCES/0003-Set-MSVSphere-installer-colors.patch
Unescape View File

@ -1,7 +1,7 @@
From 0d594c013ed36cdff18019650cb279c65f64cca2 Mon Sep 17 00:00:00 2001 From 6259f45d5b9ca608092d41e3588c89dc53e2dfe0 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru> From: Eugene Zamriy <eugene@zamriy.info>
Date: Wed, 29 Mar 2023 23:37:33 +0300 Date: Fri, 14 Apr 2023 12:56:19 +0300
Subject: [PATCH 3/7] Set MSVSphere installer colors Subject: [PATCH 3/8] Set MSVSphere installer colors
--- ---
data/anaconda-gtk.css | 3 ++- data/anaconda-gtk.css | 3 ++-

8
SOURCES/0004-Add-Minimal-repository-support.patch
Unescape View File

@ -1,7 +1,7 @@
From 50fb07a64192d2d84a1a58d1722a1f6263928cf1 Mon Sep 17 00:00:00 2001 From e91fd0e488aa11e862436967bf74e67f0f9e708c Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru> From: Eugene Zamriy <eugene@zamriy.info>
Date: Wed, 29 Mar 2023 23:41:01 +0300 Date: Fri, 14 Apr 2023 12:56:53 +0300
Subject: [PATCH 4/7] Add Minimal repository support Subject: [PATCH 4/8] Add Minimal repository support
--- ---
pyanaconda/core/constants.py | 3 ++- pyanaconda/core/constants.py | 3 ++-

8
SOURCES/0007-Set-default-timezone-to-Europe-Moscow.patch → SOURCES/0005-Set-default-timezone-to-Europe-Moscow.patch
Unescape View File

@ -1,7 +1,7 @@
From 60164bb113584e4cfd8a419735205398caa6b81d Mon Sep 17 00:00:00 2001 From fee4e1b76754b302d839489bb246a97e3f29e6bd Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru> From: Eugene Zamriy <eugene@zamriy.info>
Date: Mon, 3 Apr 2023 21:38:38 +0300 Date: Fri, 14 Apr 2023 12:59:20 +0300
Subject: [PATCH 7/7] Set default timezone to Europe/Moscow Subject: [PATCH 5/8] Set default timezone to Europe/Moscow
--- ---
pyanaconda/modules/timezone/installation.py | 4 ++-- pyanaconda/modules/timezone/installation.py | 4 ++--

28
SOURCES/0006-Add-MSVSphere-product-config.patch
Unescape View File

@ -1,19 +1,19 @@
From 10a65585496da65de7168bb1d42e61020e832f1d Mon Sep 17 00:00:00 2001 From d97bf592c01bd9291f1be345e124f91f976f273d Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru> From: Eugene Zamriy <eugene@zamriy.info>
Date: Thu, 30 Mar 2023 00:11:34 +0300 Date: Fri, 14 Apr 2023 14:59:53 +0300
Subject: [PATCH 6/7] Add MSVSphere product config Subject: [PATCH 6/8] Add MSVSphere product config
--- ---
data/product.d/msvsphere.conf | 29 +++++++++++++++++++++++++++++ data/product.d/msvsphere.conf | 21 +++++++++++++++++++++
1 file changed, 29 insertions(+) 1 file changed, 21 insertions(+)
create mode 100644 data/product.d/msvsphere.conf create mode 100644 data/product.d/msvsphere.conf
diff --git a/data/product.d/msvsphere.conf b/data/product.d/msvsphere.conf diff --git a/data/product.d/msvsphere.conf b/data/product.d/msvsphere.conf
new file mode 100644 new file mode 100644
index 0000000..dc534c9 index 0000000..baaf497
--- /dev/null --- /dev/null
+++ b/data/product.d/msvsphere.conf +++ b/data/product.d/msvsphere.conf
@@ -0,0 +1,29 @@ @@ -0,0 +1,21 @@
+# Anaconda configuration file for MSVSphere. +# Anaconda configuration file for MSVSphere.
+ +
+[Product] +[Product]
@ -23,16 +23,8 @@ index 0000000..dc534c9
+product_name = Red Hat Enterprise Linux +product_name = Red Hat Enterprise Linux
+ +
+[Anaconda] +[Anaconda]
+# List of enabled Anaconda DBus modules for RHEL. +forbidden_modules =
+# but without org.fedoraproject.Anaconda.Modules.Subscription + org.fedoraproject.Anaconda.Modules.Subscription
+kickstart_modules =
+ org.fedoraproject.Anaconda.Modules.Timezone
+ org.fedoraproject.Anaconda.Modules.Network
+ org.fedoraproject.Anaconda.Modules.Localization
+ org.fedoraproject.Anaconda.Modules.Users
+ org.fedoraproject.Anaconda.Modules.Payloads
+ org.fedoraproject.Anaconda.Modules.Storage
+ org.fedoraproject.Anaconda.Modules.Services
+ +
+[Bootloader] +[Bootloader]
+efi_dir = msvsphere +efi_dir = msvsphere

25
SOURCES/0007-Set-Russian-language-as-default.patch
Unescape View File

@ -0,0 +1,25 @@
From fc39f04ced7a7e67f9a741eebdc131e63fa508c9 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Fri, 14 Apr 2023 18:00:57 +0300
Subject: [PATCH 7/8] Set Russian language as default
---
pyanaconda/core/constants.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
index 874c785..5122035 100644
--- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py
@@ -71,7 +71,7 @@ ANACONDA_CONFIG_DIR = "/etc/anaconda/"
ANACONDA_CONFIG_TMP = "/run/anaconda/anaconda.conf"
# NOTE: this should be LANG_TERRITORY.CODESET, e.g. en_US.UTF-8
-DEFAULT_LANG = "en_US.UTF-8"
+DEFAULT_LANG = "ru_RU.UTF-8"
DEFAULT_VC_FONT = "eurlatgr"
--
2.39.2

94
SOURCES/0005-Change-Fedora-references-to-MSVSphere.patch → SOURCES/0008-Replace-Fedora-references-and-update-translations.patch
Unescape View File

@ -1,25 +1,26 @@
From f28728f85b810f291666ef6334b4c3dbf1347ef2 Mon Sep 17 00:00:00 2001 From a5499e44e4f1fb26bc9e831e3fa51b7a81c61825 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru> From: Eugene Zamriy <eugene@zamriy.info>
Date: Thu, 30 Mar 2023 00:09:57 +0300 Date: Fri, 14 Apr 2023 18:23:29 +0300
Subject: [PATCH 5/7] Change Fedora references to MSVSphere Subject: [PATCH 8/8] Replace Fedora references and update translations
--- ---
data/liveinst/gnome/fedora-welcome.desktop | 2 +- data/liveinst/gnome/fedora-welcome.desktop | 3 +-
data/liveinst/gnome/fedora-welcome.js | 6 ++--- data/liveinst/gnome/fedora-welcome.js | 6 ++--
docs/intro.rst | 4 ++-- docs/intro.rst | 4 +--
docs/iscsi.rst | 2 +- docs/iscsi.rst | 2 +-
po/ru.po | 28 +++++++++++----------- po/ru.po | 42 +++++++++++-----------
pyanaconda/core/constants.py | 4 ++-- pyanaconda/core/constants.py | 4 +--
6 files changed, 23 insertions(+), 23 deletions(-) 6 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/fedora-welcome.desktop diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/fedora-welcome.desktop
index 60e5c38..8b6fefb 100644 index 60e5c38..90f5678 100644
--- a/data/liveinst/gnome/fedora-welcome.desktop --- a/data/liveinst/gnome/fedora-welcome.desktop
+++ b/data/liveinst/gnome/fedora-welcome.desktop +++ b/data/liveinst/gnome/fedora-welcome.desktop
@@ -1,5 +1,5 @@ @@ -1,5 +1,6 @@
[Desktop Entry] [Desktop Entry]
-Name=Welcome to Fedora -Name=Welcome to Fedora
+Name=Welcome to MSVSphere +Name=Welcome to MSVSphere
+Name[ru]=Добро пожаловать в МСВСфера
Exec=/usr/share/anaconda/gnome/fedora-welcome Exec=/usr/share/anaconda/gnome/fedora-welcome
Terminal=false Terminal=false
Type=Application Type=Application
@ -83,9 +84,18 @@ index 847078d..6d9c4b3 100644
diff --git a/po/ru.po b/po/ru.po diff --git a/po/ru.po b/po/ru.po
index e461fe9..51b1b34 100644 index e461fe9..f9709cf 100644
--- a/po/ru.po --- a/po/ru.po
+++ b/po/ru.po +++ b/po/ru.po
@@ -987,7 +987,7 @@ msgid ""
"recommended for a normal %(productName)s install."
msgstr ""
"Размер раздела %(mount)s меньше %(size)s, что меньше рекомендованного "
-"размера для обычной установки %(productName)s."
+"размера для обычной установки МСВСфера."
#: pyanaconda/modules/storage/checker/utils.py:131
#, python-format
@@ -1477,13 +1477,13 @@ msgstr "" @@ -1477,13 +1477,13 @@ msgstr ""
#: pyanaconda/core/constants.py:159 #: pyanaconda/core/constants.py:159
@ -100,12 +110,58 @@ index e461fe9..51b1b34 100644
-"Это аппаратное обеспечение (или их комбинация) не поддерживается Red Hat. " -"Это аппаратное обеспечение (или их комбинация) не поддерживается Red Hat. "
-"Для получения дополнительной информации о поддерживаемом оборудовании см. " -"Для получения дополнительной информации о поддерживаемом оборудовании см. "
-"http://www.redhat.com/hardware." -"http://www.redhat.com/hardware."
+"Это аппаратное обеспечение (или их комбинация) не поддерживается ОС " +"Это аппаратное обеспечение (или их комбинация) не поддерживается "
+"МСВСфера. Для получения дополнительной информации о поддерживаемом " +"МСВСфера. Для получения дополнительной информации о поддерживаемом "
+"оборудовании см. https://msvsphere.ru." +"оборудовании см. https://msvsphere.ru."
#: pyanaconda/core/constants.py:165 #: pyanaconda/core/constants.py:165
msgid "" msgid ""
@@ -2027,12 +2027,12 @@ msgstr "Сетевые устройства недоступны"
#: pyanaconda/vnc.py:79
#, python-format
msgid "%(productName)s %(productVersion)s installation"
-msgstr "Установка %(productName)s %(productVersion)s"
+msgstr "Установка МСВСфера %(productVersion)s"
#: pyanaconda/vnc.py:148
#, python-format
msgid "%(productName)s %(productVersion)s installation on host %(name)s"
-msgstr "Установка %(productName)s %(productVersion)s на %(name)s"
+msgstr "Установка МСВСфера %(productVersion)s на %(name)s"
#: pyanaconda/vnc.py:167
#, python-format
@@ -2153,7 +2153,7 @@ msgstr ""
#: pyanaconda/product.py:69
#, python-format
msgid "%(productName)s %(productVersion)s INSTALLATION"
-msgstr "УСТАНОВКА %(productName)s %(productVersion)s"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s"
#: pyanaconda/payload/live/payload_base.py:73
#: pyanaconda/payload/live/payload_liveos.py:93
@@ -2286,7 +2286,7 @@ msgstr "Заполните отмеченные секции, прежде че
#: pyanaconda/ui/gui/spokes/welcome.py:274
#, python-format
msgid "WELCOME TO %(name)s %(version)s."
-msgstr "ДОБРО ПОЖАЛОВАТЬ В %(name)s %(version)s."
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s."
#: pyanaconda/ui/gui/spokes/user.py:68
msgid "Invalid group name."
@@ -2456,10 +2456,10 @@ msgid ""
"could add more disks for additional space, modify your software selection to "
"install a smaller version of <b>%(productName)s</b>, or quit the installer."
msgstr ""
-"<b>Недостаточно места для установки %(productName)s</b>, даже если "
+"<b>Недостаточно места для установки МСВСфера</b>, даже если "
"использовать всё свободное место на выбранных дисках. Можно добавить ещё "
"диски, чтобы получить дополнительное место, изменить выбор программного "
-"обеспечения, чтобы установить меньший вариант <b>%(productName)s</b>, или "
+"обеспечения, чтобы установить меньший вариант <b>МСВСфера</b>, или "
"покинуть программу установки."
#: pyanaconda/ui/gui/spokes/lib/accordion.py:423
@@ -7442,25 +7442,25 @@ msgstr "Установить Live CD на жёсткий диск" @@ -7442,25 +7442,25 @@ msgstr "Установить Live CD на жёсткий диск"
#: data/liveinst/gnome/fedora-welcome.desktop:3 #: data/liveinst/gnome/fedora-welcome.desktop:3
@ -113,7 +169,7 @@ index e461fe9..51b1b34 100644
-msgid "Welcome to Fedora" -msgid "Welcome to Fedora"
-msgstr "Добро пожаловать в Fedora" -msgstr "Добро пожаловать в Fedora"
+msgid "Welcome to MSVSphere" +msgid "Welcome to MSVSphere"
+msgstr "Добро пожаловать в ОС МСВСфера" +msgstr "Добро пожаловать в МСВСфера"
#: data/liveinst/liveinst-setup.desktop:4 #: data/liveinst/liveinst-setup.desktop:4
msgid "Liveinst Setup" msgid "Liveinst Setup"
@ -123,7 +179,7 @@ index e461fe9..51b1b34 100644
-msgid "Try Fedora" -msgid "Try Fedora"
-msgstr "Попробуйте Fedora" -msgstr "Попробуйте Fedora"
+msgid "Try MSVSphere" +msgid "Try MSVSphere"
+msgstr "Попробуйте ОС МСВСфера" +msgstr "Попробуйте МСВСфера"
#: data/liveinst/gnome/fedora-welcome.js:110 #: data/liveinst/gnome/fedora-welcome.js:110
msgid "" msgid ""
@ -135,13 +191,13 @@ index e461fe9..51b1b34 100644
msgstr "" msgstr ""
-"Fedora запущена с установочного диска.\n" -"Fedora запущена с установочного диска.\n"
-"Вы можете установить Fedora сейчас или в любое время выбрать «Установить на " -"Вы можете установить Fedora сейчас или в любое время выбрать «Установить на "
+"ОС МСВСфера запущена с установочного диска.\n" +"МСВСфера запущена с установочного диска.\n"
+"Вы можете установить ОС МСВСфера сейчас или в любое время выбрать «Установить на " +"Вы можете установить МСВСфера сейчас или в любое время выбрать «Установить на "
"жесткий диск» в меню «Обзор»." "жесткий диск» в меню «Обзор»."
#: data/liveinst/gnome/fedora-welcome.js:130 #: data/liveinst/gnome/fedora-welcome.js:130
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
index 874c785..fc4df60 100644 index 5122035..b3c574c 100644
--- a/pyanaconda/core/constants.py --- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py +++ b/pyanaconda/core/constants.py
@@ -157,8 +157,8 @@ WARNING_SUPPORT_REMOVED = N_( @@ -157,8 +157,8 @@ WARNING_SUPPORT_REMOVED = N_(

12
SPECS/anaconda.spec
Unescape View File

@ -1,7 +1,7 @@
Summary: Graphical system installer Summary: Graphical system installer
Name: anaconda Name: anaconda
Version: 34.25.1.14 Version: 34.25.1.14
Release: 1%{?dist}.inferit.1 Release: 1%{?dist}.inferit.2
License: GPLv2+ and MIT License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda URL: http://fedoraproject.org/wiki/Anaconda
@ -17,9 +17,10 @@ Patch1001: 0001-Disable-subscription.patch
Patch1002: 0002-Hide-CDN-source-button.patch Patch1002: 0002-Hide-CDN-source-button.patch
Patch1003: 0003-Set-MSVSphere-installer-colors.patch Patch1003: 0003-Set-MSVSphere-installer-colors.patch
Patch1004: 0004-Add-Minimal-repository-support.patch Patch1004: 0004-Add-Minimal-repository-support.patch
Patch1005: 0005-Change-Fedora-references-to-MSVSphere.patch Patch1005: 0005-Set-default-timezone-to-Europe-Moscow.patch
Patch1006: 0006-Add-MSVSphere-product-config.patch Patch1006: 0006-Add-MSVSphere-product-config.patch
Patch1007: 0007-Set-default-timezone-to-Europe-Moscow.patch Patch1007: 0007-Set-Russian-language-as-default.patch
Patch1008: 0008-Replace-Fedora-references-and-update-translations.patch
# Versions of required components (done so we make sure the buildrequires # Versions of required components (done so we make sure the buildrequires
# match the requires versions of things). # match the requires versions of things).
@ -420,9 +421,12 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
%{_prefix}/libexec/anaconda/dd_* %{_prefix}/libexec/anaconda/dd_*
%changelog %changelog
* Fri Apr 14 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 34.25.1.14-1.inferit.2
- Set default language to ru_RU.UTF-8
- Translated distribution name in Russian translation
* Mon Apr 03 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 34.25.1.14-1.inferit.1 * Mon Apr 03 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 34.25.1.14-1.inferit.1
- Set default time zone to Europe/Moscow - Set default time zone to Europe/Moscow
- Disabled Security module until we have OpenScap workable
* Thu Mar 30 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 34.25.1.14-1.inferit * Thu Mar 30 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 34.25.1.14-1.inferit
- Added MSVSphere product config - Added MSVSphere product config

Write Preview
Loading…
Cancel
Save