[PC-BSD Commits] r738 - pcbsd/trunk/kcmPBSystem

[svn at pcbsd.org]

Author: tim
Date: 2007-09-17 03:13:24 -0700 (Mon, 17 Sep 2007)
New Revision: 738

Modified:
   pcbsd/trunk/kcmPBSystem/pbsystemtab.ui.h
Log:
Default splash screen should reflect the user's default language.

Modified: pcbsd/trunk/kcmPBSystem/pbsystemtab.ui.h
===================================================================
--- pcbsd/trunk/kcmPBSystem/pbsystemtab.ui.h	2007-09-17 10:04:48 UTC (rev 737)
+++ pcbsd/trunk/kcmPBSystem/pbsystemtab.ui.h	2007-09-17 10:13:24 UTC (rev 738)
@@ -529,11 +529,14 @@
     
     //Load current, get info from registry - /PCBSD/splash-screen
     QSettings settings;
-    QString selectedLang = settings.readEntry("/PCBSD/splash-screen", "en");
+    QString selectedLang = settings.readEntry("/PCBSD/splash-screen", langResolver.language());
+    qDebug("Current Splash: " + selectedLang + " - User's language: " + langResolver.language());
     
     if (selectedLang == "custom") { splashSelect->setCurrentItem(0); }
     else
     {
+	//If we don't have a splash for the user's language, default to english
+	if (codeMap[selectedLang] == "") selectedLang = "en";
 	selectedLang = langResolver.twoAlphaToLanguageName(selectedLang);
 	splashSelect->setCurrentItem(langList.findIndex(selectedLang) + indexMod);
     }