feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ib5e7c433606406d123b4a384ae1b48e2dbb26824
This commit is contained in:
Eike Ziller
2012-11-16 15:31:02 +01:00
parent 51bca85117 5981b1e550
commit 3e7d94c362
22 changed files with 100 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/coreplugin/generalsettings.cpp
View File

@@ -91,7 +91,10 @@ void GeneralSettings::fillLanguageBox() const
const QString locale = languageFile.mid(start, end-start);
// no need to show a language that creator will not load anyway
if (hasQmFilesForLocale(locale, creatorTrPath)) {
m_page->languageBox->addItem(QLocale::languageToString(QLocale(locale).language()), locale);
QLocale tmpLocale(locale);
QString languageItem = QLocale::languageToString(tmpLocale.language()) + QLatin1String(" (")
+ QLocale::countryToString(tmpLocale.country()) + QLatin1Char(')');
m_page->languageBox->addItem(languageItem, locale);
if (locale == currentLocale)
m_page->languageBox->setCurrentIndex(m_page->languageBox->count() - 1);
}