diff options
| author | albator <albator@arcadia.vtf> | 2011-10-21 20:16:07 +0200 |
|---|---|---|
| committer | albator <albator@arcadia.vtf> | 2011-10-21 20:16:07 +0200 |
| commit | 7a0adf35896618a7570e425941fc1b74c54def47 (patch) | |
| tree | 16dab9d8bfbd93575440f357c70907cbb5480980 /mandriva/2010.2/kdebase/kdebase-3.5.7-translation-override.patch | |
| parent | cd71be65dc30c8007ec54becdf6c50260ed8e908 (diff) | |
| parent | a8707e2a9f22d082cecb8ea6079175076f983c55 (diff) | |
| download | tde-packaging-7a0adf35896618a7570e425941fc1b74c54def47.tar.gz tde-packaging-7a0adf35896618a7570e425941fc1b74c54def47.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'mandriva/2010.2/kdebase/kdebase-3.5.7-translation-override.patch')
| -rw-r--r-- | mandriva/2010.2/kdebase/kdebase-3.5.7-translation-override.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5.7-translation-override.patch b/mandriva/2010.2/kdebase/kdebase-3.5.7-translation-override.patch new file mode 100644 index 000000000..06848904d --- /dev/null +++ b/mandriva/2010.2/kdebase/kdebase-3.5.7-translation-override.patch @@ -0,0 +1,26 @@ +--- kdebase-3.5.7/kdm/kfrontend/kdm_greet.c.fixlang 2007-10-02 16:56:25.000000000 -0300 ++++ kdebase-3.5.7/kdm/kfrontend/kdm_greet.c 2007-10-02 15:07:58.000000000 -0300 +@@ -779,7 +779,10 @@ 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] ); + +--- kdebase-3.5.7/kdm/backend/session.c.fixlang 2007-10-02 16:56:58.000000000 -0300 ++++ kdebase-3.5.7/kdm/backend/session.c 2007-10-02 16:18:21.000000000 -0300 +@@ -802,6 +802,9 @@ 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; |