diff --git a/autotests/klocalizedstringtest.cpp b/autotests/klocalizedstringtest.cpp --- a/autotests/klocalizedstringtest.cpp +++ b/autotests/klocalizedstringtest.cpp @@ -123,6 +123,9 @@ void KLocalizedStringTest::correctSubs() { + if (!m_hasFrench) { + QSKIP("French test files not usable."); + } // Warm up. QCOMPARE(i18n("Daisies, daisies"), QString("Daisies, daisies")); @@ -219,7 +222,7 @@ QCOMPARE(ki18n("%1").subs(42, -5, 10, QChar('_')).toString(), QString("42___")); QCOMPARE(ki18n("%1").subs(4.2, 5, 'f', 2).toString(), - QString(" 4.20")); + QString(" 4,20")); } void KLocalizedStringTest::wrongSubs() diff --git a/src/klocalizedstring.cpp b/src/klocalizedstring.cpp --- a/src/klocalizedstring.cpp +++ b/src/klocalizedstring.cpp @@ -1138,7 +1138,7 @@ { KLocalizedString kls(*this); kls.d->checkNumber(std::abs(a)); - kls.d->arguments.append(QStringLiteral("%1").arg(a, fieldWidth, base, fillChar)); + kls.d->arguments.append(QStringLiteral("%L1").arg(a, fieldWidth, base, fillChar)); kls.d->values.append(static_cast(a)); return kls; } @@ -1148,7 +1148,7 @@ { KLocalizedString kls(*this); kls.d->checkNumber(a); - kls.d->arguments.append(QStringLiteral("%1").arg(a, fieldWidth, base, fillChar)); + kls.d->arguments.append(QStringLiteral("%L1").arg(a, fieldWidth, base, fillChar)); kls.d->values.append(static_cast(a)); return kls; } @@ -1158,7 +1158,7 @@ { KLocalizedString kls(*this); kls.d->checkNumber(std::abs(a)); - kls.d->arguments.append(QStringLiteral("%1").arg(a, fieldWidth, base, fillChar)); + kls.d->arguments.append(QStringLiteral("%L1").arg(a, fieldWidth, base, fillChar)); kls.d->values.append(static_cast(a)); return kls; } @@ -1168,7 +1168,7 @@ { KLocalizedString kls(*this); kls.d->checkNumber(a); - kls.d->arguments.append(QStringLiteral("%1").arg(a, fieldWidth, base, fillChar)); + kls.d->arguments.append(QStringLiteral("%L1").arg(a, fieldWidth, base, fillChar)); kls.d->values.append(static_cast(a)); return kls; } @@ -1178,7 +1178,7 @@ { KLocalizedString kls(*this); kls.d->checkNumber(qAbs(a)); - kls.d->arguments.append(QStringLiteral("%1").arg(a, fieldWidth, base, fillChar)); + kls.d->arguments.append(QStringLiteral("%L1").arg(a, fieldWidth, base, fillChar)); kls.d->values.append(static_cast(a)); return kls; } @@ -1188,7 +1188,7 @@ { KLocalizedString kls(*this); kls.d->checkNumber(a); - kls.d->arguments.append(QStringLiteral("%1").arg(a, fieldWidth, base, fillChar)); + kls.d->arguments.append(QStringLiteral("%L1").arg(a, fieldWidth, base, fillChar)); kls.d->values.append(static_cast(a)); return kls; } @@ -1198,7 +1198,7 @@ QChar fillChar) const { KLocalizedString kls(*this); - kls.d->arguments.append(QStringLiteral("%1").arg(a, fieldWidth, format, precision, fillChar)); + kls.d->arguments.append(QStringLiteral("%L1").arg(a, fieldWidth, format, precision, fillChar)); kls.d->values.append(static_cast(a)); return kls; }