From 5b7c67815b00649d3b5096a35939aa1de09c0dc5 Mon Sep 17 00:00:00 2001 From: mwiegand Date: Fri, 29 Oct 2021 19:15:45 +0200 Subject: [PATCH] more locales --- bundles/locale/items.py | 15 +++++++++++---- bundles/locale/metadata.py | 13 ++++++++++++- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/bundles/locale/items.py b/bundles/locale/items.py index 22c7ba6..5c51b8b 100644 --- a/bundles/locale/items.py +++ b/bundles/locale/items.py @@ -1,8 +1,15 @@ -locale = node.metadata.get('locale') +default_locale = node.metadata.get('locale/default')[0] + +installed_locales = sorted([ + node.metadata.get('locale/default'), + *node.metadata.get('locale/installed'), +]) files = { '/etc/locale.gen': { - 'content': f"{locale} {locale.split('.')[1]}\n", + 'content': '\n'.join( + f'{locale} {type}' for locale, type in installed_locales + ), 'triggers': { 'action:locale-gen', }, @@ -15,8 +22,8 @@ actions = { 'triggered': True, }, 'systemd-locale': { - 'command': f'localectl set-locale LANG="{locale}"', - 'unless': f'localectl | grep -Fi "system locale" | grep -Fi "{locale}"', + 'command': f'localectl set-locale LANG="{default_locale}"', + 'unless': f'localectl | grep -Fi "system locale" | grep -Fi "{default_locale}"', 'preceded_by': { 'action:locale-gen', }, diff --git a/bundles/locale/metadata.py b/bundles/locale/metadata.py index fcf26c3..f52e56e 100644 --- a/bundles/locale/metadata.py +++ b/bundles/locale/metadata.py @@ -4,5 +4,16 @@ defaults = { 'locales': {}, }, }, - 'locale': 'en_US.UTF-8', + 'locale': { + 'default': ('en_US.UTF-8', 'UTF-8'), + 'installed': { + ('de_AT.UTF-8', 'UTF-8'), + ('de_CH.UTF-8', 'UTF-8'), + ('de_DE.UTF-8', 'UTF-8'), + ('de_LU.UTF-8', 'UTF-8'), + ('en_CA.UTF-8', 'UTF-8'), + ('en_GB.UTF-8', 'UTF-8'), + ('en_US.UTF-8', 'UTF-8'), + }, + }, }