diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-11-21 05:56:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-21 18:23:59 +0100 |
| commit | 4a115ab4ae7b6bf0327d35ce23bccab23eb7e460 (patch) | |
| tree | a4ba569e1db8d30480af2c54f1ee075344d535a4 /tests | |
| parent | fe8962d3a506a850878401309f81247c80f3d203 (diff) | |
Update Qlocale data up to CLDR 2.0.1
Change-Id: I4279fac57436d7009a6d61dab5936b72fd39fc14
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp index 64f55eec02..7763d6ddc1 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -372,8 +372,7 @@ void tst_QLocale::ctor() TEST_CTOR("zh_Hans_MO", Chinese, SimplifiedHanScript, Macau) TEST_CTOR("zh_Hant_MO", Chinese, TraditionalHanScript, Macau) TEST_CTOR("az_Latn_AZ", Azerbaijani, LatinScript, Azerbaijan) - TEST_CTOR("ha_Arab_NG", Hausa, ArabicScript, Nigeria) - TEST_CTOR("ha_Latn_NG", Hausa, LatinScript, Nigeria) + TEST_CTOR("ha_NG", Hausa, LatinScript, Nigeria) TEST_CTOR("ru", Russian, CyrillicScript, RussianFederation) TEST_CTOR("ru_Cyrl", Russian, CyrillicScript, RussianFederation) @@ -1642,7 +1641,7 @@ void tst_QLocale::monthName() QLocale ru("ru_RU"); QCOMPARE(ru.monthName(1, QLocale::LongFormat), QString::fromUtf8("\321\217\320\275\320\262\320\260\321\200\321\217")); - QCOMPARE(ru.monthName(1, QLocale::ShortFormat), QString::fromUtf8("\321\217\320\275\320\262\56")); + QCOMPARE(ru.monthName(1, QLocale::ShortFormat), QString::fromUtf8("\321\217\320\275\320\262")); QCOMPARE(ru.monthName(1, QLocale::NarrowFormat), QString::fromUtf8("\320\257")); // check that our CLDR scripts handle surrogate pairs correctly @@ -1673,7 +1672,7 @@ void tst_QLocale::standaloneMonthName() QLocale ru("ru_RU"); QCOMPARE(ru.standaloneMonthName(1, QLocale::LongFormat), QString::fromUtf8("\320\257\320\275\320\262\320\260\321\200\321\214")); - QCOMPARE(ru.standaloneMonthName(1, QLocale::ShortFormat), QString::fromUtf8("\321\217\320\275\320\262\56")); + QCOMPARE(ru.standaloneMonthName(1, QLocale::ShortFormat), QString::fromUtf8("\320\257\320\275\320\262\56")); QCOMPARE(ru.standaloneMonthName(1, QLocale::NarrowFormat), QString::fromUtf8("\320\257")); } |