source /etc/default/locale only if LANG is not set

diff --git a/debian/changelog b/debian/changelog
index 5e6c7de..c167d09 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-etc-core (0.2.24) unstable; urgency=low
+
+  * /etc/zsh/zshenv: source /etc/default/locale only if
+    $LANG is not set. If $LANG is not set at all fall
+    back to en_US.iso885915 as usual. This allows manual
+    overwriting of $LANG.
+
+ -- Michael Prokop <mika@grml.org>  Sun, 25 Feb 2007 22:08:55 +0100
+
 grml-etc-core (0.2.23) unstable; urgency=low
 
   * /etc/zsh/zshrc:

diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv
index 0830328..0f12462 100644 (file)
--- 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