diff options
| author | Britney Fransen <brfransen@gmail.com> | 2015-08-09 19:47:51 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2015-08-09 19:47:51 (GMT) |
| commit | 19ebf7c8c7ccdde7f0e2ee779f56b57d596df5fd (patch) | |
| tree | bd7eb9601d071e45ef187a5f7fc7238e65838592 /abs/core/filesystem/locale.sh | |
| parent | 50895f38e1d64e9ea39558f6aab60dc6f5fbbea8 (diff) | |
| download | linhes_pkgbuild-19ebf7c8c7ccdde7f0e2ee779f56b57d596df5fd.zip linhes_pkgbuild-19ebf7c8c7ccdde7f0e2ee779f56b57d596df5fd.tar.gz linhes_pkgbuild-19ebf7c8c7ccdde7f0e2ee779f56b57d596df5fd.tar.bz2 | |
filesystem: update to 2015.02
Diffstat (limited to 'abs/core/filesystem/locale.sh')
| -rw-r--r-- | abs/core/filesystem/locale.sh | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/abs/core/filesystem/locale.sh b/abs/core/filesystem/locale.sh index 5fd4174..11b7dc9 100644 --- a/abs/core/filesystem/locale.sh +++ b/abs/core/filesystem/locale.sh @@ -1,19 +1,17 @@ #!/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 -elif [ -r /etc/rc.conf ]; then - LANG=$(. /etc/rc.conf 2>/dev/null; echo "$LOCALE") +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 -export LANG="${LANG:-C}" +LANG=${LANG:-C} +export LANG [ -n "$LC_CTYPE" ] && export LC_CTYPE [ -n "$LC_NUMERIC" ] && export LC_NUMERIC [ -n "$LC_TIME" ] && export LC_TIME |