diff --git a/dist/changes-1.3.0 b/dist/changes-1.3.0 index 51b48427ba0429d5a0593ffeb790e7ec8de22efb..574971bb159d98a51fabe7603228c633cd3ad1ff 100644 --- a/dist/changes-1.3.0 +++ b/dist/changes-1.3.0 @@ -81,5 +81,10 @@ Wizards * Added a wizard for Qt Designer custom widgets * Added a gitorious clone wizard +Platform Specific + +Mac + * Make use of system's language settings + Additional credits go to: * Christian Hoenig (Locator filter for symbols in current document) diff --git a/src/app/main.cpp b/src/app/main.cpp index 4f6e8090dceb21428513552425371e26bd68df11..ae31aaf3780bb69e6e0a56fb702f88530c9ed44f 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -231,22 +231,6 @@ int main(int argc, char **argv) QTranslator translator; QTranslator qtTranslator; QString locale = QLocale::system().name(); -#ifdef Q_OS_MAC - // because QLocale's system locale is basically useless on the Mac. - // Try to get the real system setting via core foundation - CFArrayRef languages = (CFArrayRef)CFPreferencesCopyValue( - CFSTR("AppleLanguages"), - kCFPreferencesAnyApplication, - kCFPreferencesCurrentUser, - kCFPreferencesAnyHost); -// CFShow(languages); - if (CFArrayGetCount(languages) > 0) { - QString preferredLanguage = stringFromCFString(CFStringRef(CFArrayGetValueAtIndex(languages, 0))); - if (!preferredLanguage.isEmpty()) - locale = preferredLanguage; - } - CFRelease(languages); -#endif const QString &creatorTrPath = QCoreApplication::applicationDirPath() + QLatin1String(SHARE_PATH "/translations"); if (translator.load(QLatin1String("qtcreator_") + locale, creatorTrPath)) {