Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions archinstall/lib/models/locale.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,21 @@ def preview(self) -> str:
output += '{}: {}'.format(tr('Locale encoding'), self.sys_enc)
return output

@classmethod
def _load_config(cls, config: 'LocaleConfiguration', args: dict[str, str]) -> 'LocaleConfiguration':
def _load_config(self, args: dict[str, str]) -> None:
if 'sys_lang' in args:
config.sys_lang = args['sys_lang']
self.sys_lang = args['sys_lang']
if 'sys_enc' in args:
config.sys_enc = args['sys_enc']
self.sys_enc = args['sys_enc']
if 'kb_layout' in args:
config.kb_layout = args['kb_layout']

return config
self.kb_layout = args['kb_layout']

@classmethod
def parse_arg(cls, args: dict[str, Any]) -> 'LocaleConfiguration':
default = cls.default()

if 'locale_config' in args:
default = cls._load_config(default, args['locale_config'])
default._load_config(args['locale_config'])
else:
default = cls._load_config(default, args)
default._load_config(args)

return default