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

Fix translated messages in WinRT-plugin.

Browse Source 
Use plural form, remove white space from the messages,
use double quotes for file names. Use the winrtrunner.exe
only in messages about the file not being found.

Change-Id: I5d5ffc2ffc6b6dc86c97327e6f47c6e5c0b2ef11
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
This commit is contained in:
Friedemann Kleint
2014-03-05 15:03:23 +01:00
parent 31799cc304
commit c9d72a1560
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/winrt/winrtdevicefactory.cpp
View File

@@ -130,7 +130,7 @@ void WinRtDeviceFactory::onProcessFinished(int exitCode, QProcess::ExitStatus ex
} }
if (exitCode != 0) { if (exitCode != 0) {
MessageManager::write(tr("winrtrunner.exe returned with exit code %1.") MessageManager::write(tr("winrtrunner returned with exit code %1.")
.arg(exitCode), MessageManager::Flash); .arg(exitCode), MessageManager::Flash);
return; return;
} }
@@ -238,8 +238,12 @@ void WinRtDeviceFactory::parseRunnerOutput(const QByteArray &output) const
deviceManager->addDevice(ProjectExplorer::IDevice::ConstPtr(device)); deviceManager->addDevice(ProjectExplorer::IDevice::ConstPtr(device));
} }
} }
MessageManager::write(tr("Found %1 Windows Runtime devices. %2 of them are new.").arg(numFound) QString message = tr("Found %n Windows Runtime devices.", 0, numFound);
.arg(numFound - numSkipped)); if (const int numNew = numFound - numSkipped) {
message += QLatin1Char(' ');
message += tr("%n of them are new.", 0, numNew);
}
MessageManager::write(message);
} }
} // Internal } // Internal

11
src/plugins/winrt/winrtruncontrol.cpp
View File

@@ -69,7 +69,7 @@ WinRtRunControl::WinRtRunControl(WinRtRunConfiguration *runConfiguration, RunMod
m_isWinPhone = (qt->type() == QLatin1String(Constants::WINRT_WINPHONEQT)); m_isWinPhone = (qt->type() == QLatin1String(Constants::WINRT_WINPHONEQT));
m_runnerFilePath = qt->binPath().toString() + QStringLiteral("/winrtrunner.exe"); m_runnerFilePath = qt->binPath().toString() + QStringLiteral("/winrtrunner.exe");
if (!QFile::exists(m_runnerFilePath)) { if (!QFile::exists(m_runnerFilePath)) {
appendMessage(tr("Cannot find winrtrunner.exe in '%1'.").arg( appendMessage(tr("Cannot find winrtrunner.exe in \"%1\".").arg(
QDir::toNativeSeparators(qt->binPath().toString())), QDir::toNativeSeparators(qt->binPath().toString())),
Utils::ErrorMessageFormat); Utils::ErrorMessageFormat);
return; return;
@@ -127,12 +127,13 @@ void WinRtRunControl::onProcessFinished(int exitCode, QProcess::ExitStatus exitS
QTC_CHECK(m_state == StartedState); QTC_CHECK(m_state == StartedState);
if (exitStatus == QProcess::CrashExit) { if (exitStatus == QProcess::CrashExit) {
appendMessage(tr("winrtrunner crashed\n"), Utils::ErrorMessageFormat); appendMessage(tr("winrtrunner crashed.") + QLatin1Char('\n'), Utils::ErrorMessageFormat);
} else if (exitCode != 0) { } else if (exitCode != 0) {
appendMessage(tr("winrtrunner returned with exit code %1\n").arg(exitCode), appendMessage(tr("winrtrunner returned with exit code %1.").arg(exitCode)
Utils::ErrorMessageFormat); + QLatin1Char('\n'), Utils::ErrorMessageFormat);
} else { } else {
appendMessage(tr("winrtrunner finished successfully.\n"), Utils::NormalMessageFormat); appendMessage(tr("winrtrunner finished successfully.")
+ QLatin1Char('\n'), Utils::NormalMessageFormat);
} }
m_process->disconnect(); m_process->disconnect();