From 8f3e77a3ae7bdf1d46a63feced8d7fa4e899b5c3 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 18 Oct 2023 09:42:15 +0200 Subject: [PATCH] Tr: Re-fix plurals The number for the plural must be given as the 3rd argument to the tr() call, not as an arg(). Amends 1359e9c84fbbb7d8e41c5573c63759bf191dc8fa Change-Id: I45241a6acd82041c320bbe476cd2b4cc92247ef3 Reviewed-by: Jarek Kobus --- src/libs/utils/devicefileaccess.cpp | 7 ++++--- src/plugins/autotest/boost/boosttestoutputreader.cpp | 3 ++- src/plugins/cppeditor/cppmodelmanager.cpp | 7 ++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/libs/utils/devicefileaccess.cpp b/src/libs/utils/devicefileaccess.cpp index 71f694c6649..a38a3617a7e 100644 --- a/src/libs/utils/devicefileaccess.cpp +++ b/src/libs/utils/devicefileaccess.cpp @@ -721,10 +721,11 @@ expected_str DesktopDeviceFileAccess::writeFileContents(const FilePath & qint64 res = file.write(data); if (res != data.size()) return make_unexpected( - Tr::tr("Could not write to file \"%1\" (only %2 of %n byte(s) written).") + Tr::tr("Could not write to file \"%1\" (only %2 of %n byte(s) written).", + nullptr, + data.size()) .arg(filePath.toUserOutput()) - .arg(res) - .arg(data.size())); + .arg(res)); return res; } diff --git a/src/plugins/autotest/boost/boosttestoutputreader.cpp b/src/plugins/autotest/boost/boosttestoutputreader.cpp index 439fe480814..7b58d74f528 100644 --- a/src/plugins/autotest/boost/boosttestoutputreader.cpp +++ b/src/plugins/autotest/boost/boosttestoutputreader.cpp @@ -327,7 +327,8 @@ void BoostTestOutputReader::processOutputLine(const QByteArray &outputLine) BoostTestResult result(id(), {}, m_projectFile); const int failed = match.captured(1).toInt(); const int fatals = m_summary.value(ResultType::MessageFatal); - QString txt = Tr::tr("%n failure(s) detected in %2.").arg(failed).arg(match.captured(3)); + QString txt + = Tr::tr("%n failure(s) detected in %1.", nullptr, failed).arg(match.captured(3)); const int passed = qMax(0, m_testCaseCount - failed); if (m_testCaseCount != -1) txt.append(' ').append(Tr::tr("%1 tests passed.").arg(passed)); diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp index 2deaea4290c..e72c630cbf7 100644 --- a/src/plugins/cppeditor/cppmodelmanager.cpp +++ b/src/plugins/cppeditor/cppmodelmanager.cpp @@ -568,9 +568,10 @@ static void checkNextFunctionForUnused( return; const int newProgress = findRefsFuture->progressValue() + 1; findRefsFuture->setProgressValueAndText(newProgress, - Tr::tr("Checked %1 of %n function(s)") - .arg(newProgress) - .arg(findRefsFuture->progressMaximum())); + Tr::tr("Checked %1 of %n function(s)", + nullptr, + findRefsFuture->progressMaximum()) + .arg(newProgress)); QVariantMap data = search->userData().toMap(); QVariant &activeLinks = data["active"]; QVariantList activeLinksList = activeLinks.toList();