summaryrefslogtreecommitdiffstats
path: root/tests/auto/qlocale
diff options
context:
space:
mode:
authorMehdi Fekari <mfekari@rim.com>2013-01-07 16:52:26 -0500
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-10 14:23:35 +0100
commit2ec2dbd89072f651be737192337b7f968fa54e42 (patch)
treec4c9794993a89474f0ec9d00b34a5e300e1182b3 /tests/auto/qlocale
parent6e939f63b4e7b8ed678f4d551ada35dfb2e76e11 (diff)
Update Canadian(English) locale
Update dateFormat in Canadian(English) locale ("en_CA") to return: M/d/yy instead of: yy-MM-dd (Long: dddd, MMMM d, yyyy instead of EEEE, d MMMM, y) N.B: This doesn't concern Qt5 that uses the most recent version of CLDR (22.1) which already contain the fix above. Change-Id: I99f841c8f397086435d928d749c4d67e779f31f8 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'tests/auto/qlocale')
-rw-r--r--tests/auto/qlocale/tst_qlocale.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qlocale/tst_qlocale.cpp b/tests/auto/qlocale/tst_qlocale.cpp
index 8a1c86c5b9..9b886091c1 100644
--- a/tests/auto/qlocale/tst_qlocale.cpp
+++ b/tests/auto/qlocale/tst_qlocale.cpp
@@ -1833,6 +1833,10 @@ void tst_QLocale::dateFormat()
QCOMPARE(no.dateFormat(QLocale::NarrowFormat), QLatin1String("dd.MM.yy"));
QCOMPARE(no.dateFormat(QLocale::ShortFormat), QLatin1String("dd.MM.yy"));
QCOMPARE(no.dateFormat(QLocale::LongFormat), QLatin1String("dddd d. MMMM yyyy"));
+
+ const QLocale ca("en_CA");
+ QCOMPARE(ca.dateFormat(QLocale::ShortFormat), QLatin1String("M/d/yy"));
+ QCOMPARE(ca.dateFormat(QLocale::LongFormat), QLatin1String("dddd, MMMM d, yyyy"));
}
void tst_QLocale::timeFormat()