From 4e8ca057e4b9c4a0e844be69cec625cb1fc186fc Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Fri, 19 Jun 2020 15:42:12 +0100 Subject: [PATCH] Revert some of the locale changes --- roles/home-cli/files/shrc | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/roles/home-cli/files/shrc b/roles/home-cli/files/shrc index b36a164..94b08a6 100644 --- a/roles/home-cli/files/shrc +++ b/roles/home-cli/files/shrc @@ -61,10 +61,23 @@ if [ -r /etc/default/locale ] && [ $(. /etc/default/locale; echo $LANG) = "fr_FR export LC_NUMERIC="fr_FR.UTF-8" export LC_TIME="fr_FR.UTF-8" else -## Fall back to no locale. - export LANG="en_US.UTF-8" +## Fall back to British English. + export LANG="en_GB.UTF-8" + export LANGUAGE="en_GB:fr" + 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_GBUTF-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.