[Scummvm-cvs-logs] SF.net SVN: scummvm:[50323] scummvm/trunk/gui/options.cpp

[jvprat at users.sourceforge.net]

Revision: 50323
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50323&view=rev
Author:   jvprat
Date:     2010-06-26 15:25:47 +0000 (Sat, 26 Jun 2010)

Log Message:
-----------
GUI: If no language is explicitly selected and autodetection is available, select "<default>" (which is already in use) instead of English.

Modified Paths:
--------------
    scummvm/trunk/gui/options.cpp

Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp	2010-06-26 14:29:50 UTC (rev 50322)
+++ scummvm/trunk/gui/options.cpp	2010-06-26 15:25:47 UTC (rev 50323)
@@ -967,8 +967,18 @@
 		_guiLanguagePopUp->appendEntry(lang->name, lang->id);
 		lang++;
 	}
-	_guiLanguagePopUp->setSelectedTag(TransMan.parseLanguage(ConfMan.get("gui_language").c_str()));
 
+	// Select the currently configured language or default/English if
+	// nothing is specified.
+	if (ConfMan.hasKey("gui_language"))
+		_guiLanguagePopUp->setSelectedTag(TransMan.parseLanguage(ConfMan.get("gui_language")));
+	else
+#ifdef USE_DETECTLANG
+		_guiLanguagePopUp->setSelectedTag(Common::kTranslationAutodetectId);
+#else // !USE_DETECTLANG
+		_guiLanguagePopUp->setSelectedTag(Common::kTranslationBuiltinId);
+#endif // USE_DETECTLANG
+
 #endif // USE_TRANSLATION
 
 	// Activate the first tab


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.