bundles/basic: support creating additional locales

2021-01-24 07:49:49 +01:00 · 2021-01-24 07:49:49 +01:00 · 614bdf9dec
commit 614bdf9dec
parent d344664fa1
5 changed files with 11 additions and 7 deletions
--- a/bundles/basic/files/locale
+++ b/bundles/basic/files/locale
@ -1 +1 @@
-LANG=${node.metadata['locale']}
+LANG=en_US.UTF-8
--- a/bundles/basic/files/locale.gen
+++ b/bundles/basic/files/locale.gen
@ -1 +1,5 @@
-${node.metadata['locale']} ${node.metadata['locale'].split('.')[-1]}
+en_US.UTF-8 UTF-8
+
+% for locale in sorted(node.metadata.get('locales', set())):
+${locale} ${locale.split('.')[-1]}
+% endfor
--- a/bundles/basic/items.py
+++ b/bundles/basic/items.py
@ -2,8 +2,7 @@

 files = {
    '/etc/default/locale': {
-        'content_type': 'mako',
-        'triggers': {
+        'needs': {
            'action:locale-gen',
        },
    },
--- a/bundles/basic/metadata.py
+++ b/bundles/basic/metadata.py
@ -1,3 +0,0 @@
-defaults = {
-    'locale': 'en_US.UTF-8',
-}