r598 - vdr/vdr-xxv/trunk/debian

[Tobias Grimm]

Author: tiber-guest
Date: 2005-05-30 17:20:34 +0000 (Mon, 30 May 2005)
New Revision: 598

Modified:
   vdr/vdr-xxv/trunk/debian/changelog
   vdr/vdr-xxv/trunk/debian/init
Log:
vdr-xxv: set LANG berfore starting daemon

Modified: vdr/vdr-xxv/trunk/debian/changelog
===================================================================
--- vdr/vdr-xxv/trunk/debian/changelog	2005-05-27 21:01:11 UTC (rev 597)
+++ vdr/vdr-xxv/trunk/debian/changelog	2005-05-30 17:20:34 UTC (rev 598)
@@ -1,3 +1,10 @@
+vdr-xxv (0.35-2) unstable; urgency=low
+
+  * Tobias Grimm <tg@e-tobi.net>
+    - Grab LANG from /etc/environment and set it before starting the daemon
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Mon, 30 May 2005 18:56:51 +0200
+
 vdr-xxv (0.35-1) unstable; urgency=low
 
   * Tobias Grimm <tg@e-tobi.net>

Modified: vdr/vdr-xxv/trunk/debian/init
===================================================================
--- vdr/vdr-xxv/trunk/debian/init	2005-05-27 21:01:11 UTC (rev 597)
+++ vdr/vdr-xxv/trunk/debian/init	2005-05-30 17:20:34 UTC (rev 598)
@@ -52,13 +52,27 @@
 
 
 #
+# Load locale settings
+#
+init_language_environment()
+{
+    if [ -f /etc/environment ]
+    then
+         for var in LANG LC_ALL LC_CTYPE ; do
+	     value=$(egrep "^[^#]*${var}=" /etc/environment | tail -n1 | cut -d= -f2)
+	     eval $var=$value
+	 done
+    fi
+}
+
+
+#
 # Start the daemon
 #
 start()
 {
-#    start-stop-daemon --start --pidfile $PIDFILE  --nicelevel 19 \
-#      -c $USER:$GROUP --exec $DAEMON -- $COMMANDLINE
-    start-stop-daemon --start --pidfile $PIDFILE  --nicelevel 19 \
+    init_language_environment
+    LANG=$LANG start-stop-daemon --start --pidfile $PIDFILE  --nicelevel 19 \
       -c $USER:$GROUP --exec $DAEMON -- $COMMANDLINE
 }