ant/workstation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use fr_FR (instead of fr_CA) and en_US (instead of en_GB)

Browse source
This commit is contained in:
Anthony Rose 2020-06-19 15:17:51 +01:00
parent e067181f68
commit e5d3ffbed7
1 changed files with 14 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
roles/home-cli/files/shrc
View file

@ -48,36 +48,23 @@ set -o noclobber
## Clear the existing locale settings and set options I always want. ## Clear the existing locale settings and set options I always want.
export LC_ALL= export LC_ALL=
export TIME_STYLE="long-iso" export TIME_STYLE="long-iso"
## Use Canadian French if that is set as the system locale. ## Use French if that is set as the system locale.
if [ -r /etc/default/locale ] && [ $(. /etc/default/locale; echo $LANG) = "fr_CA.UTF-8" ]; then if [ -r /etc/default/locale ] && [ $(. /etc/default/locale; echo $LANG) = "fr_FR.UTF-8" ]; then
export LANG="fr_CA.UTF-8" export LANG="fr_FR.UTF-8"
export LANGUAGE="fr_CA:fr" export LANGUAGE="fr_FR:fr"
export LC_COLLATE="fr_CA.UTF-8" export LC_COLLATE="fr_FR.UTF-8"
export LC_CTYPE="fr_CA.UTF-8" export LC_CTYPE="fr_FR.UTF-8"
export LC_IDENTIFICATION="fr_CA.UTF-8" export LC_IDENTIFICATION="fr_FR.UTF-8"
export LC_MEASUREMENT="fr_CA.UTF-8" export LC_MEASUREMENT="fr_FRUTF-8"
export LC_MESSAGES="fr_CA.UTF-8" export LC_MESSAGES="fr_FR.UTF-8"
export LC_NAME="fr_CA.UTF-8" export LC_NAME="fr_FR.UTF-8"
export LC_NUMERIC="fr_CA.UTF-8" export LC_NUMERIC="fr_FR.UTF-8"
export LC_TIME="fr_CA.UTF-8" export LC_TIME="fr_FR.UTF-8"
else else
## Fall back to British English. ## Fall back to no locale.
export LANG="en_GB.UTF-8" export LANG="en_US.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 fi
## These defaults depend on my physical location. ## 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" export PAPERSIZE="a4"
# Other exports. # Other exports.