From 38bdca2b80e39dd5aaef229395f380770051de39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
Date: Thu, 15 Oct 2015 17:33:01 +0200
Subject: [PATCH] Use system-defined language as default in TDM This resolves
 Bug 1596 (cherry picked from commit bd35f1efd6badf57feab8ea618b49fe670475589)

---
 tdm/backend/session.c     | 4 ++++
 tdm/kfrontend/tdm_greet.c | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/tdm/backend/session.c b/tdm/backend/session.c
index 9a12ce312..4b5f372db 100644
--- a/tdm/backend/session.c
+++ b/tdm/backend/session.c
@@ -807,6 +807,10 @@ systemEnv( const char *user )
 	env = baseEnv( user );
 	if (td->authFile)
 		env = setEnv( env, "XAUTHORITY", td->authFile );
+	char *lang = getenv("LANG");
+	if (lang != NULL) {
+		env = setEnv( env, "LANG", lang );
+	}
 	env = setEnv( env, "PATH", td->systemPath );
 	env = setEnv( env, "SHELL", td->systemShell );
 	return env;
diff --git a/tdm/kfrontend/tdm_greet.c b/tdm/kfrontend/tdm_greet.c
index c90ebc1c9..5c77fadf0 100644
--- a/tdm/kfrontend/tdm_greet.c
+++ b/tdm/kfrontend/tdm_greet.c
@@ -779,7 +779,12 @@ main( int argc ATTR_UNUSED, char **argv )
 		LogPanic( "Cannot save $HOME\n" );
 	atexit( cleanup );
 
-	setenv( "LC_ALL", _language, 1 );
+	if ( getenv( "LANG" ) == NULL ) {
+		setenv( "LC_ALL", _language, 1 );
+	}
+	else {
+		setenv( "LC_ALL", getenv( "LANG" ), 1 );
+	}
 
 	kg_main( argv[0] );