--- trunk/magellan-initscripts/etc/profile	2011/05/27 18:51:40	1315
+++ trunk/initscripts/sysvinit/etc/profile	2011/06/04 21:05:01	1356
@@ -31,7 +31,7 @@
 
 if [ -z "$EDITOR" ]
 then
-	source /etc/rc.config 2> /dev/null
+	source /etc/conf.d/editor 2> /dev/null
 	# check if $EDITOR is still zero than use default
 	if [ -z "${EDITOR}" ]
 	then
@@ -39,3 +39,33 @@
 	fi
 	export EDITOR
 fi
+
+if [ -e "/etc/conf.d/locale" ]
+then
+	source /etc/conf.d/locale
+
+	[ -n "$LANG" ] && export LANG || unset LANG
+	[ -n "$LC_ADDRESS" ] && export LC_ADDRESS || unset LC_ADDRESS
+	[ -n "$LC_CTYPE" ] && export LC_CTYPE || unset LC_CTYPE
+	[ -n "$LC_COLLATE" ] && export LC_COLLATE || unset LC_COLLATE
+	[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION || unset LC_IDENTIFICATION
+	[ -n "$LC_MEASUREMENT" ] && export LC_MEASUREMENT || unset LC_MEASUREMENT
+	[ -n "$LC_MESSAGES" ] && export LC_MESSAGES || unset LC_MESSAGES
+	[ -n "$LC_MONETARY" ] && export LC_MONETARY || unset LC_MONETARY
+	[ -n "$LC_NAME" ] && export LC_NAME || unset LC_NAME
+	[ -n "$LC_NUMERIC" ] && export LC_NUMERIC || unset LC_NUMERIC
+	[ -n "$LC_PAPER" ] && export LC_PAPER || unset LC_PAPER
+	[ -n "$LC_TELEPHONE" ] && export LC_TELEPHONE || unset LC_TELEPHONE
+	[ -n "$LC_TIME" ] && export LC_TIME || unset LC_TIME
+	if [ -n "$LC_ALL" ]
+	then
+		if [ "$LC_ALL" != "$LANG" ]
+		then
+			export LC_ALL
+		else
+			unset LC_ALL
+		fi
+	else
+		unset LC_ALL
+	fi
+fi