diff --git a/srcpkgs/base-files/files/locale.sh b/srcpkgs/base-files/files/locale.sh index 8486367bfab..dffa0f7e666 100644 --- a/srcpkgs/base-files/files/locale.sh +++ b/srcpkgs/base-files/files/locale.sh @@ -1,9 +1,16 @@ # Sets up locale system settings from /etc/locale.conf. # -if [ -s /etc/locale.conf ]; then - . /etc/locale.conf + +# Don't load locale.conf if locale is already set up +if [ -z "$LANG" ]; then + if [ -s /etc/locale.conf ]; then + . /etc/locale.conf + fi fi +# define default LANG to C.UTF-8 if not already set +LANG="${LANG:-C.UTF-8}" + export LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY export LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT -export LC_INDENTIFICATION +export LC_IDENTIFICATION diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template index 64e756be34d..f925178f19b 100644 --- a/srcpkgs/base-files/template +++ b/srcpkgs/base-files/template @@ -1,6 +1,6 @@ # Template file for 'base-files' pkgname=base-files -version=0.144 +version=0.145 revision=1 bootstrap=yes depends="xbps-triggers"