Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/menu/abstract_menu.py
diff options
context:
space:
mode:
Diffstat (limited to 'archinstall/lib/menu/abstract_menu.py')
-rw-r--r--archinstall/lib/menu/abstract_menu.py38
1 files changed, 1 insertions, 37 deletions
diff --git a/archinstall/lib/menu/abstract_menu.py b/archinstall/lib/menu/abstract_menu.py
index 2bd56374..eee99747 100644
--- a/archinstall/lib/menu/abstract_menu.py
+++ b/archinstall/lib/menu/abstract_menu.py
@@ -3,7 +3,6 @@ from __future__ import annotations
from typing import Callable, Any, List, Iterator, Tuple, Optional, Dict, TYPE_CHECKING
from .menu import Menu, MenuSelectionType
-from ..locale import set_keyboard_language
from ..output import error
from ..translationhandler import TranslationHandler, Language
@@ -130,7 +129,7 @@ class Selector:
if current:
padding += 5
description = str(self._description).ljust(padding, ' ')
- current = str(_('set: {}').format(current))
+ current = current
else:
description = self._description
current = ''
@@ -243,31 +242,6 @@ class AbstractMenu:
elif selector is not None and selector.has_selection():
self._data_store[selector_name] = selector.current_selection
- def _missing_configs(self) -> List[str]:
- def check(s):
- return self._menu_options.get(s).has_selection()
-
- def has_superuser() -> bool:
- sel = self._menu_options['!users']
- if sel.current_selection:
- return any([u.sudo for u in sel.current_selection])
- return False
-
- mandatory_fields = dict(filter(lambda x: x[1].is_mandatory(), self._menu_options.items()))
- missing = set()
-
- for key, selector in mandatory_fields.items():
- if key in ['!root-password', '!users']:
- if not check('!root-password') and not has_superuser():
- missing.add(
- str(_('Either root-password or at least 1 user with sudo privileges must be specified'))
- )
- elif key == 'disk_config':
- if not check('disk_config'):
- missing.add(self._menu_options['disk_config'].description)
-
- return list(missing)
-
def setup_selection_menu_options(self):
""" Define the menu options.
Menu options can be defined here in a subclass or done per program calling self.set_option()
@@ -328,9 +302,6 @@ class AbstractMenu:
cursor_pos = None
while True:
- # Before continuing, set the preferred keyboard layout/language in the current terminal.
- # This will just help the user with the next following questions.
- self._set_kb_language()
enabled_menus = self._menus_to_enable()
padding = self._get_menu_text_padding(list(enabled_menus.values()))
@@ -425,13 +396,6 @@ class AbstractMenu:
return True
- def _set_kb_language(self):
- """ general for ArchInstall"""
- # Before continuing, set the preferred keyboard layout/language in the current terminal.
- # This will just help the user with the next following questions.
- if self._data_store.get('keyboard-layout', None) and len(self._data_store['keyboard-layout']):
- set_keyboard_language(self._data_store['keyboard-layout'])
-
def _verify_selection_enabled(self, selection_name: str) -> bool:
""" general """
if selection := self._menu_options.get(selection_name, None):