From 3cabd55d0bbba0e008a24065f37ff4e8b22ed210 Mon Sep 17 00:00:00 2001 From: uumas Date: Fri, 28 Mar 2025 04:16:59 +0200 Subject: [PATCH] locale: remove legacy gen_locales variable and arch support --- roles/locale/defaults/main.yaml | 4 +--- roles/locale/tasks/main.yaml | 2 +- roles/locale/vars/Archlinux.yaml | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 roles/locale/vars/Archlinux.yaml diff --git a/roles/locale/defaults/main.yaml b/roles/locale/defaults/main.yaml index 73dec50..5bc5b98 100644 --- a/roles/locale/defaults/main.yaml +++ b/roles/locale/defaults/main.yaml @@ -3,12 +3,10 @@ locale_package: [] locale_gen: true locale_configure: true -gen_locales: +locale_gen_locales: - en_US.UTF-8 - en_GB.UTF-8 -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/tasks/main.yaml b/roles/locale/tasks/main.yaml index f648683..15f5c10 100644 --- a/roles/locale/tasks/main.yaml +++ b/roles/locale/tasks/main.yaml @@ -22,7 +22,7 @@ - name: Generate locales community.general.locale_gen: name: "{{ item }}" - loop: "{{ gen_locales }}" + loop: "{{ locale_gen_locales }}" when: locale_gen - name: Put default locale config in place diff --git a/roles/locale/vars/Archlinux.yaml b/roles/locale/vars/Archlinux.yaml deleted file mode 100644 index 1f18767..0000000 --- a/roles/locale/vars/Archlinux.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -locale_config: /etc/locale.conf