From 52862ddfdd69b246f00b7760be230f44db79c8a9 Mon Sep 17 00:00:00 2001 From: uumas Date: Sat, 15 Feb 2025 11:42:20 +0200 Subject: [PATCH] locale: Support configuring formats separately --- roles/locale/defaults/main.yaml | 8 +++++--- roles/locale/templates/locale.j2 | 11 +++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/roles/locale/defaults/main.yaml b/roles/locale/defaults/main.yaml index ddbc529..73dec50 100644 --- a/roles/locale/defaults/main.yaml +++ b/roles/locale/defaults/main.yaml @@ -7,6 +7,8 @@ gen_locales: - en_US.UTF-8 - en_GB.UTF-8 -lang: en_US.UTF-8 -lc_messages: "{{ lang }}" -language: "en_US:en" +locale_gen_locales: "{{ gen_locales }}" + +locale_lang: "{{ lang | default('en_US.UTF-8') }}" +locale_lc_messages: "{{ locale_lang }}" +locale_formats: "{{ locale_lang }}" diff --git a/roles/locale/templates/locale.j2 b/roles/locale/templates/locale.j2 index 075e08a..2c69b6d 100644 --- a/roles/locale/templates/locale.j2 +++ b/roles/locale/templates/locale.j2 @@ -1,6 +1,9 @@ # {{ ansible_managed }} -LANG="{{ lang }}" -LC_MESSAGES="{{ lc_messages }}" -LANGUAGE="{{ language }}" - +LANG={{ locale_lang }} +LC_MESSAGES={{ locale_lc_messages }} +LC_NUMERIC={{ locale_formats }} +LC_TIME={{ locale_formats }} +LC_MONETARY={{ locale_formats }} +LC_PAPER={{ locale_formats }} +LC_MEASUREMENT={{ locale_formats }}