Use `_preset` for defaults in `LocaleMenu` (#2071)
* Use `_preset` for defaults in `LocaleMenu` * Fix adjacent typos
This commit is contained in:
parent
33d084f16a
commit
b1e0068795
|
|
@ -52,9 +52,9 @@ class LocaleMenu(AbstractSubMenu):
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
data_store: Dict[str, Any],
|
data_store: Dict[str, Any],
|
||||||
locele_conf: LocaleConfiguration
|
locale_conf: LocaleConfiguration
|
||||||
):
|
):
|
||||||
self._preset = locele_conf
|
self._preset = locale_conf
|
||||||
super().__init__(data_store=data_store)
|
super().__init__(data_store=data_store)
|
||||||
|
|
||||||
def setup_selection_menu_options(self):
|
def setup_selection_menu_options(self):
|
||||||
|
|
@ -62,19 +62,19 @@ class LocaleMenu(AbstractSubMenu):
|
||||||
Selector(
|
Selector(
|
||||||
_('Keyboard layout'),
|
_('Keyboard layout'),
|
||||||
lambda preset: self._select_kb_layout(preset),
|
lambda preset: self._select_kb_layout(preset),
|
||||||
default='us',
|
default=self._preset.kb_layout,
|
||||||
enabled=True)
|
enabled=True)
|
||||||
self._menu_options['sys-language'] = \
|
self._menu_options['sys-language'] = \
|
||||||
Selector(
|
Selector(
|
||||||
_('Locale language'),
|
_('Locale language'),
|
||||||
lambda preset: select_locale_lang(preset),
|
lambda preset: select_locale_lang(preset),
|
||||||
default='en_US',
|
default=self._preset.sys_lang,
|
||||||
enabled=True)
|
enabled=True)
|
||||||
self._menu_options['sys-encoding'] = \
|
self._menu_options['sys-encoding'] = \
|
||||||
Selector(
|
Selector(
|
||||||
_('Locale encoding'),
|
_('Locale encoding'),
|
||||||
lambda preset: select_locale_enc(preset),
|
lambda preset: select_locale_enc(preset),
|
||||||
default='UTF-8',
|
default=self._preset.sys_enc,
|
||||||
enabled=True)
|
enabled=True)
|
||||||
|
|
||||||
def run(self, allow_reset: bool = True) -> LocaleConfiguration:
|
def run(self, allow_reset: bool = True) -> LocaleConfiguration:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue