diff options
author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-10-30 00:27:05 -0200 |
---|---|---|
committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-10-30 00:27:05 -0200 |
commit | 78629f63e7adcaeac51c357b5d64aad2d2894980 (patch) | |
tree | 1dcf544dbdce76ac949bd0f2bf3b12a16f199e52 /libre/filesystem/locale.sh | |
parent | 570e586c51c4b175d0ee0ddaf46479494654354c (diff) | |
parent | 495352a3f15690fc4a63f40b6a140fb233b0b565 (diff) | |
download | abslibre-78629f63e7adcaeac51c357b5d64aad2d2894980.tar.gz abslibre-78629f63e7adcaeac51c357b5d64aad2d2894980.tar.bz2 abslibre-78629f63e7adcaeac51c357b5d64aad2d2894980.zip |
Merge branch 'master' of ssh://projects.parabola.nu:1863/~git/abslibre
Diffstat (limited to 'libre/filesystem/locale.sh')
-rw-r--r-- | libre/filesystem/locale.sh | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libre/filesystem/locale.sh b/libre/filesystem/locale.sh index 3cfc89c1b..b66587203 100644 --- a/libre/filesystem/locale.sh +++ b/libre/filesystem/locale.sh @@ -1,14 +1,13 @@ #!/bin/sh -unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \ - LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION - -if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then - . "$XDG_CONFIG_HOME/locale.conf" -elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then - . "$HOME/.config/locale.conf" -elif [ -r /etc/locale.conf ]; then - . /etc/locale.conf +if [ -z "$LANG" ]; then + if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then + . "$XDG_CONFIG_HOME/locale.conf" + elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then + . "$HOME/.config/locale.conf" + elif [ -r /etc/locale.conf ]; then + . /etc/locale.conf + fi fi LANG=${LANG:-C} |