From: Frank Terbeck <ft@bewatermyfriend.org>
Date: Tue, 31 Mar 2009 11:23:59 +0000 (+0200)
Subject: zshrc: always read '/etc/default/locale'
X-Git-Tag: v0.3.65~1
X-Git-Url: https://git.grml.org/?p=grml-etc-core.git;a=commitdiff_plain;h=76706fcdd9c160d7f3212e597d2139f45531da72

zshrc: always read '/etc/default/locale'
---

diff --git a/debian/changelog b/debian/changelog
index bd5ccc5..f7f8436 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,13 +10,15 @@ grml-etc-core (0.3.65) UNRELEASED; urgency=low
     typing; by Alexander Steinböck [Closes: issue616]
   * zshrc: Fix pattern to extract battery status from newer acpi
     versions. [Closes: issue657]
+  * zshrc: Always read /etc/default/locale. Users are expected to
+    adjust locale settings via '.zshrc.local'.
 
   [ Michael Prokop ]
   * vimrc: add check for $NOPRECMD [Closes: issue447]
   * zshrc: use 'setopt noglobdots' as [Open]SuSE uses in its
     /etc/zshrc 'setopt globdots' by default.
 
- -- Frank Terbeck <ft@grml.org>  Tue, 31 Mar 2009 00:16:19 +0200
+ -- Frank Terbeck <ft@grml.org>  Tue, 31 Mar 2009 13:21:52 +0200
 
 grml-etc-core (0.3.64) unstable; urgency=low
 
diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 32f3831..aed180c 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -453,9 +453,7 @@ zrclocal() {
 #}}}
 
 # locale setup {{{
-if [[ -z "$LANG" ]] ; then
-   xsource "/etc/default/locale"
-fi
+xsource "/etc/default/locale"
 
 export LANG=${LANG:-en_US.iso885915}
 for var in LC_ALL LC_MESSAGES ; do