Skip to content

Commit 31b1c67

Browse files
committed
Merge #557: Revert "qt: Do not use QObject::tr plural syntax for numbers with a unit symbol"
0c64401 Revert "qt: Do not use QObject::tr plural syntax for numbers with a unit symbol" (Luke Dashjr) Pull request description: Apparently this got forgotten. Maybe too late for 23.x (it's a bugfix, but changes translation strings). This reverts commit 3adde72 (#296) per [GChuf](#296 (comment)) >I can confirm for slovenian and other slavic languages that we do have 3 or 4 different ways of saying "%n GB needed%, depending on the actual number of gigabytes. Similar to english "is/are". There's no way to cover all cases ... this is exactly why transifex allows you to have more than 2 options. ACKs for top commit: hebasto: ACK 0c64401, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: c01bae44a32b3ec324f2f9b8e4923bbb2e83bbd1460b745c5c911b98a9b2806fcbf815cfb19a1f1a7038c5c14312e102e7df8744c9002ef784b36d158e08eb14
2 parents 55ea6fd + 0c64401 commit 31b1c67

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/qt/intro.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,12 +298,12 @@ void Intro::setStatus(int status, const QString &message, quint64 bytesAvailable
298298

299299
void Intro::UpdateFreeSpaceLabel()
300300
{
301-
QString freeString = tr("%1 GB of space available").arg(m_bytes_available / GB_BYTES);
301+
QString freeString = tr("%n GB of space available", "", m_bytes_available / GB_BYTES);
302302
if (m_bytes_available < m_required_space_gb * GB_BYTES) {
303-
freeString += " " + tr("(of %1 GB needed)").arg(m_required_space_gb);
303+
freeString += " " + tr("(of %n GB needed)", "", m_required_space_gb);
304304
ui->freeSpace->setStyleSheet("QLabel { color: #800000 }");
305305
} else if (m_bytes_available / GB_BYTES - m_required_space_gb < 10) {
306-
freeString += " " + tr("(%1 GB needed for full chain)").arg(m_required_space_gb);
306+
freeString += " " + tr("(%n GB needed for full chain)", "", m_required_space_gb);
307307
ui->freeSpace->setStyleSheet("QLabel { color: #999900 }");
308308
} else {
309309
ui->freeSpace->setStyleSheet("");

0 commit comments

Comments
 (0)