Fix ui language for custom wizards.

Introduces a ICore::userInterfaceLanguage method, which centralizes the
previous qApp property hack for help and designer integration.

Reviewed-by: Friedemann Kleint

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

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;

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;

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 =

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);

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 = Core::ICore::instance()->userInterfaceLanguage();
-    QString name = loc.name();
     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();