diff options
| author | Omar Vega Ramos <ovruni@gnu.org.pe> | 2018-03-12 16:52:44 -0500 |
|---|---|---|
| committer | Omar Vega Ramos <ovruni@gnu.org.pe> | 2018-03-12 16:52:44 -0500 |
| commit | 3d1e990c7f226c166eaffcd70766da105f17f5b4 (patch) | |
| tree | b4f6bb71cf62a3d0bf532b52845499c44c496c0c /libre/filesystem/locale.sh | |
| parent | 9e8c1b3aba0410de3ee7f33230789f9b9369d32b (diff) | |
filesystem-2018.1-2.parabola1: updating version
Diffstat (limited to 'libre/filesystem/locale.sh')
| -rw-r--r-- | libre/filesystem/locale.sh | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/libre/filesystem/locale.sh b/libre/filesystem/locale.sh index 11b7dc9ec..48dd748da 100644 --- a/libre/filesystem/locale.sh +++ b/libre/filesystem/locale.sh @@ -1,5 +1,8 @@ #!/bin/sh +# load locale.conf in XDG paths. +# /etc/locale.conf loads and overrides by kernel command line is done by systemd +# But we override it here, see FS#56688 if [ -z "$LANG" ]; then if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then . "$XDG_CONFIG_HOME/locale.conf" @@ -10,17 +13,10 @@ if [ -z "$LANG" ]; then fi fi +# define default LANG to C if not already defined LANG=${LANG:-C} -export LANG -[ -n "$LC_CTYPE" ] && export LC_CTYPE -[ -n "$LC_NUMERIC" ] && export LC_NUMERIC -[ -n "$LC_TIME" ] && export LC_TIME -[ -n "$LC_COLLATE" ] && export LC_COLLATE -[ -n "$LC_MONETARY" ] && export LC_MONETARY -[ -n "$LC_MESSAGES" ] && export LC_MESSAGES -[ -n "$LC_PAPER" ] && export LC_PAPER -[ -n "$LC_NAME" ] && export LC_NAME -[ -n "$LC_ADDRESS" ] && export LC_ADDRESS -[ -n "$LC_TELEPHONE" ] && export LC_TELEPHONE -[ -n "$LC_MEASUREMENT" ] && export LC_MEASUREMENT -[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION + +# export all locale (7) variables when they exist +export LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \ + LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT \ + LC_IDENTIFICATION |