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

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdebase/kcontrol/kcontrol
From:       Marcus Camen <mcamen () mcamen ! de>
Date:       2004-07-19 13:05:25
Message-ID: 20040719130525.E6FFD99E2 () office ! kde ! org
[Download RAW message or body]

CVS commit by mcamen: 

BACKPORT:

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

* Bump year in KAboutData


  M +5 -2      kcmshell.cpp   1.72.2.2


--- kdebase/kcontrol/kcontrol/kcmshell.cpp  #1.72.2.1:1.72.2.2
@@ -148,5 +148,5 @@ extern "C" int kdemain(int _argc, char *
                           I18N_NOOP("A tool to start single KDE control modules"),
                           KAboutData::License_GPL,
-                          "(c) 1999-2002, The KDE Developers");
+                          "(c) 1999-2004, The KDE Developers");
 
     aboutData.addAuthor("Daniel Molkentin", I18N_NOOP("Current Maintainer"), "molkentin@kde.org");
@@ -164,5 +164,8 @@ extern "C" int kdemain(int _argc, char *
     KGlobal::iconLoader()->addAppDir( "kcontrol" );
 
-    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]