diff --git a/roles/home-cli/files/shrc b/roles/home-cli/files/shrc index 2e45905..72a17ca 100644 --- a/roles/home-cli/files/shrc +++ b/roles/home-cli/files/shrc @@ -45,24 +45,11 @@ set -o emacs set -o noclobber # Locale and language. +## Clear the existing locale settings and set options I always want. export LC_ALL= -export LANG="en_GB.UTF-8" -export LANGUAGE="en_GB:en" -export LC_ADDRESS="en_GB.UTF-8" -export LC_COLLATE="en_GB.UTF-8" -export LC_CTYPE="en_GB.UTF-8" -export LC_IDENTIFICATION="en_GB.UTF-8" -export LC_MEASUREMENT="en_GB.UTF-8" -export LC_MESSAGES="en_GB.UTF-8" -export LC_MONETARY="en_GB.UTF-8" -export LC_NAME="en_GB.UTF-8" -export LC_NUMERIC="en_GB.UTF-8" -export LC_PAPER="en_GB.UTF-8" -export LC_TELEPHONE="en_GB.UTF-8" -export LC_TIME="en_GB.UTF-8" -export PAPERSIZE="a4" export TIME_STYLE="long-iso" -if [ -r /etc/default/locale ] && [ $(. /etc/default/locale && echo $LANG) = "fr_CA.UTF-8" ]; then +## Use Canadian French if that is set as the system locale. +if [ -r /etc/default/locale ] && [ $(. /etc/default/locale; echo $LANG) = "fr_CA.UTF-8" ]; then export LANG="fr_CA.UTF-8" export LANGUAGE="fr_CA:fr" export LC_COLLATE="fr_CA.UTF-8" @@ -73,7 +60,25 @@ if [ -r /etc/default/locale ] && [ $(. /etc/default/locale && echo $LANG) = "fr_ export LC_NAME="fr_CA.UTF-8" export LC_NUMERIC="fr_CA.UTF-8" export LC_TIME="fr_CA.UTF-8" +else +## Fall back to British English. + export LANG="en_GB.UTF-8" + export LANGUAGE="en_GB:en" + export LC_COLLATE="en_GB.UTF-8" + export LC_CTYPE="en_GB.UTF-8" + export LC_IDENTIFICATION="en_GB.UTF-8" + export LC_MEASUREMENT="en_GB.UTF-8" + export LC_MESSAGES="en_GB.UTF-8" + export LC_NAME="en_GB.UTF-8" + export LC_NUMERIC="en_GB.UTF-8" + export LC_TIME="en_GB.UTF-8" fi +## These defaults depend on my physical location. +export LC_ADDRESS="en_GB.UTF-8" +export LC_MONETARY="en_GB.UTF-8" +export LC_PAPER="en_GB.UTF-8" +export LC_TELEPHONE="en_GB.UTF-8" +export PAPERSIZE="a4" # Other exports. export ANSIBLE_NOCOWS=1