index : archinstall32 | |
Archlinux32 installer | gitolite user |
summaryrefslogtreecommitdiff |
author | Himadri Bhattacharjee <107522312+lavafroth@users.noreply.github.com> | 2023-06-28 11:42:53 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-28 13:42:53 +0200 |
commit | 1ae1f2ff1144d502830834ba5a64262f7d195e91 (patch) | |
tree | 4881eb8249a4f144cc4678c7c9dfafca56e55d1a /archinstall/lib/locale.py | |
parent | 57ebc42ffd64babb121c940caa3c5ff415062162 (diff) |
-rw-r--r-- | archinstall/lib/locale.py | 23 |
diff --git a/archinstall/lib/locale.py b/archinstall/lib/locale.py index 0a36c072..ab158984 100644 --- a/archinstall/lib/locale.py +++ b/archinstall/lib/locale.py @@ -1,3 +1,5 @@ +from itertools import takewhile +from pathlib import Path from typing import Iterator, List from .exceptions import ServiceException, SysCallError @@ -11,21 +13,12 @@ def list_keyboard_languages() -> Iterator[str]: def list_locales() -> List[str]: - with open('/etc/locale.gen', 'r') as fp: - locales = [] - # before the list of locales begins there's an empty line with a '#' in front - # so we'll collect the localels from bottom up and halt when we're donw - entries = fp.readlines() - entries.reverse() - - for entry in entries: - text = entry.replace('#', '').strip() - if text == '': - break - locales.append(text) - - locales.reverse() - return locales + entries = Path('/etc/locale.gen').read_text().splitlines() + # Before the list of locales begins there's an empty line with a '#' in front + # so we'll collect the locales from bottom up and halt when we're done. + locales = list(takewhile(bool, map(lambda entry: entry.strip('\n\t #'), reversed(entries)))) + locales.reverse() + return locales def list_x11_keyboard_languages() -> Iterator[str]: |