X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshenv;h=0f12462205907eb2e051cb32238a417de4a792e6;hb=fbcf64be606a6956dc4c4ade15775e4a4670366f;hp=0830328b08bbfab1782fa7b7247ed7ef676a1afb;hpb=f60f4964bd1f53fc8aec9451e806a38a618806e3;p=grml-etc-core.git

diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv
index 0830328..0f12462 100644
--- a/etc/zsh/zshenv
+++ b/etc/zsh/zshenv
@@ -24,7 +24,11 @@
 # language settings (read in /etc/environment before /etc/default/locale as
 # the latter one is the default on Debian nowadays)
   [ -r /etc/environment    ] && source /etc/environment
-  [ -r /etc/default/locale ] && source /etc/default/locale
+  if [ -n "$LANG" ]  ; then
+     export LANG
+  else
+     [ -r /etc/default/locale ] && source /etc/default/locale
+  fi
   [ -n "$LANG" ]          && export LANG || export LANG="en_US.iso885915"
   [ -n "$LC_ALL" ]        && export LC_ALL
   [ -n "$LC_MESSAGES" ]   && export LC_MESSAGES