ant/workstation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify locale handling

Browse source
This commit is contained in:
Anthony Rose 2021-02-21 01:16:17 +00:00
parent dc8e774e95
commit df6dc24860
1 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
roles/home-cli/files/bashrc
View file

@ -38,22 +38,19 @@ set -o noclobber
# Locale and language. # Locale and language.
## Clear the existing locale settings and set options I always want. ## Clear the existing locale settings and set options I always want.
export LC_ALL=
export TIME_STYLE=long-iso # Used by GNU 'ls'. export TIME_STYLE=long-iso # Used by GNU 'ls'.
## Set the default language. if [ ! -r "$HOME/.config/locale.conf" ]
_acp_dbus_account="$(dbus-send --system --print-reply=literal --dest=org.freedesktop.Accounts --type=method_call /org/freedesktop/Accounts org.freedesktop.Accounts.FindUserById int64:$(id -u) 2>/dev/null)" then
_acp_dbus_lang="$(dbus-send --system --print-reply=literal --dest=org.freedesktop.Accounts $_acp_dbus_account org.freedesktop.DBus.Properties.Get string:org.freedesktop.Accounts.User string:Language 2>/dev/null | awk '{print $2}')" if [ -r /etc/locale.conf ]
thenn
if [ -n "$_acp_dbus_lang" ] cp /etc/locale.conf "$HOME/.config/locale.conf"
then else
LANG="$_acp_dbus_lang" echo "LANG=\"${LANG-C}\"" > "$HOME/.config/locale.conf"
elif [ -r "$HOME/.config/locale.conf" ]
then
. "$HOME/.config/locale.conf"
fi fi
unset _acp_dbus_lang fi
unset _acp_dbus_account . "$HOME/.config/locale.conf"
case "$LANG" in case "$LANG" in
en_GB.UTF-8|en_GB.utf8) en_GB.UTF-8|en_GB.utf8)
@ -79,13 +76,6 @@ fr_CA.UTF-8|fr_CA.uft8)
;; ;;
esac esac
# Check that the locale exists. If not, use LANG=C.
if [ -x /usr/bin/locale ] && [ $(locale -a 2>/dev/null | grep -e ${LANG-invalid} -e $(echo "$LANG" | sed 's/\.UTF-8$/.utf8/') -e $(echo "$LANG" | sed 's/\.UTF-8$/.uft8/') | wc -l) -eq 0 ]
then
LANG=C
LANGUAGE=C:en
fi
export LANG export LANG
export LANGUAGE export LANGUAGE
export PAPERSIZE export PAPERSIZE