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

Unset acctsvclang and reorder locale detection

Browse source
This commit is contained in:
Anthony Rose 2021-02-10 00:44:11 +00:00
parent bde906a55f
commit 64b115d76e
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roles/home-cli/files/shrc
View file

@ -72,11 +72,12 @@ acctsvclang=$(dbus-send \
| awk '{print $2}') | awk '{print $2}')
if [ -n "$acctsvclang" ]; then if [ -n "$acctsvclang" ]; then
LANG=$acctsvclang LANG=$acctsvclang
elif [ -r "$HOME/.config/user-dirs.locale" ]; then
LANG="$(cat $HOME/.config/user-dirs.locale).UTF-8"
elif [ -r "$HOME/.config/locale.conf" ]; then elif [ -r "$HOME/.config/locale.conf" ]; then
. "$HOME/.config/locale.conf" . "$HOME/.config/locale.conf"
elif [ -r "$HOME/.config/user-dirs.locale" ]; then
LANG="$(cat $HOME/.config/user-dirs.locale).UTF-8"
fi fi
unset acctsvclang
case "$LANG" in case "$LANG" in
"en_GB.UTF-8") "en_GB.UTF-8")
LANGUAGE="en_GB:en" LANGUAGE="en_GB:en"