diff --git a/roles/home-cli/files/shrc b/roles/home-cli/files/shrc index e30d662..b36a164 100644 --- a/roles/home-cli/files/shrc +++ b/roles/home-cli/files/shrc @@ -48,36 +48,23 @@ set -o noclobber ## Clear the existing locale settings and set options I always want. export LC_ALL= export TIME_STYLE="long-iso" -## 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" - export LC_CTYPE="fr_CA.UTF-8" - export LC_IDENTIFICATION="fr_CA.UTF-8" - export LC_MEASUREMENT="fr_CA.UTF-8" - export LC_MESSAGES="fr_CA.UTF-8" - export LC_NAME="fr_CA.UTF-8" - export LC_NUMERIC="fr_CA.UTF-8" - export LC_TIME="fr_CA.UTF-8" +## Use French if that is set as the system locale. +if [ -r /etc/default/locale ] && [ $(. /etc/default/locale; echo $LANG) = "fr_FR.UTF-8" ]; then + export LANG="fr_FR.UTF-8" + export LANGUAGE="fr_FR:fr" + export LC_COLLATE="fr_FR.UTF-8" + export LC_CTYPE="fr_FR.UTF-8" + export LC_IDENTIFICATION="fr_FR.UTF-8" + export LC_MEASUREMENT="fr_FRUTF-8" + export LC_MESSAGES="fr_FR.UTF-8" + export LC_NAME="fr_FR.UTF-8" + export LC_NUMERIC="fr_FR.UTF-8" + export LC_TIME="fr_FR.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" +## Fall back to no locale. + export LANG="en_US.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.