diff options
| author | Mehdi Fekari <mfekari@rim.com> | 2013-01-14 20:38:12 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-18 11:56:37 (GMT) |
| commit | 614a9a435ea4b94080ea12c2fcf98d2699731e34 (patch) | |
| tree | 406e980f38ae2c257468c246992dfdb0d71bf1af /tests | |
| parent | f45cdeda88796830b3fe71aff7ceb1919d00400d (diff) | |
| download | Qt-614a9a435ea4b94080ea12c2fcf98d2699731e34.zip Qt-614a9a435ea4b94080ea12c2fcf98d2699731e34.tar.gz Qt-614a9a435ea4b94080ea12c2fcf98d2699731e34.tar.bz2 | |
Update the Indonisian and Catalan locales in CLDR data:
- Indonisian locale (in.xml): to return correct AM/PM text and correct time Fomat
- Catalan locale (ca.xml): to return correct time Format
Change-Id: I65bbabdc6311dc3c958605cbc04e7a034243e9db
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qlocale/tst_qlocale.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/qlocale/tst_qlocale.cpp b/tests/auto/qlocale/tst_qlocale.cpp index eca68d2..12df063 100644 --- a/tests/auto/qlocale/tst_qlocale.cpp +++ b/tests/auto/qlocale/tst_qlocale.cpp @@ -1821,6 +1821,10 @@ void tst_QLocale::ampm() QLocale tr("tr_TR"); QCOMPARE(tr.amText(), QString::fromUtf8("\303\226\303\226")); QCOMPARE(tr.pmText(), QString::fromUtf8("\303\226\123")); + + QLocale id("id_ID"); + QCOMPARE(id.amText(), QLatin1String("AM")); + QCOMPARE(id.pmText(), QLatin1String("PM")); } void tst_QLocale::dateFormat() @@ -1849,6 +1853,14 @@ void tst_QLocale::timeFormat() QCOMPARE(no.timeFormat(QLocale::NarrowFormat), QLatin1String("HH:mm")); QCOMPARE(no.timeFormat(QLocale::ShortFormat), QLatin1String("HH:mm")); QCOMPARE(no.timeFormat(QLocale::LongFormat), QLatin1String("'kl'. HH:mm:ss t")); + + const QLocale id("id_ID"); + QCOMPARE(id.timeFormat(QLocale::ShortFormat), QLatin1String("HH.mm")); + QCOMPARE(id.timeFormat(QLocale::LongFormat), QLatin1String("HH.mm.ss t")); + + const QLocale cat("ca_ES"); + QCOMPARE(cat.timeFormat(QLocale::ShortFormat), QLatin1String("H.mm")); + QCOMPARE(cat.timeFormat(QLocale::LongFormat), QLatin1String("H.mm.ss t")); } void tst_QLocale::dateTimeFormat() |