summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorMehdi Fekari <mfekari@rim.com>2013-01-04 16:41:48 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-07 13:24:46 (GMT)
commit153781a14fac8c899fc92b144e14b13c0804bc0d (patch)
tree1ff959cf1b349f934671184eb7b9679f607f79d9 /tests/auto
parenta1eaf0169f041f599895fac90570df601559a526 (diff)
downloadQt-153781a14fac8c899fc92b144e14b13c0804bc0d.zip
Qt-153781a14fac8c899fc92b144e14b13c0804bc0d.tar.gz
Qt-153781a14fac8c899fc92b144e14b13c0804bc0d.tar.bz2
Update Turkish and Irish locales data
Update Turkish and Irish locales data The Irish/Gaelic locale data (CLDRv2.0) in Qt4.8 doesn't provide all month/day names, and the Turkish AM/PM texts are not updated. This patch updates the locales data below and provides an autotest to compare the expected vs returned values: - Irisch locale data (based on ga.xml file): Add month/day names in both short and long foramt based on CLDRv22.1 data. - Turkish locale data (basod on tr.xml file): Update AM/PM text to return "ÖÖ/ÖS" instead of "AM/PM". N.B: This doesn't concern Qt5 that uses the most recent version of CLDR (22.1) which already contains the fixes above. Change-Id: Ic61ba192619582bdc6bb729f4b91f31ae2894ee0 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qlocale/tst_qlocale.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/qlocale/tst_qlocale.cpp b/tests/auto/qlocale/tst_qlocale.cpp
index d0155f8..8a1c86c 100644
--- a/tests/auto/qlocale/tst_qlocale.cpp
+++ b/tests/auto/qlocale/tst_qlocale.cpp
@@ -1461,6 +1461,10 @@ void tst_QLocale::dayName()
QLocale l(locale_name);
QCOMPARE(l.dayName(day, format), dayName);
+
+ QLocale ir("ga_IE");
+ QCOMPARE(ir.dayName(1, QLocale::ShortFormat), QLatin1String("Luan"));
+ QCOMPARE(ir.dayName(7, QLocale::ShortFormat), QLatin1String("Domh"));
}
void tst_QLocale::standaloneDayName_data()
@@ -1813,6 +1817,10 @@ void tst_QLocale::ampm()
QLocale ua("uk_UA");
QCOMPARE(ua.amText(), QString::fromUtf8("\320\264\320\277"));
QCOMPARE(ua.pmText(), QString::fromUtf8("\320\277\320\277"));
+
+ QLocale tr("tr_TR");
+ QCOMPARE(tr.amText(), QString::fromUtf8("\303\226\303\226"));
+ QCOMPARE(tr.pmText(), QString::fromUtf8("\303\226\123"));
}
void tst_QLocale::dateFormat()
@@ -1879,6 +1887,10 @@ void tst_QLocale::monthName()
// check that our CLDR scripts handle surrogate pairs correctly
QLocale dsrt("en-Dsrt-US");
QCOMPARE(dsrt.monthName(1, QLocale::LongFormat), QString::fromUtf8("\xf0\x90\x90\x96\xf0\x90\x90\xb0\xf0\x90\x91\x8c\xf0\x90\x90\xb7\xf0\x90\x90\xad\xf0\x90\x90\xaf\xf0\x90\x91\x89\xf0\x90\x90\xa8"));
+
+ QLocale ir("ga_IE");
+ QCOMPARE(ir.monthName(1, QLocale::ShortFormat), QLatin1String("Ean"));
+ QCOMPARE(ir.monthName(12, QLocale::ShortFormat), QLatin1String("Noll"));
}
void tst_QLocale::standaloneMonthName()