From dcac81f74610fa225b7e58a7648627cd704dc5df Mon Sep 17 00:00:00 2001 From: Eugene Zamriy Date: Sat, 29 Jul 2023 23:59:08 +0300 Subject: [PATCH] Adds MSVSphere ARM and Server identification support patch Also improved Russian translation. --- SOURCES/0001-Disable-subscription.patch | 6 +- SOURCES/0002-Hide-CDN-source-button.patch | 6 +- .../0003-Set-MSVSphere-installer-colors.patch | 10 +- ...inimal-and-Server-repository-support.patch | 21 +- ...et-default-timezone-to-Europe-Moscow.patch | 6 +- .../0006-Add-MSVSphere-product-config.patch | 6 +- ...0007-Set-Russian-language-as-default.patch | 10 +- ...a-references-and-update-translations.patch | 10 +- ...-as-default-language-for-new-regions.patch | 6 +- ...nglish-as-fallback-language-for-help.patch | 10 +- ...Add-MSVSphere-identification-support.patch | 421 ++++++++++++++++++ SOURCES/0011-Update-Russian-translation.patch | 145 ------ SPECS/anaconda.spec | 8 +- 13 files changed, 479 insertions(+), 186 deletions(-) create mode 100644 SOURCES/0011-Add-MSVSphere-identification-support.patch delete mode 100644 SOURCES/0011-Update-Russian-translation.patch diff --git a/SOURCES/0001-Disable-subscription.patch b/SOURCES/0001-Disable-subscription.patch index fe24f53..46473a1 100644 --- a/SOURCES/0001-Disable-subscription.patch +++ b/SOURCES/0001-Disable-subscription.patch @@ -1,7 +1,7 @@ -From 43beb494917313ac14162bdbdebec5e4c0535ab2 Mon Sep 17 00:00:00 2001 +From 74d0f49183defed29b2453349e799074898a5f08 Mon Sep 17 00:00:00 2001 From: Eugene Zamriy Date: Fri, 14 Apr 2023 12:53:14 +0300 -Subject: [PATCH 1/8] Disable subscription +Subject: [PATCH 01/11] Disable subscription --- pyanaconda/ui/gui/spokes/subscription.py | 4 ++++ @@ -23,5 +23,5 @@ index 9e74fc6..ef214b6 100644 NormalSpoke.initialize(self) self.initialize_start() -- -2.39.2 +2.41.0 diff --git a/SOURCES/0002-Hide-CDN-source-button.patch b/SOURCES/0002-Hide-CDN-source-button.patch index f52682b..93a32b7 100644 --- a/SOURCES/0002-Hide-CDN-source-button.patch +++ b/SOURCES/0002-Hide-CDN-source-button.patch @@ -1,7 +1,7 @@ -From fb69814d80916e845f75e846e1f7fc62b0f6be4e Mon Sep 17 00:00:00 2001 +From 56351f7b9524fdf810d523a0ed5156e0f1453ba0 Mon Sep 17 00:00:00 2001 From: Eugene Zamriy Date: Fri, 14 Apr 2023 12:54:58 +0300 -Subject: [PATCH 2/8] Hide CDN source button +Subject: [PATCH 02/11] Hide CDN source button --- pyanaconda/ui/gui/spokes/installation_source.py | 2 ++ @@ -21,5 +21,5 @@ index 8a0f463..adc85b5 100644 self._protocol_combo_box = self.builder.get_object("protocolComboBox") self._iso_chooser_button = self.builder.get_object("isoChooserButton") -- -2.39.2 +2.41.0 diff --git a/SOURCES/0003-Set-MSVSphere-installer-colors.patch b/SOURCES/0003-Set-MSVSphere-installer-colors.patch index 464e6d6..93e16c7 100644 --- a/SOURCES/0003-Set-MSVSphere-installer-colors.patch +++ b/SOURCES/0003-Set-MSVSphere-installer-colors.patch @@ -1,17 +1,17 @@ -From 6259f45d5b9ca608092d41e3588c89dc53e2dfe0 Mon Sep 17 00:00:00 2001 +From 513cd326ad706a71a7c5686dfe0f6adc0073722b Mon Sep 17 00:00:00 2001 From: Eugene Zamriy Date: Fri, 14 Apr 2023 12:56:19 +0300 -Subject: [PATCH 3/8] Set MSVSphere installer colors +Subject: [PATCH 03/11] Set MSVSphere installer colors --- data/anaconda-gtk.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/anaconda-gtk.css b/data/anaconda-gtk.css -index c47bb87..c7ac84c 100644 +index 516df62..ef6d79d 100644 --- a/data/anaconda-gtk.css +++ b/data/anaconda-gtk.css -@@ -92,10 +92,11 @@ infobar.error { +@@ -92,10 +92,11 @@ infobar.error box { @define-color redhat #2d2d2d; @define-color fedora #2f4265; @@ -25,5 +25,5 @@ index c47bb87..c7ac84c 100644 /* logo and sidebar classes */ -- -2.39.2 +2.41.0 diff --git a/SOURCES/0004-Add-Minimal-and-Server-repository-support.patch b/SOURCES/0004-Add-Minimal-and-Server-repository-support.patch index 9beaa15..0a5c90e 100644 --- a/SOURCES/0004-Add-Minimal-and-Server-repository-support.patch +++ b/SOURCES/0004-Add-Minimal-and-Server-repository-support.patch @@ -1,7 +1,17 @@ -diff -urN anaconda-34.25.2.10.orig/pyanaconda/core/constants.py anaconda-34.25.2.10/pyanaconda/core/constants.py ---- anaconda-34.25.2.10.orig/pyanaconda/core/constants.py 2023-07-08 08:53:04.204043791 +0300 -+++ anaconda-34.25.2.10/pyanaconda/core/constants.py 2023-07-08 08:56:24.293030663 +0300 -@@ -58,7 +58,9 @@ +From bf225c3ea3dcd23b23ca27e0fc0052ce933ef5d9 Mon Sep 17 00:00:00 2001 +From: Eugene Zamriy +Date: Fri, 28 Jul 2023 23:47:23 +0300 +Subject: [PATCH 04/11] Add Minimal and Server repository support + +--- + pyanaconda/core/constants.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py +index 2f62cce..6b26663 100644 +--- a/pyanaconda/core/constants.py ++++ b/pyanaconda/core/constants.py +@@ -58,7 +58,9 @@ DEFAULT_REPOS = [productName.split('-')[0].lower(), "fedora-modular-server", "rawhide", "BaseOS", # Used by RHEL @@ -12,3 +22,6 @@ diff -urN anaconda-34.25.2.10.orig/pyanaconda/core/constants.py anaconda-34.25.2 DBUS_ANACONDA_SESSION_ADDRESS = "DBUS_ANACONDA_SESSION_BUS_ADDRESS" +-- +2.41.0 + diff --git a/SOURCES/0005-Set-default-timezone-to-Europe-Moscow.patch b/SOURCES/0005-Set-default-timezone-to-Europe-Moscow.patch index 015b70f..685e12f 100644 --- a/SOURCES/0005-Set-default-timezone-to-Europe-Moscow.patch +++ b/SOURCES/0005-Set-default-timezone-to-Europe-Moscow.patch @@ -1,7 +1,7 @@ -From fee4e1b76754b302d839489bb246a97e3f29e6bd Mon Sep 17 00:00:00 2001 +From 4462116895cf04abb6fb7dee76e65636d248fb40 Mon Sep 17 00:00:00 2001 From: Eugene Zamriy Date: Fri, 14 Apr 2023 12:59:20 +0300 -Subject: [PATCH 5/8] Set default timezone to Europe/Moscow +Subject: [PATCH 05/11] Set default timezone to Europe/Moscow --- pyanaconda/modules/timezone/installation.py | 4 ++-- @@ -51,5 +51,5 @@ index 1129036..3b253f7 100644 SPLIT_NUMBER_SUFFIX_RE = re.compile(r'([^0-9]*)([-+])([0-9]+)') -- -2.39.2 +2.41.0 diff --git a/SOURCES/0006-Add-MSVSphere-product-config.patch b/SOURCES/0006-Add-MSVSphere-product-config.patch index 04d2f4a..98187af 100644 --- a/SOURCES/0006-Add-MSVSphere-product-config.patch +++ b/SOURCES/0006-Add-MSVSphere-product-config.patch @@ -1,7 +1,7 @@ -From d97bf592c01bd9291f1be345e124f91f976f273d Mon Sep 17 00:00:00 2001 +From 1e50329106088529044524dd789dadb5dd4f39fd Mon Sep 17 00:00:00 2001 From: Eugene Zamriy Date: Fri, 14 Apr 2023 14:59:53 +0300 -Subject: [PATCH 6/8] Add MSVSphere product config +Subject: [PATCH 06/11] Add MSVSphere product config --- data/product.d/msvsphere.conf | 21 +++++++++++++++++++++ @@ -36,5 +36,5 @@ index 0000000..baaf497 +[License] +eula = /usr/share/sphere-release/EULA -- -2.39.2 +2.41.0 diff --git a/SOURCES/0007-Set-Russian-language-as-default.patch b/SOURCES/0007-Set-Russian-language-as-default.patch index 3807971..43d67f7 100644 --- a/SOURCES/0007-Set-Russian-language-as-default.patch +++ b/SOURCES/0007-Set-Russian-language-as-default.patch @@ -1,17 +1,17 @@ -From fc39f04ced7a7e67f9a741eebdc131e63fa508c9 Mon Sep 17 00:00:00 2001 +From 050ea07607633f548e27136cbe1ac50bbe5452b4 Mon Sep 17 00:00:00 2001 From: Eugene Zamriy Date: Fri, 14 Apr 2023 18:00:57 +0300 -Subject: [PATCH 7/8] Set Russian language as default +Subject: [PATCH 07/11] 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 +index 6b26663..a162b81 100644 --- a/pyanaconda/core/constants.py +++ b/pyanaconda/core/constants.py -@@ -71,7 +71,7 @@ ANACONDA_CONFIG_DIR = "/etc/anaconda/" +@@ -72,7 +72,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 @@ -21,5 +21,5 @@ index 874c785..5122035 100644 DEFAULT_VC_FONT = "eurlatgr" -- -2.39.2 +2.41.0 diff --git a/SOURCES/0008-Replace-Fedora-references-and-update-translations.patch b/SOURCES/0008-Replace-Fedora-references-and-update-translations.patch index 33862b4..d507e1a 100644 --- a/SOURCES/0008-Replace-Fedora-references-and-update-translations.patch +++ b/SOURCES/0008-Replace-Fedora-references-and-update-translations.patch @@ -1,7 +1,7 @@ -From 35f26b9d5cc7cad04f2dd981fe445170a6f36c9b Mon Sep 17 00:00:00 2001 +From 7da10ef83112c346bcdad0a4ade8766d7b65c398 Mon Sep 17 00:00:00 2001 From: Eugene Zamriy Date: Fri, 14 Apr 2023 18:23:29 +0300 -Subject: [PATCH 1/2] Replace Fedora references and update translations +Subject: [PATCH 08/11] Replace Fedora references and update translations --- data/liveinst/gnome/fedora-welcome.desktop | 3 ++- @@ -83,10 +83,10 @@ index 847078d..6d9c4b3 100644 diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py -index 2f62cce..446fa0b 100644 +index a162b81..966b2ac 100644 --- a/pyanaconda/core/constants.py +++ b/pyanaconda/core/constants.py -@@ -156,8 +156,8 @@ WARNING_SUPPORT_REMOVED = N_( +@@ -158,8 +158,8 @@ WARNING_SUPPORT_REMOVED = N_( ) WARNING_HARDWARE_UNSUPPORTED = N_( @@ -98,5 +98,5 @@ index 2f62cce..446fa0b 100644 # Storage messages -- -2.39.2 +2.41.0 diff --git a/SOURCES/0009-Set-Russian-as-default-language-for-new-regions.patch b/SOURCES/0009-Set-Russian-as-default-language-for-new-regions.patch index d36950e..a4d13bc 100644 --- a/SOURCES/0009-Set-Russian-as-default-language-for-new-regions.patch +++ b/SOURCES/0009-Set-Russian-as-default-language-for-new-regions.patch @@ -1,7 +1,7 @@ -From 2e338b7af8d9e899d3ffacd8e1c13cc1a3659c96 Mon Sep 17 00:00:00 2001 +From 853ed63e0a3a73b73b0354bcab1ce8c11894e63e Mon Sep 17 00:00:00 2001 From: Eugene Zamriy Date: Mon, 17 Apr 2023 23:48:13 +0300 -Subject: [PATCH 9/9] Set Russian as default language for new regions +Subject: [PATCH 09/11] Set Russian as default language for new regions --- pyanaconda/geoloc.py | 10 ++++++++++ @@ -29,5 +29,5 @@ index 3555f24..4808c83 100644 if not is_valid_timezone(timezone_code): # try to get a timezone from the territory code -- -2.39.2 +2.41.0 diff --git a/SOURCES/0010-Set-English-as-fallback-language-for-help.patch b/SOURCES/0010-Set-English-as-fallback-language-for-help.patch index e8f248f..7dc246f 100644 --- a/SOURCES/0010-Set-English-as-fallback-language-for-help.patch +++ b/SOURCES/0010-Set-English-as-fallback-language-for-help.patch @@ -1,7 +1,7 @@ -From 60612774beab21f7a51c7e18011d7b245da69f3a Mon Sep 17 00:00:00 2001 +From 6a2201e338bbafa5673d18b2436e02af64893789 Mon Sep 17 00:00:00 2001 From: Eugene Zamriy Date: Wed, 19 Apr 2023 12:06:57 +0300 -Subject: [PATCH 10/10] Set English as fallback language for help +Subject: [PATCH 10/11] Set English as fallback language for help --- pyanaconda/core/constants.py | 4 ++++ @@ -9,10 +9,10 @@ Subject: [PATCH 10/10] Set English as fallback language for help 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py -index b3c574c..350ef10 100644 +index 966b2ac..d1950d9 100644 --- a/pyanaconda/core/constants.py +++ b/pyanaconda/core/constants.py -@@ -73,6 +73,10 @@ ANACONDA_CONFIG_TMP = "/run/anaconda/anaconda.conf" +@@ -74,6 +74,10 @@ ANACONDA_CONFIG_TMP = "/run/anaconda/anaconda.conf" # NOTE: this should be LANG_TERRITORY.CODESET, e.g. en_US.UTF-8 DEFAULT_LANG = "ru_RU.UTF-8" @@ -46,5 +46,5 @@ index 271e587..b8f424d 100644 best_path = available_files.get(best_lang, None) -- -2.39.2 +2.41.0 diff --git a/SOURCES/0011-Add-MSVSphere-identification-support.patch b/SOURCES/0011-Add-MSVSphere-identification-support.patch new file mode 100644 index 0000000..6b793ab --- /dev/null +++ b/SOURCES/0011-Add-MSVSphere-identification-support.patch @@ -0,0 +1,421 @@ +From f2257d661603cdc6649a8b7cd7a18eca7fb00612 Mon Sep 17 00:00:00 2001 +From: Eugene Zamriy +Date: Thu, 18 May 2023 11:38:45 +0300 +Subject: [PATCH 11/11] Add MSVSphere identification support + +--- + data/liveinst/gnome/fedora-welcome.desktop | 4 +- + data/liveinst/gnome/fedora-welcome.js | 2 +- + po/ru.po | 102 ++++++++++++------ + pyanaconda/product.py | 19 +++- + .../ui/gui/spokes/installation_progress.py | 8 +- + .../ui/gui/spokes/lib/storage_dialogs.py | 4 +- + pyanaconda/ui/gui/spokes/welcome.py | 10 +- + pyanaconda/vnc.py | 17 ++- + 8 files changed, 118 insertions(+), 48 deletions(-) + +diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/fedora-welcome.desktop +index 90f5678..abbbff3 100644 +--- a/data/liveinst/gnome/fedora-welcome.desktop ++++ b/data/liveinst/gnome/fedora-welcome.desktop +@@ -1,6 +1,6 @@ + [Desktop Entry] +-Name=Welcome to MSVSphere +-Name[ru]=Добро пожаловать в МСВСфера ++Name=Welcome to MSVSphere ARM ++Name[ru]=Добро пожаловать в МСВСфера АРМ + Exec=/usr/share/anaconda/gnome/fedora-welcome + Terminal=false + Type=Application +diff --git a/data/liveinst/gnome/fedora-welcome.js b/data/liveinst/gnome/fedora-welcome.js +index 4c0a66a..120d718 100755 +--- a/data/liveinst/gnome/fedora-welcome.js ++++ b/data/liveinst/gnome/fedora-welcome.js +@@ -62,7 +62,7 @@ const WelcomeWindow = new Lang.Class({ + default_width: 600, + default_height: 550, + skip_taskbar_hint: true, +- title: _("Welcome to MSVSphere"), ++ title: _("Welcome to MSVSphere ARM"), + window_position: Gtk.WindowPosition.CENTER }); + this.window.connect('key-press-event', Lang.bind(this, + function(w, event) { +diff --git a/po/ru.po b/po/ru.po +index c478f3f..df05bee 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -375,11 +375,20 @@ msgid "" + "Would you like to ignore this and continue with installation?" + msgstr "" + +-#: pyanaconda/product.py:69 ++#: pyanaconda/product.py:77 + #, python-format + msgid "%(productName)s %(productVersion)s INSTALLATION" + msgstr "УСТАНОВКА %(productName)s %(productVersion)s" + ++msgid "MSVSphere %(productVersion)s Server INSTALLATION" ++msgstr "УСТАНОВКА МСВСфера %(productVersion)s Сервер" ++ ++msgid "MSVSphere %(productVersion)s ARM INSTALLATION" ++msgstr "УСТАНОВКА МСВСфера %(productVersion)s АРМ" ++ ++msgid "MSVSphere %(productVersion)s OS INSTALLATION" ++msgstr "УСТАНОВКА МСВСфера %(productVersion)s ОС" ++ + #: pyanaconda/ui/tui/hubs/__init__.py:54 + msgid "Default HUB title" + msgstr "Название центра управления по умолчанию" +@@ -1152,7 +1161,7 @@ msgstr "" + + #: pyanaconda/ui/gui/__init__.py:365 widgets/src/BaseWindow.c:151 + msgid "Help!" +-msgstr "Помогите!" ++msgstr "Справка" + + #: pyanaconda/ui/gui/__init__.py:854 + #: pyanaconda/ui/gui/spokes/lib/detailederror.py:58 +@@ -1182,7 +1191,7 @@ msgid "" + "\"\">Click for details." + msgstr "" + "Предупреждение: в процессоре включена одновременная многопоточность (SMT). " +-"Нжмите для получения дополнительной информации." ++"Нажмите для получения дополнительной информации." + + #: pyanaconda/ui/gui/hubs/summary.py:103 + msgid "" +@@ -1426,6 +1435,15 @@ msgstr "О_ставить текущий выбор" + + #: pyanaconda/ui/gui/spokes/welcome.py:274 + #, python-format ++msgid "WELCOME TO MSVSphere %(version)s Server." ++msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s Сервер." ++ ++msgid "WELCOME TO MSVSphere %(version)s ARM." ++msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s АРМ." ++ ++msgid "WELCOME TO MSVSphere %(version)s OS." ++msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s ОС." ++ + msgid "WELCOME TO %(name)s %(version)s." + msgstr "ДОБРО ПОЖАЛОВАТЬ В %(name)s %(version)s." + +@@ -2024,7 +2042,7 @@ msgid "" + "of available space, including %(software)s for software and " + "%(swap)s for swap space." + msgstr "" +-"Для установки %(product)s требуется %(total)s, в том числе " ++"Для установки МСВСфера ОС требуется %(total)s, в том числе " + "%(software)s для программ и %(swap)s для подкачки." + + #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:81 +@@ -2035,7 +2053,7 @@ msgid "" + "%(software)s for software and %(swap)s for swap space." + msgstr "" + "Для программного обеспечения " +-"%(product)s требуется %(total)s пространства, в том числе " ++"МСВСфера ОС требуется %(total)s пространства, в том числе " + "%(software)s для программ и %(swap)s для подкачки." + + #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:132 +@@ -2046,11 +2064,11 @@ msgstr "%s На выбранных дисках доступно:" + #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:142 + #, python-format + msgid "" +-"You don't have enough space available to install %s. You can shrink " ++"You don't have enough space available to install %(name)s. You can shrink " + "or remove existing partitions via our guided reclaim space tool, or you can " + "adjust your partitions on your own in the custom partitioning interface." + msgstr "" +-"Недостаточно места для установки %s. Можно уменьшить или удалить " ++"Недостаточно места для установки МСВСфера ОС. Можно уменьшить или удалить " + "существующие разделы с помощью помощника или самостоятельно выбрать размеры " + "разделов в окне настройки разделов." + +@@ -2060,7 +2078,7 @@ msgid "" + " You don't have enough space available to install %(product)s, even " + "if you used all of the free space available on the selected disks." + msgstr "" +-" Недостаточно места для установки %(product)s, даже если " ++" Недостаточно места для установки МСВСфера ОС, даже если " + "использовать все свободное место на выбранных дисках." + + #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:178 +@@ -2071,10 +2089,10 @@ msgid "" + "could add more disks for additional space, modify your software selection to " + "install a smaller version of %(productName)s, or quit the installer." + msgstr "" +-"Недостаточно места для установки %(productName)s, даже если " ++"Недостаточно места для установки МСВСфера ОС, даже если " + "использовать всё свободное место на выбранных дисках. Можно добавить ещё " + "диски, чтобы получить дополнительное место, изменить выбор программного " +-"обеспечения, чтобы установить меньший вариант %(productName)s, или " ++"обеспечения, чтобы установить меньший вариант МСВСфера ОС, или " + "покинуть программу установки." + + #: pyanaconda/ui/gui/spokes/lib/detailederror.py:48 +@@ -2272,20 +2290,20 @@ msgstr "_Завершить установку" + #: pyanaconda/ui/gui/spokes/installation_progress.py:158 + #, python-format + msgid "" +-"%s is now successfully installed and ready for you to use!\n" ++"%(name)s is now successfully installed and ready for you to use!\n" + "Go ahead and reboot your system to start using it!" + msgstr "" +-"%s успешно установлена и готова к использованию!\n" +-"Давайте, перезагружайте систему и начинайте использовать ее!" ++"МСВСфера ОС установлена и готова к работе.\n" ++"Необходимо перезагрузить систему чтобы приступить к использованию." + + #: pyanaconda/ui/gui/spokes/installation_progress.py:163 + #, python-format + msgid "" +-"%s is now successfully installed and ready for you to use!\n" ++"%(name)s is now successfully installed and ready for you to use!\n" + "Go ahead and quit the application to start using it!" + msgstr "" +-"%s успешно установлено и готово к использованию!\n" +-"Выйдите из приложения и начните использовать его!" ++"МСВСфера ОС установлена и готова к работе.\n" ++"Необходимо выйти из приложения чтобы приступить к использованию." + + #: pyanaconda/ui/gui/spokes/software_selection.py:66 + msgctxt "GUI|Spoke" +@@ -2868,7 +2886,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 +@@ -3548,7 +3566,7 @@ msgstr "Не удалось продолжить установку." + #: pyanaconda/modules/storage/partitioning/interactive/utils.py:213 + #, python-brace-format + msgid "New {name} {version} Installation" +-msgstr "Новая установка {name} {version}" ++msgstr "Новая установка МСВСфера {version} ОС" + + #: pyanaconda/modules/storage/partitioning/interactive/utils.py:275 + msgid "Cannot set label on file system." +@@ -3959,13 +3977,13 @@ msgstr "" + + #: pyanaconda/core/constants.py:159 + msgid "" +-"This hardware (or a combination thereof) is not supported by Red Hat. For " +-"more information on supported hardware, please refer to http://www.redhat." +-"com/hardware." ++"This hardware (or a combination thereof) is not supported by MSVSphere. " ++"For more information on supported hardware, please refer to " ++"https://msvsphere.ru." + msgstr "" +-"Это аппаратное обеспечение (или их комбинация) не поддерживается Red Hat. " +-"Для получения дополнительной информации о поддерживаемом оборудовании см. " +-"http://www.redhat.com/hardware." ++"Это аппаратное обеспечение (или их комбинация) не поддерживается " ++"МСВСфера ОС. Для получения дополнительной информации о поддерживаемом " ++"оборудовании см. https://msvsphere.ru." + + #: pyanaconda/core/constants.py:165 + msgid "" +@@ -4305,11 +4323,29 @@ msgstr "Полное имя не может содержать двоеточи + + #: pyanaconda/vnc.py:79 + #, python-format ++msgid "MSVSphere %(productVersion)s Server installation" ++msgstr "Установка МСВСфера %(productVersion)s Сервер" ++ ++msgid "MSVSphere %(productVersion)s ARM installation" ++msgstr "Установка МСВСфера %(productVersion)s АРМ" ++ ++msgid "MSVSphere %(productVersion)s OS installation" ++msgstr "Установка МСВСфера %(productVersion)s ОС" ++ + msgid "%(productName)s %(productVersion)s installation" + msgstr "Установка %(productName)s %(productVersion)s" + + #: pyanaconda/vnc.py:148 + #, python-format ++msgid "MSVSphere %(productVersion)s Server installation on host %(name)s" ++msgstr "Установка МСВСфера %(productVersion)s Сервер на %(name)s" ++ ++msgid "MSVSphere %(productVersion)s ARM installation on host %(name)s" ++msgstr "Установка МСВСфера %(productVersion)s АРМ на %(name)s" ++ ++msgid "MSVSphere %(productVersion)s OS installation on host %(name)s" ++msgstr "Установка МСВСфера %(productVersion)s ОС на %(name)s" ++ + msgid "%(productName)s %(productVersion)s installation on host %(name)s" + msgstr "Установка %(productName)s %(productVersion)s на %(name)s" + +@@ -7556,22 +7592,22 @@ msgstr "Установить Live CD на жёсткий диск" + + #: data/liveinst/gnome/fedora-welcome.desktop:3 + #: data/liveinst/gnome/fedora-welcome.js:65 +-msgid "Welcome to Fedora" +-msgstr "Добро пожаловать в Fedora" ++msgid "Welcome to MSVSphere ARM" ++msgstr "Добро пожаловать в МСВСфера АРМ" + + #: data/liveinst/gnome/fedora-welcome.js:94 +-msgid "Try Fedora" +-msgstr "Попробуйте Fedora" ++msgid "Try MSVSphere" ++msgstr "Попробовать в режиме Live" + + #: data/liveinst/gnome/fedora-welcome.js:110 + msgid "" +-"You are currently running Fedora from live media.\n" +-"You can install Fedora now, or choose \"Install to Hard Drive\" in the " ++"You are currently running MSVSphere from live media.\n" ++"You can install MSVSphere now, or choose \"Install to Hard Drive\" in the " + "Activities Overview at any later time." + msgstr "" +-"Fedora запущена с установочного диска.\n" +-"Вы можете установить Fedora сейчас или в любое время выбрать «Установить на " +-"жесткий диск» в меню «Обзор»." ++"МСВСфера АРМ запущена с установочного диска.\n" ++"Вы можете установить операционную систему сейчас или в любое время выбрать " ++"«Установить на жесткий диск» в меню «Обзор»." + + #: data/liveinst/gnome/fedora-welcome.js:130 + msgid "" +diff --git a/pyanaconda/product.py b/pyanaconda/product.py +index 9dbfe1f..a679b7a 100644 +--- a/pyanaconda/product.py ++++ b/pyanaconda/product.py +@@ -64,9 +64,26 @@ def trim_product_version_for_ui(version): + + productVersion = trim_product_version_for_ui(productVersion) + ++if productName.startswith("MSVSphere"): ++ productBase = "MSVSphere" ++ if productName == "MSVSphere Server" or \ ++ (productName == "MSVSphere" and productVariant == "Minimal"): ++ productFlavor = "Server" ++ elif productName == "MSVSphere ARM": ++ productFlavor = "ARM" ++ else: ++ productFlavor = "OS" ++else: ++ productBase = productName ++ productFlavor = None ++ + + def distributionText(): +- return _("%(productName)s %(productVersion)s INSTALLATION") % { ++ if productBase == "MSVSphere": ++ distro_text = f"MSVSphere %(productVersion)s {productFlavor} INSTALLATION" ++ else: ++ distro_text = "%(productName)s %(productVersion)s INSTALLATION" ++ return _(distro_text) % { + "productName": productName.upper(), + "productVersion": productVersion.upper() + } +diff --git a/pyanaconda/ui/gui/spokes/installation_progress.py b/pyanaconda/ui/gui/spokes/installation_progress.py +index c2dfbaf..de1fe76 100644 +--- a/pyanaconda/ui/gui/spokes/installation_progress.py ++++ b/pyanaconda/ui/gui/spokes/installation_progress.py +@@ -155,14 +155,14 @@ class ProgressSpoke(StandaloneSpoke): + # Set the reboot label. + if conf.target.is_hardware: + continue_text = _( +- "%s is now successfully installed and ready for you to use!\n" ++ "%(name)s is now successfully installed and ready for you to use!\n" + "Go ahead and reboot your system to start using it!" +- ) % productName ++ ) % {"name": productName} + else: + continue_text = _( +- "%s is now successfully installed and ready for you to use!\n" ++ "%(name)s is now successfully installed and ready for you to use!\n" + "Go ahead and quit the application to start using it!" +- ) % productName ++ ) % {"name": productName} + + label = self.builder.get_object("rebootLabel") + label.set_text(continue_text) +diff --git a/pyanaconda/ui/gui/spokes/lib/storage_dialogs.py b/pyanaconda/ui/gui/spokes/lib/storage_dialogs.py +index 2f8338b..e330641 100644 +--- a/pyanaconda/ui/gui/spokes/lib/storage_dialogs.py ++++ b/pyanaconda/ui/gui/spokes/lib/storage_dialogs.py +@@ -140,10 +140,10 @@ class NeedSpaceDialog(InstallOptionsDialogBase): + self._set_free_space_labels(disk_free, fs_free) + + label_text = _("You don't have enough space available to install " +- "%s. You can shrink or remove existing partitions " ++ "%(name)s. You can shrink or remove existing partitions " + "via our guided reclaim space tool, or you can adjust your " + "partitions on your own in the custom partitioning " +- "interface.") % escape_markup(productName) ++ "interface.") % {"name": escape_markup(productName)} + self.builder.get_object("need_space_options_label").set_markup(label_text) + self._add_modify_watcher(label) + +diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py +index 2d8f6b2..541f61e 100644 +--- a/pyanaconda/ui/gui/spokes/welcome.py ++++ b/pyanaconda/ui/gui/spokes/welcome.py +@@ -34,7 +34,9 @@ from pyanaconda.ui.gui.spokes.lib.lang_locale_handler import LangLocaleHandler + from pyanaconda.ui.gui.spokes.lib.unsupported_hardware import UnsupportedHardwareDialog + + from pyanaconda import localization +-from pyanaconda.product import distributionText, isFinal, productName, productVersion ++from pyanaconda.product import ( ++ distributionText, isFinal, productName, productVersion, productFlavor ++) + from pyanaconda import flags + from pyanaconda import geoloc + from pyanaconda.core.i18n import _, C_ +@@ -271,7 +273,11 @@ class WelcomeLanguageSpoke(StandaloneSpoke, LangLocaleHandler): + # substituted. + welcomeLabel = self.builder.get_object("welcomeLabel") + +- welcomeLabel.set_text(_("WELCOME TO %(name)s %(version)s.") % ++ if productName.startswith("MSVSphere"): ++ welcome_text = f"WELCOME TO MSVSphere %(version)s {productFlavor}." ++ else: ++ welcome_text = "WELCOME TO %(name)s %(version)s." ++ welcomeLabel.set_text(_(welcome_text) % + {"name" : productName.upper(), "version" : productVersion}) # pylint: disable=no-member + + # Retranslate the language (filtering) entry's placeholder text +diff --git a/pyanaconda/vnc.py b/pyanaconda/vnc.py +index 5fadcde..053735f 100644 +--- a/pyanaconda/vnc.py ++++ b/pyanaconda/vnc.py +@@ -76,7 +76,12 @@ class VncServer(object): + self.anaconda = None + self.log = get_stdout_logger() + +- self.desktop = _("%(productName)s %(productVersion)s installation")\ ++ if product.productName.startswith("MSVSphere"): ++ desktop_text = f"MSVSphere %(productVersion)s " \ ++ f"{product.productFlavor} installation" ++ else: ++ desktop_text = "%(productName)s %(productVersion)s installation" ++ self.desktop = _(desktop_text) \ + % {'productName': product.productName, + 'productVersion': product.productVersion} + +@@ -145,8 +150,14 @@ class VncServer(object): + + # figure out product info + if host: +- self.desktop = _("%(productName)s %(productVersion)s installation " +- "on host %(name)s") \ ++ if product.productName.startswith("MSVSphere"): ++ desktop_text = f"MSVSphere %(productVersion)s " \ ++ f"{product.productFlavor} installation on " \ ++ f"host %(name)s" ++ else: ++ desktop_text = "%(productName)s %(productVersion)s " \ ++ "installation on host %(name)s" ++ self.desktop = _(desktop_text) \ + % {'productName': product.productName, + 'productVersion': product.productVersion, + 'name': host} +-- +2.41.0 + diff --git a/SOURCES/0011-Update-Russian-translation.patch b/SOURCES/0011-Update-Russian-translation.patch deleted file mode 100644 index 56c2928..0000000 --- a/SOURCES/0011-Update-Russian-translation.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 92b8e6936f568e64751314f42a09672db567b442 Mon Sep 17 00:00:00 2001 -From: Sergey Cherevko -Date: Thu, 18 May 2023 11:38:45 +0300 -Subject: [PATCH 2/2] Update Russian translation - ---- - po/ru.po | 44 ++++++++++++++++++++++---------------------- - 1 file changed, 22 insertions(+), 22 deletions(-) - -diff --git a/po/ru.po b/po/ru.po -index c478f3f..18ad5e4 100644 ---- a/po/ru.po -+++ b/po/ru.po -@@ -378,7 +378,7 @@ msgstr "" - #: pyanaconda/product.py:69 - #, python-format - msgid "%(productName)s %(productVersion)s INSTALLATION" --msgstr "УСТАНОВКА %(productName)s %(productVersion)s" -+msgstr "УСТАНОВКА МСВСфера %(productVersion)s" - - #: pyanaconda/ui/tui/hubs/__init__.py:54 - msgid "Default HUB title" -@@ -1152,7 +1152,7 @@ msgstr "" - - #: pyanaconda/ui/gui/__init__.py:365 widgets/src/BaseWindow.c:151 - msgid "Help!" --msgstr "Помогите!" -+msgstr "Справка" - - #: pyanaconda/ui/gui/__init__.py:854 - #: pyanaconda/ui/gui/spokes/lib/detailederror.py:58 -@@ -1182,7 +1182,7 @@ msgid "" - "\"\">Click for details." - msgstr "" - "Предупреждение: в процессоре включена одновременная многопоточность (SMT). " --"Нжмите для получения дополнительной информации." -+"Нажмите для получения дополнительной информации." - - #: pyanaconda/ui/gui/hubs/summary.py:103 - msgid "" -@@ -1427,7 +1427,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/root_password.py:52 - msgctxt "GUI|Spoke" -@@ -2060,7 +2060,7 @@ msgid "" - " You don't have enough space available to install %(product)s, even " - "if you used all of the free space available on the selected disks." - msgstr "" --" Недостаточно места для установки %(product)s, даже если " -+" Недостаточно места для установки МСВСфера, даже если " - "использовать все свободное место на выбранных дисках." - - #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:178 -@@ -2071,10 +2071,10 @@ msgid "" - "could add more disks for additional space, modify your software selection to " - "install a smaller version of %(productName)s, or quit the installer." - msgstr "" --"Недостаточно места для установки %(productName)s, даже если " -+"Недостаточно места для установки МСВСфера, даже если " - "использовать всё свободное место на выбранных дисках. Можно добавить ещё " - "диски, чтобы получить дополнительное место, изменить выбор программного " --"обеспечения, чтобы установить меньший вариант %(productName)s, или " -+"обеспечения, чтобы установить меньший вариант МСВСфера, или " - "покинуть программу установки." - - #: pyanaconda/ui/gui/spokes/lib/detailederror.py:48 -@@ -2868,7 +2868,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 -@@ -3959,13 +3959,13 @@ msgstr "" - - #: pyanaconda/core/constants.py:159 - msgid "" --"This hardware (or a combination thereof) is not supported by Red Hat. For " --"more information on supported hardware, please refer to http://www.redhat." --"com/hardware." -+"This hardware (or a combination thereof) is not supported by MSVSphere. " -+"For more information on supported hardware, please refer to " -+"https://msvsphere.ru." - msgstr "" --"Это аппаратное обеспечение (или их комбинация) не поддерживается Red Hat. " --"Для получения дополнительной информации о поддерживаемом оборудовании см. " --"http://www.redhat.com/hardware." -+"Это аппаратное обеспечение (или их комбинация) не поддерживается " -+"МСВСфера. Для получения дополнительной информации о поддерживаемом " -+"оборудовании см. https://msvsphere.ru." - - #: pyanaconda/core/constants.py:165 - msgid "" -@@ -4306,12 +4306,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 -@@ -7557,20 +7557,20 @@ msgstr "Установить Live CD на жёсткий диск" - #: data/liveinst/gnome/fedora-welcome.desktop:3 - #: data/liveinst/gnome/fedora-welcome.js:65 - msgid "Welcome to Fedora" --msgstr "Добро пожаловать в Fedora" -+msgstr "Добро пожаловать в МСВСфера" - - #: data/liveinst/gnome/fedora-welcome.js:94 - msgid "Try Fedora" --msgstr "Попробуйте Fedora" -+msgstr "Попробуйте МСВСфера" - - #: data/liveinst/gnome/fedora-welcome.js:110 - msgid "" --"You are currently running Fedora from live media.\n" --"You can install Fedora now, or choose \"Install to Hard Drive\" in the " -+"You are currently running MSVSphere from live media.\n" -+"You can install MSVSphere now, or choose \"Install to Hard Drive\" in the " - "Activities Overview at any later time." - msgstr "" --"Fedora запущена с установочного диска.\n" --"Вы можете установить Fedora сейчас или в любое время выбрать «Установить на " -+"МСВСфера запущена с установочного диска.\n" -+"Вы можете установить МСВСфера сейчас или в любое время выбрать «Установить на " - "жесткий диск» в меню «Обзор»." - - #: data/liveinst/gnome/fedora-welcome.js:130 --- -2.39.2 - diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index 670ae38..44662b3 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda Version: 34.25.2.10 -Release: 1%{?dist}.inferit.2 +Release: 1%{?dist}.inferit.3 License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -23,7 +23,7 @@ Patch1007: 0007-Set-Russian-language-as-default.patch Patch1008: 0008-Replace-Fedora-references-and-update-translations.patch Patch1009: 0009-Set-Russian-as-default-language-for-new-regions.patch Patch1010: 0010-Set-English-as-fallback-language-for-help.patch -Patch1011: 0011-Update-Russian-translation.patch +Patch1011: 0011-Add-MSVSphere-identification-support.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -429,6 +429,10 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Sat Jul 29 2023 Eugene Zamriy - 34.25.2.10-1.inferit.3 +- Added MSVSphere ARM and Server identification support patch +- Improved Russian translation + * Sat Jul 8 2023 Arkady L. Shane - 34.25.2.10-1.inferit.2 - Added Server repository support