From 98bb609ae569ae90b4d6155b3ec3354915c2382f Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 4 Feb 2025 15:53:38 +0100 Subject: [PATCH] Coco: Fix translatable strings Style fixes Change-Id: Ic910223da2961be46fa4683e0af37132f60f5396 Reviewed-by: Markus Redeker Reviewed-by: Leena Miettinen --- src/plugins/coco/cocobuildstep.cpp | 6 +++--- src/plugins/coco/cococmakesettings.cpp | 4 ++-- src/plugins/coco/cocoprojectwidget.cpp | 16 ++++++++-------- src/plugins/coco/cocoqmakesettings.cpp | 2 +- src/plugins/coco/globalsettings.cpp | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/plugins/coco/cocobuildstep.cpp b/src/plugins/coco/cocobuildstep.cpp index 941cbe7237f..1717abd027a 100644 --- a/src/plugins/coco/cocobuildstep.cpp +++ b/src/plugins/coco/cocobuildstep.cpp @@ -98,7 +98,7 @@ QWidget *CocoBuildStep::createConfigWidget() void CocoBuildStep::updateDisplay() { if (!cocoSettings().isValid()) { - setSummaryText("" + Tr::tr("Coco Code Coverage: No working Coco installation") + ""); + setSummaryText("" + Tr::tr("Coco Code Coverage: No working Coco installation.") + ""); emit setButtonState(false); return; } @@ -106,10 +106,10 @@ void CocoBuildStep::updateDisplay() m_valid = m_buildSettings->validSettings(); if (m_valid) { - setSummaryText("" + Tr::tr("Coco Code Coverage: Enabled") + ""); + setSummaryText("" + Tr::tr("Coco Code Coverage: Enabled.") + ""); emit setButtonState(true, Tr::tr("Disable Coverage")); } else { - setSummaryText(Tr::tr("Coco Code Coverage: Disabled")); + setSummaryText(Tr::tr("Coco Code Coverage: Disabled.")); // m_reconfigureButton->setText(Tr::tr("Enable Coverage")); emit setButtonState(true, Tr::tr("Enable Coverage")); } diff --git a/src/plugins/coco/cococmakesettings.cpp b/src/plugins/coco/cococmakesettings.cpp index e263529e25d..1e8833112ff 100644 --- a/src/plugins/coco/cococmakesettings.cpp +++ b/src/plugins/coco/cococmakesettings.cpp @@ -176,9 +176,9 @@ void CocoCMakeSettings::writeToolchainFile(const QString &internalPath) if (internalContent == currentContent) return; - logSilently(Tr::tr("Overwrite file %1").arg(maybeQuote(toolchainNative))); + logSilently(Tr::tr("Overwrite file \"%1\".").arg(toolchainNative)); } else - logSilently(Tr::tr("Write file %1").arg(maybeQuote(toolchainNative))); + logSilently(Tr::tr("Write file \"%1\".").arg(toolchainNative)); QFile out{toolchainNative}; QTC_CHECK(out.open(QIODeviceBase::WriteOnly)); diff --git a/src/plugins/coco/cocoprojectwidget.cpp b/src/plugins/coco/cocoprojectwidget.cpp index 167a84d54db..3f67df1f260 100644 --- a/src/plugins/coco/cocoprojectwidget.cpp +++ b/src/plugins/coco/cocoprojectwidget.cpp @@ -44,7 +44,7 @@ CocoProjectWidget::CocoProjectWidget(Project *project, BuildConfiguration *build m_coverageGroupbox = {groupChecker(m_coverageGroupBoxEnabled.groupChecker()), Column{ - Row{Tr::tr("CoverageScanner Options"), st, docLink}, + Row{Tr::tr("CoverageScanner options:"), st, docLink}, m_optionEdit, Row{PushButton{ text(Tr::tr("Exclude File...")), @@ -109,7 +109,7 @@ void CocoProjectWidget::reloadSettings() m_configerrorLabel.setVisible(!valid); if (!valid) { m_configerrorLabel.setText( - Tr::tr("Coco is not installed correctly: \"%1\"").arg(cocoSettings().errorMessage())); + Tr::tr("Coco is not installed correctly: %1").arg(cocoSettings().errorMessage())); } } @@ -125,7 +125,7 @@ void CocoProjectWidget::buildSystemUpdated(ProjectExplorer::BuildSystem *bs) if (m_buildConfigurationName != newBuildConfigurationName) { m_buildConfigurationName = newBuildConfigurationName; - logSilently(Tr::tr("Build Configuration changed to %1.").arg(newBuildConfigurationName)); + logSilently(Tr::tr("Build Configuration changed to \"%1\".").arg(newBuildConfigurationName)); reloadSettings(); } else if (m_configState == configRunning) setState(configDone); @@ -142,7 +142,7 @@ void CocoProjectWidget::configurationErrorOccurred(const QString &error) // The variable error seems to contain no usable information. setMessageLabel( Utils::InfoLabel::Error, - Tr::tr("Error when configuring with %1. " + Tr::tr("Error when configuring with \"%1\". " "Check General Messages for more information.") .arg(m_buildSettings->featureFilenName())); setState(configDone); @@ -255,7 +255,7 @@ void Internal::CocoProjectWidget::onCoverageGroupBoxClicked() void CocoProjectWidget::onSaveButtonClicked() { if (m_configState == configRunning) { - logSilently(Tr::tr("Stop re-configuring")); + logSilently(Tr::tr("Stop re-configuring.")); m_buildSettings->stopReconfigure(); setState(configEdited); return; @@ -265,11 +265,11 @@ void CocoProjectWidget::onSaveButtonClicked() QString tweaks = m_tweaksEdit(); clearMessageLabel(); - logSilently(Tr::tr("Write file \"%1\"").arg(m_buildSettings->featureFilePath())); + logSilently(Tr::tr("Write file \"%1\".").arg(m_buildSettings->featureFilePath())); m_buildSettings->write(options, tweaks); if (m_buildSettings->needsReconfigure()) { - logSilently(Tr::tr("Re-configure")); + logSilently(Tr::tr("Re-configure.")); setState(configRunning); m_buildSettings->reconfigure(); } else @@ -279,7 +279,7 @@ void CocoProjectWidget::onSaveButtonClicked() void CocoProjectWidget::onRevertButtonClicked() { clearMessageLabel(); - logSilently(Tr::tr("Reload file \"%1\"").arg(m_buildSettings->featureFilePath())); + logSilently(Tr::tr("Reload file \"%1\".").arg(m_buildSettings->featureFilePath())); reloadSettings(); } diff --git a/src/plugins/coco/cocoqmakesettings.cpp b/src/plugins/coco/cocoqmakesettings.cpp index 1ee30833001..e0d5522f3e6 100644 --- a/src/plugins/coco/cocoqmakesettings.cpp +++ b/src/plugins/coco/cocoqmakesettings.cpp @@ -158,7 +158,7 @@ QString CocoQMakeSettings::configChanges() const + tableRow( Tr::tr("Build environment: "), maybeQuote(QString(featuresVar) + "=" + projectDirectory())) - + tableRow(Tr::tr("Feature File: "), maybeQuote(featureFilePath())) + ""; + + tableRow(Tr::tr("Feature file: "), maybeQuote(featureFilePath())) + ""; } QString CocoQMakeSettings::projectDirectory() const diff --git a/src/plugins/coco/globalsettings.cpp b/src/plugins/coco/globalsettings.cpp index 0850be7f773..ecd3514430f 100644 --- a/src/plugins/coco/globalsettings.cpp +++ b/src/plugins/coco/globalsettings.cpp @@ -119,12 +119,12 @@ bool CocoSettings::verifyCocoDirectory(const FilePath &cocoDir) proc.start(); if (!proc.waitForStarted()) { - logError(Tr::tr("Error: Coveragescanner at \"%1\" did not start.").arg(coveragescanner)); + logError(Tr::tr("Error: CoverageScanner at \"%1\" did not start.").arg(coveragescanner)); return false; } if (!proc.waitForFinished()) { - logError(Tr::tr("Error: Coveragescanner at \"%1\" did not finish.").arg(coveragescanner)); + logError(Tr::tr("Error: CoverageScanner at \"%1\" did not finish.").arg(coveragescanner)); return false; } @@ -140,7 +140,7 @@ bool CocoSettings::verifyCocoDirectory(const FilePath &cocoDir) return true; } else { logError( - Tr::tr("Error: Coveragescanner at \"%1\" did not run correctly.").arg(coveragescanner)); + Tr::tr("Error: CoverageScanner at \"%1\" did not run correctly.").arg(coveragescanner)); for (const QString &l : lines) { logSilently(l); }