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

Revert "Git: Replace %n with %1 in string"

Browse Source 
This does not work, it needs to be either:

("%1").arg(n) or ("%n, 0, n)

The %n syntax is preferred here since although there probably
are always > 1 elements, some languages use different grammatical
cases for various numerical ranges (Russian, Polish).

This reverts commit c09e80b853.

Change-Id: Id3f480f0ec0de2dd8893b8de256c5e6c9628a6f9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Friedemann Kleint
2014-02-28 15:28:25 +01:00
parent 23e9338e97
commit b653ca1f18
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gitclient.cpp
View File

@@ -2876,8 +2876,8 @@ QString GitClient::extendedShowDescription(const QString &workingDirectory, cons
// If there are more than 20 branches, list first 10 followed by a hint
if (branchCount > 20) {
const int leave = 10;
//: Displayed after the untranslated message "Branches: branch1, branch2 'and %1 more'" in git show.
moreBranches = QLatin1Char(' ') + tr("and %1 more", 0, branchCount - leave);
//: Displayed after the untranslated message "Branches: branch1, branch2 'and %n more'" in git show.
moreBranches = QLatin1Char(' ') + tr("and %n more", 0, branchCount - leave);
branches.erase(branches.begin() + leave, branches.end());
}
if (!branches.isEmpty()) {