From 7bd3bba6ee8941bb39de89ed75aaa0c52a19860f Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 18 Feb 2011 09:59:49 +0100
Subject: [PATCH] L10n: Tr-fixes for build configurations.
Remove duplicate code, proper messages, linguist comments.
Task-number: QTCREATORBUG-3821
---
.../qt-desktop/qt4desktoptargetfactory.cpp | 13 ++++---------
.../qt-desktop/qt4simulatortargetfactory.cpp | 12 +++---------
.../qt-maemo/qt4maemotargetfactory.cpp | 13 ++++---------
.../qt-s60/qt4symbiantargetfactory.cpp | 13 ++++---------
.../qt4projectmanager/qt4buildconfiguration.cpp | 2 ++
src/plugins/qt4projectmanager/qt4target.cpp | 11 +++++++++++
src/plugins/qt4projectmanager/qt4target.h | 3 +++
7 files changed, 31 insertions(+), 36 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
index d742f5e8636..847cf163eb5 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
@@ -161,15 +161,10 @@ Qt4BaseTarget *Qt4DesktopTargetFactory::create(ProjectExplorer::Project *parent,
return 0;
Qt4DesktopTarget *t = new Qt4DesktopTarget(static_cast<Qt4Project *>(parent), id);
- foreach (const BuildConfigurationInfo &info, infos) {
- QString displayName = info.version->displayName() + QLatin1Char(' ');
- displayName += (info.buildConfig & QtVersion::DebugBuild) ? tr("Debug") : tr("Release");
- t->addQt4BuildConfiguration(displayName,
- info.version,
- info.buildConfig,
- info.additionalArguments,
- info.directory);
- }
+ foreach (const BuildConfigurationInfo &info, infos)
+ t->addQt4BuildConfiguration(msgBuildConfigurationName(info),
+ info.version, info.buildConfig,
+ info.additionalArguments, info.directory);
t->addDeployConfiguration(t->deployConfigurationFactory()->create(t, ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID));
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
index 8fbe4b6c517..edcc0d04a1d 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
@@ -161,15 +161,9 @@ Qt4BaseTarget *Qt4SimulatorTargetFactory::create(ProjectExplorer::Project *paren
return 0;
Qt4SimulatorTarget *t = new Qt4SimulatorTarget(static_cast<Qt4Project *>(parent), id);
- foreach (const BuildConfigurationInfo &info, infos) {
- QString displayName = info.version->displayName() + QLatin1Char(' ');
- displayName += (info.buildConfig & QtVersion::DebugBuild) ? tr("Debug") : tr("Release");
- t->addQt4BuildConfiguration(displayName,
- info.version,
- info.buildConfig,
- info.additionalArguments,
- info.directory);
- }
+ foreach (const BuildConfigurationInfo &info, infos)
+ t->addQt4BuildConfiguration(msgBuildConfigurationName(info), info.version, info.buildConfig,
+ info.additionalArguments, info.directory);
t->addDeployConfiguration(t->deployConfigurationFactory()->create(t, ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID));
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
index 4b03f7c8adc..335aed4ce4e 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
@@ -204,15 +204,10 @@ Qt4BaseTarget *Qt4MaemoTargetFactory::create(ProjectExplorer::Project *parent,
target = new Qt4MeegoTarget(static_cast<Qt4Project *>(parent), id);
Q_ASSERT(target);
- foreach (const BuildConfigurationInfo &info, infos) {
- QString displayName = info.version->displayName() + QLatin1Char(' ');
- displayName += (info.buildConfig & QtVersion::DebugBuild) ? tr("Debug") : tr("Release");
- target->addQt4BuildConfiguration(displayName,
- info.version,
- info.buildConfig,
- info.additionalArguments,
- info.directory);
- }
+ foreach (const BuildConfigurationInfo &info, infos)
+ target->addQt4BuildConfiguration(msgBuildConfigurationName(info),
+ info.version, info.buildConfig,
+ info.additionalArguments, info.directory);
target->addDeployConfiguration(target->deployConfigurationFactory()->create(target, ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID));
target->createApplicationProFiles();
diff --git a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
index 575f2488a29..1328d66cba7 100644
--- a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
@@ -188,15 +188,10 @@ Qt4BaseTarget *Qt4SymbianTargetFactory::create(ProjectExplorer::Project *parent,
if (!canCreate(parent, id))
return 0;
Qt4SymbianTarget *t = new Qt4SymbianTarget(static_cast<Qt4Project *>(parent), id);
- foreach (const BuildConfigurationInfo &info, infos) {
- QString displayName = info.version->displayName() + QLatin1Char(' ');
- displayName += (info.buildConfig & QtVersion::DebugBuild) ? tr("Debug") : tr("Release");
- t->addQt4BuildConfiguration(displayName,
- info.version,
- info.buildConfig,
- info.additionalArguments,
- info.directory);
- }
+ foreach (const BuildConfigurationInfo &info, infos)
+ t->addQt4BuildConfiguration(msgBuildConfigurationName(info),
+ info.version, info.buildConfig,
+ info.additionalArguments, info.directory);
t->addDeployConfiguration(t->deployConfigurationFactory()->create(t, ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID));
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 35e8ed07e2f..454bcff0355 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -759,11 +759,13 @@ BuildConfiguration *Qt4BuildConfigurationFactory::create(ProjectExplorer::Target
if (!ok || buildConfigurationName.isEmpty())
return 0;
+ //: Debug build configuration. We recommend not translating it.
qt4Target->addQt4BuildConfiguration(tr("%1 Debug").arg(buildConfigurationName),
version,
(version->defaultBuildConfig() | QtVersion::DebugBuild),
QString(), QString());
BuildConfiguration *bc =
+ //: Release build configuration. We recommend not translating it.
qt4Target->addQt4BuildConfiguration(tr("%1 Release").arg(buildConfigurationName),
version,
(version->defaultBuildConfig() & ~QtVersion::DebugBuild),
diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp
index f966894a303..72712311baa 100644
--- a/src/plugins/qt4projectmanager/qt4target.cpp
+++ b/src/plugins/qt4projectmanager/qt4target.cpp
@@ -73,6 +73,17 @@ Qt4BaseTargetFactory *Qt4BaseTargetFactory::qt4BaseTargetFactoryForId(const QStr
return 0;
}
+// Return name of a build configuration.
+QString Qt4BaseTargetFactory::msgBuildConfigurationName(const BuildConfigurationInfo &info)
+{
+ const QString qtVersionName = info.version->displayName();
+ return (info.buildConfig & QtVersion::DebugBuild) ?
+ //: Name of a debug build configuration to created by a project wizard, %1 being the Qt version name. We recommend not translating it.
+ tr("%1 Debug").arg(qtVersionName) :
+ //: Name of a release build configuration to created by a project wizard, %1 being the Qt version name. We recommend not translating it.
+ tr("%1 Release").arg(qtVersionName);
+}
+
// -------------------------------------------------------------------------
// Qt4BaseTarget
// -------------------------------------------------------------------------
diff --git a/src/plugins/qt4projectmanager/qt4target.h b/src/plugins/qt4projectmanager/qt4target.h
index 955621d6022..260fa6752c1 100644
--- a/src/plugins/qt4projectmanager/qt4target.h
+++ b/src/plugins/qt4projectmanager/qt4target.h
@@ -116,6 +116,9 @@ public:
QList<BuildConfigurationInfo> infos) = 0;
static Qt4BaseTargetFactory *qt4BaseTargetFactoryForId(const QString &id);
+
+protected:
+ static QString msgBuildConfigurationName(const BuildConfigurationInfo &info);
};
} // namespace Qt4ProjectManager
--
GitLab