@@ -35,6 +35,7 @@ #include <QApplication> #include <QMessageBox> #include <QTranslator> +#include <QSystemLocale> #include <QGLFormat> #include <QDebug> #include <QLibraryInfo> @@ -132,12 +133,28 @@ int main(int argc, char *argv[]) } } - QString translationCode = QLocale::system().name(); translationPaths << QCoreApplication::applicationDirPath() + "/../share/avogadro/i18n/"; #ifdef Q_WS_MAC translationPaths << QString(INSTALL_PREFIX) + "/share/avogadro/i18n/"; #endif + // Get the locale for translations + QString translationCode = QLocale::system().name(); +#if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)) +#ifdef Q_WS_MAC + // The QLocale::system() call on Mac doesn't reflect the default language -- only the default locale formatting + // so we'll fine-tune the respone with QSystemLocale + // This only applies to Qt/Mac 4.6.x and later, which added the appropriate Carbon magic to QSystemLocale. + QSystemLocale sysLocale; + QLocale::Language sysLanguage = static_cast<QLocale::Language>(sysLocale.query(QSystemLocale::LanguageId, QVariant()).toInt()); + translationCode = QLocale::languageToString( sysLanguage ); + qDebug() << " translation code: " << sysLanguage; + QLocale::Country sysCountry = static_cast<QLocale::Country>(sysLocale.query(QSystemLocale::CountryId, QVariant()).toInt()); + if (sysCountry != QLocale::AnyCountry) + translationCode += '_' + QLocale::countryToString( sysCountry ); +#endif +#endif + qDebug() << "Locale: " << translationCode; // Load Qt translations first bool tryLoadingQtTranslations = false; avogadro/src/main.cpp 9580aec326acbf68af1e1fb273979c81d4d16a4e Geoff Hutchison babel@geoffhutchison.net http://github.com/cryos/avogadro/commit/a875f17a24d9e551426be432e1008ec29477026a a875f17a24d9e551426be432e1008ec29477026a 2009-10-28T12:23:34-07:00 2009-10-28T12:23:34-07:00 Add support for Qt-4.6 Mac language preferences. 3296ddce8d010e0a3abfd0836bcd70519e55b580 Geoff Hutchison babel@geoffhutchison.net