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

Tr: Re-fix plurals

Browse Source 
The number for the plural must be given as the 3rd argument
to the tr() call, not as an arg().

Amends 1359e9c84f

Change-Id: I45241a6acd82041c320bbe476cd2b4cc92247ef3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Eike Ziller
2023-10-18 09:42:15 +02:00
parent a253a2aa95
commit 8f3e77a3ae
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/devicefileaccess.cpp
View File

@@ -721,10 +721,11 @@ expected_str<qint64> DesktopDeviceFileAccess::writeFileContents(const FilePath &
qint64 res = file.write(data); qint64 res = file.write(data);
if (res != data.size()) if (res != data.size())
return make_unexpected( 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(filePath.toUserOutput())
.arg(res) .arg(res));
.arg(data.size()));
return res; return res;
} }

3
src/plugins/autotest/boost/boosttestoutputreader.cpp
View File

@@ -327,7 +327,8 @@ void BoostTestOutputReader::processOutputLine(const QByteArray &outputLine)
BoostTestResult result(id(), {}, m_projectFile); BoostTestResult result(id(), {}, m_projectFile);
const int failed = match.captured(1).toInt(); const int failed = match.captured(1).toInt();
const int fatals = m_summary.value(ResultType::MessageFatal); 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); const int passed = qMax(0, m_testCaseCount - failed);
if (m_testCaseCount != -1) if (m_testCaseCount != -1)
txt.append(' ').append(Tr::tr("%1 tests passed.").arg(passed)); txt.append(' ').append(Tr::tr("%1 tests passed.").arg(passed));

7
src/plugins/cppeditor/cppmodelmanager.cpp
View File

@@ -568,9 +568,10 @@ static void checkNextFunctionForUnused(
return; return;
const int newProgress = findRefsFuture->progressValue() + 1; const int newProgress = findRefsFuture->progressValue() + 1;
findRefsFuture->setProgressValueAndText(newProgress, findRefsFuture->setProgressValueAndText(newProgress,
Tr::tr("Checked %1 of %n function(s)") Tr::tr("Checked %1 of %n function(s)",
.arg(newProgress) nullptr,
.arg(findRefsFuture->progressMaximum())); findRefsFuture->progressMaximum())
.arg(newProgress));
QVariantMap data = search->userData().toMap(); QVariantMap data = search->userData().toMap();
QVariant &activeLinks = data["active"]; QVariant &activeLinks = data["active"];
QVariantList activeLinksList = activeLinks.toList(); QVariantList activeLinksList = activeLinks.toList();