Skip to content

Commit 0c5c3ee

Browse files
committed
Improve bootloader menu previews
1 parent 9722bc7 commit 0c5c3ee

File tree

2 files changed

+21
-7
lines changed

2 files changed

+21
-7
lines changed

archinstall/lib/bootloader/bootloader_menu.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,11 @@ def _prev_bootloader(self, item: MenuItem) -> str | None:
7575
return None
7676

7777
def _prev_uki(self, item: MenuItem) -> str | None:
78+
uki_text = f'{tr("Unified kernel images")}'
7879
if item.value:
79-
return tr('Enabled')
80-
return tr('Disabled')
80+
return f'{uki_text}: {tr("Enabled")}'
81+
else:
82+
return f'{uki_text}: {tr("Disabled")}'
8183

8284
def _prev_removable(self, item: MenuItem) -> str | None:
8385
if item.value:

archinstall/lib/models/bootloader.py

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
from enum import Enum
66
from typing import Any
77

8+
from archinstall.lib.translationhandler import tr
9+
810
from ..hardware import SysInfo
911
from ..output import warn
1012

@@ -80,9 +82,19 @@ def get_default(cls) -> BootloaderConfiguration:
8082
return cls(bootloader=Bootloader.get_default(), uki=False, removable=False)
8183

8284
def preview(self) -> str:
83-
text = f'Bootloader: {self.bootloader.value}'
84-
if self.uki:
85-
text += ', UKI'
86-
if self.removable:
87-
text += ', removable'
85+
text = f'{tr("Bootloader")}: {self.bootloader.value}'
86+
text += '\n'
87+
if SysInfo.has_uefi() and self.bootloader.has_uki_support():
88+
if self.uki:
89+
uki_string = tr('Enabled')
90+
else:
91+
uki_string = tr('Disabled')
92+
text += f'UKI: {uki_string}'
93+
text += '\n'
94+
if SysInfo.has_uefi() and self.bootloader.has_removable_support():
95+
if self.removable:
96+
removable_string = tr('Enabled')
97+
else:
98+
removable_string = tr('Disabled')
99+
text += f'{tr("Removable")}: {removable_string}'
88100
return text

0 commit comments

Comments
 (0)