More macos updates

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/config/zsh/50_aliases b/config/zsh/50_aliases
index c391178..9d0909f 100644 (file)
--- a/config/zsh/50_aliases
+++ b/config/zsh/50_aliases
@@ -26,7 +26,7 @@ case "${$(${g}ls --version | head -1)##* }" in
         alias ls="${g}ls -bCF --color=auto"
         ;;
     *)
-        alias ls="${g}s --group-directories-first -bCF --color=auto"
+        alias ls="${g}ls --group-directories-first -bCF --color=auto"
         ;;
 esac
 

diff --git a/zshenv b/zshenv
index d85db87..5db099e 100644 (file)
--- a/zshenv
+++ b/zshenv
@@ -10,11 +10,13 @@ function _chose_locale() {
 
     locs=(${(M)${(f)"$(locale -a)"%*.utf8}})
     case $locs in
-        *fr_FR*) loc=fr_FR.utf8;;
-        *fr*)    loc=${${(M)locs:#fr*.utf8}[1]};;
-        *en_US*) loc=en_US.utf8;;
-        *en*)    loc=${${(M)locs:#en*.utf8}[1]};;
-        *)       loc=C;;
+        *fr_FR.UTF-8*) loc=fr_FR.UTF-8;;
+        *fr_FR.utf8*)  loc=fr_FR.utf8;;
+        *fr*)          loc=${${(M)locs:#fr*.utf8}[1]};;
+        *en_US.UTF-8*) loc=en_US.UTF-8;;
+        *en_US.utf8*)  loc=en_US.utf8;;
+        *en*)          loc=${${(M)locs:#en*.utf8}[1]};;
+        *)             loc=C;;
     esac
 
     export LC_CTYPE=${loc:-C}