[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    new_kcm_code: kdelibs/kcmshell
From:       Frans Englich <frans.englich () telia ! com>
Date:       2004-07-20 0:03:37
Message-ID: 20040720000337.A5F2E9A2A () office ! kde ! org
[Download RAW message or body]

CVS commit by englich: 

Forward porting:

CVS commit by mcamen: 

* Override locale settings only if kcmshell has been started
  with '--lang <language>'.
  http://lists.kde.org/?t=109001918700001


  M +3 -1      main.cpp   1.75.2.4


--- kdelibs/kcmshell/main.cpp  #1.75.2.3:1.75.2.4
@@ -194,5 +194,7 @@ extern "C" int kdemain(int _argc, char *
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
-    KGlobal::locale()->setLanguage(args->getOption("lang"));
+    QCString lang = args->getOption("lang");
+    if( !lang.isNull() )
+        KGlobal::locale()->setLanguage(lang);
 
     if (args->isSet("list")) {


[prev in list] [next in list] [prev in thread] [next in thread]