diff --git a/src/plugins/coreplugin/coreimpl.cpp b/src/plugins/coreplugin/coreimpl.cpp index 5a8619ab3a3dbc3c8d4b77c224923216b86d057f..1628bea8246b04b1f8afa110cdde0cbb0ee2072e 100644 --- a/src/plugins/coreplugin/coreimpl.cpp +++ b/src/plugins/coreplugin/coreimpl.cpp @@ -164,6 +164,11 @@ QPrinter *CoreImpl::printer() const return m_mainwindow->printer(); } +QString CoreImpl::userInterfaceLanguage() const +{ + return qApp->property("qtc_locale").toString(); +} + #ifdef Q_OS_MAC # define SHARE_PATH "/../Resources" #else diff --git a/src/plugins/coreplugin/coreimpl.h b/src/plugins/coreplugin/coreimpl.h index e8e114cbbabb5c16c9ba523b8e03d0b8b57b82c3..4fd1149e80f66266c14a5305a239d9d72f6f9e20 100644 --- a/src/plugins/coreplugin/coreimpl.h +++ b/src/plugins/coreplugin/coreimpl.h @@ -72,6 +72,7 @@ public: QSettings *settings(QSettings::Scope scope = QSettings::UserScope) const; SettingsDatabase *settingsDatabase() const; QPrinter *printer() const; + QString userInterfaceLanguage() const; QString resourcePath() const; QString userResourcePath() const; diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h index c914a3c8e83eff771223d1c344d477dd9eab14eb..174a0d3f1bc15b92d5ef51fa4c5566925c669191 100644 --- a/src/plugins/coreplugin/icore.h +++ b/src/plugins/coreplugin/icore.h @@ -101,6 +101,7 @@ public: virtual QSettings *settings(QSettings::Scope scope = QSettings::UserScope) const = 0; virtual SettingsDatabase *settingsDatabase() const = 0; virtual QPrinter *printer() const = 0; + virtual QString userInterfaceLanguage() const = 0; virtual QString resourcePath() const = 0; virtual QString userResourcePath() const = 0; diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp index ea7c04cac7894c3d1da6af85b3cf0cc4637a6dbd..1c10c422ab061c2a6c4a5867db3a5e4a47d88d60 100644 --- a/src/plugins/designer/formeditorplugin.cpp +++ b/src/plugins/designer/formeditorplugin.cpp @@ -86,7 +86,7 @@ bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error) addAutoReleasedObject(new FormEditorFactory); // Ensure that loading designer translations is done before FormEditorW is instantiated - const QString locale = qApp->property("qtc_locale").toString(); + const QString locale = Core::ICore::instance()->userInterfaceLanguage(); if (!locale.isEmpty()) { QTranslator *qtr = new QTranslator(this); const QString &creatorTrPath = diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index a50d1c46eb988a5dd53f74949700bb2373ebbac8..5a7b6fe567082c19c473093070636612b5d86302 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -151,7 +151,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error) Core::Context globalcontext(Core::Constants::C_GLOBAL); Core::Context modecontext(Constants::C_MODE_HELP); - const QString &locale = qApp->property("qtc_locale").toString(); + const QString &locale = m_core->userInterfaceLanguage(); if (!locale.isEmpty()) { QTranslator *qtr = new QTranslator(this); QTranslator *qhelptr = new QTranslator(this); diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp index d1b3662235cb772bc0e92f9cb46576c95e2f46ec..8a908c360525130e9243795d467356470dd8355e 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp @@ -507,10 +507,9 @@ static inline QString attributeValue(const QXmlStreamReader &r, const char *name } // Return locale language attribute "de_UTF8" -> "de", empty string for "C" -static inline QString localeLanguage() +static inline QString languageSetting() { - QLocale loc; - QString name = loc.name(); + QString name = Core::ICore::instance()->userInterfaceLanguage(); const int underScorePos = name.indexOf(QLatin1Char('_')); if (underScorePos != -1) name.truncate(underScorePos); @@ -538,7 +537,7 @@ CustomWizardParameters::ParseResult clear(); bp->clear(); bp->setKind(Core::IWizard::ProjectWizard); - const QString language = localeLanguage(); + const QString language = languageSetting(); CustomWizardField field; do { token = reader.readNext();