From ede36e48a8565b1d1f0b2e01082412b8e752ef6c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 30 Aug 2024 22:16:04 +0200 Subject: [PATCH] =?UTF-8?q?language=20=E2=86=92=20locale?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spcd/bootstrap.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 3738e5b..4e0db62 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -177,12 +177,12 @@ _spcd_step_wipe() { # ╰───┴─────╯ _SPCD_TXT_CHARSET="UTF-8" -_SPCD_TXT_LANGUAGE_DEFAULT="C" +_SPCD_TXT_LOCALE_DEFAULT="C" _spcd_txt_pick() { - case "${SPCD_TXT_LANGUAGE}" in - "${SPCD_TXT_LANGUAGE_ENGLISH}") echo "${1}" ;; - "${SPCD_TXT_LANGUAGE_FRENCH}") echo "${2}" ;; + case "${SPCD_TXT_LOCALE}" in + "${SPCD_TXT_LOCALE_ENGLISH}") echo "${1}" ;; + "${SPCD_TXT_LOCALE_FRENCH}") echo "${2}" ;; *) ;; esac } @@ -322,8 +322,8 @@ spcd_step_out() { # │ functions │ txt │ # ╰───────────┴─────╯ -SPCD_TXT_LANGUAGE_ENGLISH="en_US" -SPCD_TXT_LANGUAGE_FRENCH="fr_FR" +SPCD_TXT_LOCALE_ENGLISH="en_US" +SPCD_TXT_LOCALE_FRENCH="fr_FR" spcd_txt_get() { case "${1}" in @@ -337,7 +337,7 @@ spcd_txt_locale() { if [ -n "${1}" ]; then spcd_step__locale__value="${1}" else - spcd_step__locale__value="${_SPCD_TXT_LANGUAGE_DEFAULT}" + spcd_step__locale__value="${_SPCD_TXT_LOCALE_DEFAULT}" fi spcd_step__locale__value="${spcd_step__locale__value}.${_SPCD_TXT_CHARSET}" set -- \ @@ -432,8 +432,8 @@ spcd_step__environment_defaults_set() { [ -n "${SPCD_REF_RELEASE}" ] || SPCD_REF_RELEASE="main" [ -n "${SPCD_REF_STAGING}" ] || SPCD_REF_STAGING="dev" - [ -n "${SPCD_TXT_LANGUAGE}" ] || - SPCD_TXT_LANGUAGE="${SPCD_TXT_LANGUAGE_ENGLISH}" + [ -n "${SPCD_TXT_LOCALE}" ] || + SPCD_TXT_LOCALE="${SPCD_TXT_LOCALE_ENGLISH}" [ -n "${SPCD_URL_ALMA}" ] || # /almalinux/$releasever/… @@ -1162,8 +1162,8 @@ spcd_step__packages_verify_https() { spcd_step__packages_install_locales() { spcd_step "Install locales" set -- \ - "${SPCD_TXT_LANGUAGE_ENGLISH}" \ - "${SPCD_TXT_LANGUAGE_FRENCH}" + "${SPCD_TXT_LOCALE_ENGLISH}" \ + "${SPCD_TXT_LOCALE_FRENCH}" case "${SPCD_PM}" in "${SPCD_PM_APK}") spcd_install_package "musl-locales" ;; "${SPCD_PM_APT}") @@ -1188,7 +1188,7 @@ ${spcd_step__pil__locale}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} "${SPCD_PM_ZYPPER}") spcd_install_package "glibc-locale" ;; *) ;; esac - spcd_txt_locale "${SPCD_TXT_LANGUAGE}" + spcd_txt_locale "${SPCD_TXT_LOCALE}" } spcd_step__packages_upgrade_system() {