|
|
|
|
@ -1,17 +1,18 @@
|
|
|
|
|
From 2716b292b9d42961222fd645c6b2d281d46d6688 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From 490d7c31855f8b8723bed6c997c310db25242fb8 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Dmitry Samoylik <Dmitriy.Samoylik@softline.com>
|
|
|
|
|
Date: Thu, 26 Sep 2024 16:57:48 +0300
|
|
|
|
|
Subject: [PATCH] Implement show EULA before installation
|
|
|
|
|
Subject: [PATCH 15/15] Implement show EULA before installation
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
data/anaconda.conf | 4 +-
|
|
|
|
|
po/ru.po | 31 ++++++
|
|
|
|
|
pyanaconda/core/configuration/license.py | 2 -
|
|
|
|
|
pyanaconda/core/eula.py | 23 ++++
|
|
|
|
|
pyanaconda/ui/categories/eula.py | 14 +++
|
|
|
|
|
pyanaconda/ui/gui/spokes/eula.glade | 136 +++++++++++++++++++++++
|
|
|
|
|
pyanaconda/ui/gui/spokes/eula.py | 107 ++++++++++++++++++
|
|
|
|
|
pyanaconda/ui/tui/spokes/eula.py | 128 +++++++++++++++++++++
|
|
|
|
|
7 files changed, 409 insertions(+), 5 deletions(-)
|
|
|
|
|
8 files changed, 440 insertions(+), 5 deletions(-)
|
|
|
|
|
create mode 100644 pyanaconda/core/eula.py
|
|
|
|
|
create mode 100644 pyanaconda/ui/categories/eula.py
|
|
|
|
|
create mode 100644 pyanaconda/ui/gui/spokes/eula.glade
|
|
|
|
|
@ -33,6 +34,48 @@ index b5878e3..c15e99d 100644
|
|
|
|
|
eula =
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/po/ru.po b/po/ru.po
|
|
|
|
|
index 02bf92b..06005c0 100644
|
|
|
|
|
--- a/po/ru.po
|
|
|
|
|
+++ b/po/ru.po
|
|
|
|
|
@@ -7766,6 +7766,37 @@ msgstr "К системе прикреплено {} подписок"
|
|
|
|
|
msgid "{}. {}"
|
|
|
|
|
msgstr "{}. {}"
|
|
|
|
|
|
|
|
|
|
+msgid "LICENSING"
|
|
|
|
|
+msgstr "ЛИЦЕНЗИРОВАНИЕ"
|
|
|
|
|
+
|
|
|
|
|
+msgctxt "GUI|Spoke"
|
|
|
|
|
+msgid "_License Information"
|
|
|
|
|
+msgstr "О _лицензии"
|
|
|
|
|
+
|
|
|
|
|
+msgid "License information"
|
|
|
|
|
+msgstr "О лицензии"
|
|
|
|
|
+
|
|
|
|
|
+msgid "License Information"
|
|
|
|
|
+msgstr "О лицензии"
|
|
|
|
|
+
|
|
|
|
|
+msgid "License accepted"
|
|
|
|
|
+msgstr "Лицензия принята"
|
|
|
|
|
+
|
|
|
|
|
+msgid "License not accepted"
|
|
|
|
|
+msgstr "Лицензия не принята"
|
|
|
|
|
+
|
|
|
|
|
+msgid "Read the License Agreement"
|
|
|
|
|
+msgstr "Прочитайте лицензионное соглашение"
|
|
|
|
|
+
|
|
|
|
|
+msgid "I accept the license agreement"
|
|
|
|
|
+msgstr "Принимаю лицензионное соглашение"
|
|
|
|
|
+
|
|
|
|
|
+msgid "I _accept the license agreement"
|
|
|
|
|
+msgstr "_Принимаю лицензионное соглашение"
|
|
|
|
|
+
|
|
|
|
|
+msgid "License Agreement:"
|
|
|
|
|
+msgstr "Лицензионное соглашение:"
|
|
|
|
|
+
|
|
|
|
|
#~ msgid "Try Fedora"
|
|
|
|
|
#~ msgstr "Попробуйте Fedora"
|
|
|
|
|
|
|
|
|
|
diff --git a/pyanaconda/core/configuration/license.py b/pyanaconda/core/configuration/license.py
|
|
|
|
|
index 04c44bf..a51f52a 100644
|
|
|
|
|
--- a/pyanaconda/core/configuration/license.py
|
|
|
|
|
@ -484,5 +527,5 @@ index 0000000..a3e8e62
|
|
|
|
|
+ self.close()
|
|
|
|
|
+ return None
|
|
|
|
|
--
|
|
|
|
|
2.39.2
|
|
|
|
|
2.47.0
|
|
|
|
|
|
|
|
|
|
|
