diff --git a/share/qtcreator/templates/wizards/helloworld/wizard_sample.xml b/share/qtcreator/templates/wizards/helloworld/wizard_sample.xml index 23af3d6802b20509c6a0d119528b8fa8db70542e..d216ea61780d3f5e4b0424acecef488937228cfd 100644 --- a/share/qtcreator/templates/wizards/helloworld/wizard_sample.xml +++ b/share/qtcreator/templates/wizards/helloworld/wizard_sample.xml @@ -39,11 +39,8 @@ leave room for the Qt 4 target page. id="A.HelloWorld" category="B.CustomProjects"> <icon>console.png</icon> <description>Creates a hello-world-project with custom message.</description> - <description xml:lang="de">Erzeugt ein Hello-Welt-Projekt mit einer Nachricht.</description> - <displayName>Hello World</displayName>; - <displayName xml:lang="de">Hallo Welt</displayName>; - <displayCategory>Custom Projects</displayCategory> - <displayCategory xml:lang="de">Benutzerdefinierte Projekte</displayCategory> + <displayname>Hello World</displayname>; + <displaycategory>Custom Projects</displaycategory> <files> <file source="main.cpp"/> <file source="project.pro" target="%ProjectName%.pro"/> diff --git a/share/qtcreator/templates/wizards/listmodel/wizard_sample.xml b/share/qtcreator/templates/wizards/listmodel/wizard_sample.xml index c924b896db045ac6f22e60faebbaa695bcda53b3..c81715fc860f012db8f9babeee00e68dc2874dc8 100644 --- a/share/qtcreator/templates/wizards/listmodel/wizard_sample.xml +++ b/share/qtcreator/templates/wizards/listmodel/wizard_sample.xml @@ -33,10 +33,10 @@ Custom class wizard example configuration file. --> <wizard version="1" kind="class" id="A.ListModel" category="B.CustomClasses"> <description>Creates a QAbstractListModel implementation.</description> <description xml:lang="de">Erzeugt eine Implementierung von QAbstractListModel.</description> - <displayName>QAbstractListModel implementation</displayName>; - <displayName xml:lang="de">Implementierung von QAbstractListModel</displayName>; - <displayCategory>Custom Classes</displayCategory> - <displayCategory xml:lang="de">Benutzerdefinierte Klassen</displayCategory> + <displayname>QAbstractListModel implementation</displayname>; + <displayname xml:lang="de">Implementierung von QAbstractListModel</displayname>; + <displaycategory>Custom Classes</displaycategory> + <displaycategory xml:lang="de">Benutzerdefinierte Klassen</displaycategory> <files> <file source="listmodel.cpp" target="%ClassName:l%.%CppSourceSuffix%"/> <file source="listmodel.h" target="%ClassName:l%.%CppHeaderSuffix%"/> diff --git a/share/qtcreator/templates/wizards/qml-runtime/wizard.xml b/share/qtcreator/templates/wizards/qml-runtime/wizard.xml index 14db77f70e3ba71411194cebde280fc0261b6d9d..39b1d675b399fb6ee6585b3f2bf9a7a7b5c6554c 100644 --- a/share/qtcreator/templates/wizards/qml-runtime/wizard.xml +++ b/share/qtcreator/templates/wizards/qml-runtime/wizard.xml @@ -38,8 +38,8 @@ leave room for the Qt 4 target page. class="qt4project" firstpage="10" id="QmlRuntimePlugin" category="F.Projects"> <description>Creates a plug-in for the QML runtime.</description> - <displayName>QML Runtime Plug-in</displayName> - <displayCategory>QML Runtime Plug-in</displayCategory> + <displayname>QML Runtime Plug-in</displayname> + <displaycategory>QML Runtime Plug-in</displaycategory> <files> <file source="qmldir" target="%ProjectName%/qmldir"/> <file source="plugin.h" target="%ProjectName%.h"/> diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp index c64c62c8c15f0775fbe94e89a739ea453d05a686..982668ee68455eebcdc864f73d62637f36530b37 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp @@ -34,6 +34,7 @@ #include <cpptools/cpptoolsconstants.h> #include <QtCore/QDebug> +#include <QtCore/QCoreApplication> #include <QtCore/QLocale> #include <QtCore/QFile> #include <QtCore/QFileInfo> @@ -46,14 +47,14 @@ enum { debug = 0 }; static const char customWizardElementC[] = "wizard"; static const char iconElementC[] = "icon"; static const char descriptionElementC[] = "description"; -static const char displayNameElementC[] = "displayName"; +static const char displayNameElementC[] = "displayname"; static const char idAttributeC[] = "id"; static const char kindAttributeC[] = "kind"; static const char klassAttributeC[] = "class"; static const char firstPageAttributeC[] = "firstpage"; static const char langAttributeC[] = "xml:lang"; static const char categoryAttributeC[] = "category"; -static const char displayCategoryElementC[] = "displayCategory"; +static const char displayCategoryElementC[] = "displaycategory"; static const char fieldPageTitleElementC[] = "fieldpagetitle"; static const char fieldsElementC[] = "fields"; static const char fieldElementC[] = "field"; @@ -144,7 +145,10 @@ static inline void assignLanguageElementText(QXmlStreamReader &reader, QString *target) { const QStringRef elementLanguage = reader.attributes().value(langAttributeC); - if (elementLanguage.isEmpty() || elementLanguage == desiredLanguage) { + if (elementLanguage.isEmpty()) { + // Try to find a translation for our built-in Wizards + *target = QCoreApplication::translate("ProjectExplorer::CustomWizard", reader.readElementText().toLatin1().constData()); + } else if (elementLanguage == desiredLanguage) { *target = reader.readElementText(); } else { // Language mismatch: forward to end element. @@ -161,7 +165,11 @@ static inline void assignLanguageElementText(QXmlStreamReader &reader, void (Core::BaseFileWizardParameters::*setter)(const QString &)) { const QStringRef elementLanguage = reader.attributes().value(langAttributeC); - if (elementLanguage.isEmpty() || elementLanguage == desiredLanguage) { + if (elementLanguage.isEmpty()) { + // Try to find a translation for our built-in Wizards + const QString translated = QCoreApplication::translate("ProjectExplorer::CustomWizard", reader.readElementText().toLatin1().constData()); + (bp->*setter)(translated); + } else if (elementLanguage == desiredLanguage) { (bp->*setter)(reader.readElementText()); } else { // Language mismatch: forward to end element.