feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

tr()-Fixes in QNX wizards.

Browse Source 
Avoid duplication, trailing blanks and concatenation of translated
pieces where possible.

Change-Id: I462ef7b66fb0e61e57db9d6112f9f4632dbb9c0b
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Friedemann Kleint
2014-02-28 16:09:16 +01:00
parent 40d6a2bf57
commit 56ae18e594
2 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/plugins/qnx/blackberryinstallwizardpages.cpp
View File

@@ -398,23 +398,23 @@ BlackBerryInstallWizardProcessPage::~BlackBerryInstallWizardProcessPage()
delete m_ui; delete m_ui;
} }
void BlackBerryInstallWizardProcessPage::initializePage() static QString msgTarget(BlackBerryInstallerDataHandler::Target t)
{ {
QString target; switch (t) {
switch (m_data.installTarget) {
case BlackBerryInstallerDataHandler::ApiLevel: case BlackBerryInstallerDataHandler::ApiLevel:
target = tr("API level version: "); return BlackBerryInstallWizardProcessPage::tr("API level");
break;
case BlackBerryInstallerDataHandler::Simulator: case BlackBerryInstallerDataHandler::Simulator:
target = tr("simulator version: "); return BlackBerryInstallWizardProcessPage::tr("simulator");
break;
case BlackBerryInstallerDataHandler::Runtime: case BlackBerryInstallerDataHandler::Runtime:
target = tr("runtime version: "); return BlackBerryInstallWizardProcessPage::tr("runtime");
break;
default: default:
break; break;
} }
return QString();
}
void BlackBerryInstallWizardProcessPage::initializePage()
{
if (m_data.mode == BlackBerryInstallerDataHandler::UninstallMode) { if (m_data.mode == BlackBerryInstallerDataHandler::UninstallMode) {
if (m_data.version.isEmpty()) { if (m_data.version.isEmpty()) {
wizard()->next(); wizard()->next();
@@ -429,9 +429,11 @@ void BlackBerryInstallWizardProcessPage::initializePage()
} }
} }
m_ui->label->setText(tr("Uninstalling ") + target + m_data.version); m_ui->label->setText(tr("Uninstalling %1 version: %2")
.arg(msgTarget(m_data.installTarget), m_data.version));
} else { } else {
m_ui->label->setText(tr("Installing ") + target + m_data.version); m_ui->label->setText(tr("Installing %1 version: %2")
.arg(msgTarget(m_data.installTarget), m_data.version));
} }
// m_targetProcess could be running // m_targetProcess could be running
if (m_targetProcess->state() == QProcess::Running) { if (m_targetProcess->state() == QProcess::Running) {
@@ -542,30 +544,17 @@ void BlackBerryInstallWizardFinalPage::initializePage()
} }
QString message; QString message;
QString target; const QString target = msgTarget(m_data.installTarget);
switch (m_data.installTarget) {
case BlackBerryInstallerDataHandler::ApiLevel:
target = tr("API level version: ");
break;
case BlackBerryInstallerDataHandler::Simulator:
target = tr("simulator version: ");
break;
case BlackBerryInstallerDataHandler::Runtime:
target = tr("runtime version: ");
break;
default:
break;
}
if (m_data.exitCode == 0 && m_data.exitStatus == QProcess::NormalExit) { if (m_data.exitCode == 0 && m_data.exitStatus == QProcess::NormalExit) {
message = m_data.mode == BlackBerryInstallerDataHandler::UninstallMode ? message = m_data.mode == BlackBerryInstallerDataHandler::UninstallMode ?
tr("Finished uninstalling %1:\n %2").arg(target, m_data.version) : tr("Finished uninstalling %1 version:\n %2").arg(target, m_data.version) :
tr("Finished installing %1:\n %2").arg(target, m_data.version); tr("Finished installing %1 version:\n %2").arg(target, m_data.version);
emit done(); emit done();
} else { } else {
message = m_data.mode == BlackBerryInstallerDataHandler::UninstallMode ? message = m_data.mode == BlackBerryInstallerDataHandler::UninstallMode ?
tr("An error has occurred while uninstalling %1:\n %2").arg(target, m_data.version) : tr("An error has occurred while uninstalling %1 version:\n %2").arg(target, m_data.version) :
tr("An error has occurred while installing %1:\n %2").arg(target, m_data.version); tr("An error has occurred while installing %1 version:\n %2").arg(target, m_data.version);
} }
label->setText(message); label->setText(message);
} }