diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2021-11-05 13:46:58 +0100 |
|---|---|---|
| committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2021-11-10 00:36:12 +0100 |
| commit | 96a03533f95425217c23e3e2fe6574984545d3a6 (patch) | |
| tree | af4ef2a1c4ca103f4decff3831418fba69242dd4 /tests/auto/corelib | |
| parent | 2c505eea01d5c20ad1487d8009d2f3badcbc5201 (diff) | |
Update CLDR-derived data to newly-released v40
Update tst_qlocale to take into account "narrow" day representation
change for Russian locales. This version of CLDR changes narrow forms
to one letter. Previously those forms were identical to short forms
(two letter). The new representation is consistent with other languages
and so does not appear to be a bug.
Fixes: QTBUG-94358
Pick-to: 6.2
Change-Id: I9724c281a250685da8232e5c05c9c375a8c79253
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/auto/corelib')
| -rw-r--r-- | tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp index a72d163c67..ae42046eac 100644 --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp @@ -2456,7 +2456,7 @@ void tst_QLocale::dayName_data() QTest::newRow("ru_RU short") << QString("ru_RU") << QString::fromUtf8("\320\262\321\201") << 7 << QLocale::ShortFormat; QTest::newRow("ru_RU narrow") - << QString("ru_RU") << QString::fromUtf8("\320\262\321\201") << 7 << QLocale::NarrowFormat; + << QString("ru_RU") << u"\u0412"_qs << 7 << QLocale::NarrowFormat; } void tst_QLocale::dayName() @@ -3221,10 +3221,10 @@ void tst_QLocale::systemLocaleDayAndMonthNames_data() << QByteArray("ru_RU") << QDate(2021, 8, 30) << QLocale::ShortFormat << QString("\u0430\u0432\u0433.") << QString("\u0430\u0432\u0433.") << QString("\u043f\u043d") << QString("\u043f\u043d"); - // А, А, пн, П + // А, А, П, П QTest::newRow("ru_RU 30.08.2021 narrow") << QByteArray("ru_RU") << QDate(2021, 8, 30) << QLocale::NarrowFormat - << QString("\u0410") << QString("\u0410") << QString("\u043f\u043d") + << QString("\u0410") << QString("\u0410") << QString("\u041f") << QString("\u041f"); #elif defined(Q_OS_DARWIN) // августа, август, понедельник, понедельник |