Skip to content

Commit

Permalink
Update CLDR to v36
Browse files Browse the repository at this point in the history
Released on October 4th.
Adds Windows names for two time zones, Qyzylorda and Volgograd.
Added languages Chickasaw (cic), Muscogee (mus) and Silesian (szl).

Norwegian number formatting has flipped back to using colon rather
than dot as time separator; it's flipped back and forth over the last
several CLDR releases.  The dot form is present as a variant, the
colon form was long given as the normal pattern, then went away; but
now it's back as a contributed draft and that's what we pick up.

The MS-Win time-zone ID script was iterating a dict, causing random
reshuffling when new entries are added. Fixed that by doing the
critical iteration in sorted order.

Omitted locales ccp_BD and ccp_IN due to QTBUG-69324.

Task-number: QTBUG-79418
Change-Id: I43869ee1810ecc1fe876523947ddcbcddf4e550a
Reviewed-by: Lars Knoll <[email protected]>
  • Loading branch information
ediosyncratic committed Oct 25, 2019
1 parent 6852ba8 commit 43f64b4
Show file tree
Hide file tree
Showing 11 changed files with 6,205 additions and 6,062 deletions.
7 changes: 5 additions & 2 deletions src/corelib/text/qlocale.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2018 The Qt Company Ltd.
** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtCore module of the Qt Toolkit.
Expand Down Expand Up @@ -443,6 +443,9 @@ class Q_CORE_EXPORT QLocale
WesternBalochi = 364,
Cebuano = 365,
Erzya = 366,
Chickasaw = 367,
Muscogee = 368,
Silesian = 369,

Afan = Oromo,
Bhutani = Dzongkha,
Expand All @@ -459,7 +462,7 @@ class Q_CORE_EXPORT QLocale
Twi = Akan,
Uigur = Uighur,

LastLanguage = Erzya
LastLanguage = Silesian
};

enum Script {
Expand Down
7 changes: 5 additions & 2 deletions src/corelib/text/qlocale.qdoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
Expand Down Expand Up @@ -92,7 +92,7 @@
\note For the current keyboard input locale take a look at
QInputMethod::locale().

QLocale's data is based on Common Locale Data Repository v35.1.
QLocale's data is based on Common Locale Data Repository v36.

\sa QString::arg(), QString::toInt(), QString::toDouble(),
QInputMethod::locale()
Expand Down Expand Up @@ -172,6 +172,7 @@
\value Chechen
\value Cherokee
\value Chewa Obsolete, please use Nyanja
\value Chickasaw Since Qt 5.14
\value Chiga
\value Chinese
\value Church
Expand Down Expand Up @@ -333,6 +334,7 @@
\value Morisyen
\value Mru Since Qt 5.7
\value Mundang
\value Muscogee Since Qt 5.14
\value Nama
\value NauruLanguage
\value Navaho
Expand Down Expand Up @@ -406,6 +408,7 @@
\value SichuanYi
\value Sicilian Since Qt 5.12
\value Sidamo
\value Silesian Since Qt 5.14
\value Sindhi
\value Sinhala
\value SkoltSami Since Qt 5.5
Expand Down
Loading

0 comments on commit 43f64b4

Please sign in to comment.