From fb16bb4a767b332a3d71f93cbc576d2356f96ad3 Mon Sep 17 00:00:00 2001 From: Michael Gebetsroither Date: Wed, 11 Jul 2007 12:14:01 +0200 Subject: [PATCH] Fixed language environment handling (set LANGUAGE also) --- debian/changelog | 6 +++++- sh-lib | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9b4207d..7e63624 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ grml-shlib (1.02.12) unstable; urgency=low + [ Michael Prokop ] * Fixed some typos. * Cleanup of whitespaces. - -- Michael Prokop Mon, 04 Jun 2007 01:17:35 +0200 + [ Michael Gebetsroither ] + * Fixed language environment handling (set LANGUAGE too) + + -- Michael Gebetsroither Wed, 11 Jul 2007 12:10:08 +0200 grml-shlib (1.02.11) unstable; urgency=low diff --git a/sh-lib b/sh-lib index 4511f21..7c4dfab 100644 --- a/sh-lib +++ b/sh-lib @@ -4,7 +4,6 @@ # Authors: grml-team (grml.org), (c) Michael Gebetsroither # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Mon Jun 04 01:17:23 CEST 2007 [mika] ################################################################################ @@ -30,6 +29,7 @@ CMD_LINE__="" # /proc/cmdline LANG__="$LANG" LC_ALL__="$LC_ALL" +LANGUAGE__="$LANGUAGE" # CONFIG FUNCTIONS {{{ @@ -41,9 +41,9 @@ function setExitFunction { EXIT_FUNCTION__="$1"; } function disableSyslog { SYSLOG__="NO"; } function enableSyslog { SYSLOG__="YES"; } -function saveLang { LANG__="$LANG"; LC_ALL__="$LC_ALL"; } -function restoreLang { LANG="$LANG__"; LC_ALL="$LC_ALL__"; } -function setCLang { saveLang; LANG="C"; LC_ALL="C"; } +function saveLang { LANG__="$LANG"; LC_ALL__="$LC_ALL"; LANGUAGE__="$LANGUAGE"; } +function restoreLang { LANG="$LANG__"; LC_ALL="$LC_ALL__"; LANGUAGE="$LANGUAGE__"; } +function setCLang { saveLang; LANG="C"; LC_ALL="C"; LANGUAGE="C"; } # }}} -- 2.1.4