diff --git a/readme.md b/readme.md index f52cdc3..1b93a7f 100644 --- a/readme.md +++ b/readme.md @@ -222,6 +222,13 @@ Handle project workflows in a unified way: #### Shell * comment +* display locales + * default + * available + * effective + * selected + * available + * effective * handle errors * packages * configure diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 3b510f8..8427ef2 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -378,9 +378,8 @@ spcd_txt_get() { } spcd_txt_locale() { - locale - spcd_split local value name + locale if [ -n "${1}" ]; then value="${1}" else @@ -408,20 +407,11 @@ spcd_txt_locale() { locale } -spcd_txt_locales_echo() { - case "${1}" in - "LANGUAGE") spcd_os_printenv "LANGUAGE" ;; - *) locale -a ;; - esac -} - spcd_txt_locales() { set -- \ "${SPCD_TXT_LOCALE_ENGLISH}" \ "${SPCD_TXT_LOCALE_FRENCH}" local language locale text - spcd_txt_locales_echo - spcd_split for locale in "${@}"; do case "${1}" in "glibc-langpack-") @@ -448,8 +438,6 @@ ${locale}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} "locale.gen") spcd_os_write "/etc/locale.gen" "${text}" ;; *) ;; esac - spcd_split - spcd_txt_locales_echo } # ╭──────╮