diff options
| author | El Mehdi Fekari <mfekari@rim.com> | 2013-02-11 10:55:44 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-12 23:32:25 (GMT) |
| commit | ece95dd012b6f05ceb622fb56eb78f86285ba05b (patch) | |
| tree | 28f1c4a576150237d2e1abe3d428e4344b5a1587 /tests | |
| parent | 0806d4ca57e2122a5b496aeee7a39ae4310b0c19 (diff) | |
| download | Qt-ece95dd012b6f05ceb622fb56eb78f86285ba05b.zip Qt-ece95dd012b6f05ceb622fb56eb78f86285ba05b.tar.gz Qt-ece95dd012b6f05ceb622fb56eb78f86285ba05b.tar.bz2 | |
QLocale: Update the Japanese and Czech locale
- Japanese locale: Year should be displayed in 4 digits instead of 2 in short format
- Czech locale: monthName should be displayed in lower case
N.B: The changes above are already fixed on Qt 5 that uses an updated version (v22.1) of CLDR
Change-Id: I40535ea60b1f6abdd3717a28adbcddaa63b39997
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qlocale/tst_qlocale.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/qlocale/tst_qlocale.cpp b/tests/auto/qlocale/tst_qlocale.cpp index 12df063..572d7f1 100644 --- a/tests/auto/qlocale/tst_qlocale.cpp +++ b/tests/auto/qlocale/tst_qlocale.cpp @@ -1841,6 +1841,9 @@ void tst_QLocale::dateFormat() const QLocale ca("en_CA"); QCOMPARE(ca.dateFormat(QLocale::ShortFormat), QLatin1String("M/d/yy")); QCOMPARE(ca.dateFormat(QLocale::LongFormat), QLatin1String("dddd, MMMM d, yyyy")); + + const QLocale ja("ja_JP"); + QCOMPARE(ja.dateFormat(QLocale::ShortFormat), QLatin1String("yyyy/MM/dd")); } void tst_QLocale::timeFormat() @@ -1907,6 +1910,10 @@ void tst_QLocale::monthName() QLocale ir("ga_IE"); QCOMPARE(ir.monthName(1, QLocale::ShortFormat), QLatin1String("Ean")); QCOMPARE(ir.monthName(12, QLocale::ShortFormat), QLatin1String("Noll")); + + QLocale cz("cs_CZ"); + QCOMPARE(cz.monthName(1, QLocale::ShortFormat), QLatin1String("led")); + QCOMPARE(cz.monthName(12, QLocale::ShortFormat), QLatin1String("pro")); } void tst_QLocale::standaloneMonthName() |